lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove Rollout(Group) builders (#2603)

Browse Source 
* Fix entityManager.merge for ds and sm

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

* Remove Rollout(Group) builders

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

* Remove EntityFactory

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

---------

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-08-11 14:01:03 +03:00
committed by GitHub
parent 861483f0d6
commit 124fef189e
66 changed files with 776 additions and 1753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
hawkbit-core/src/main/java/org/eclipse/hawkbit/utils/ObjectCopyUtil.java
View File

@@ -175,26 +175,17 @@ public class ObjectCopyUtil {
}
@NotNull
private static Method getMethod(final Class<?> clazz, final String methodName, final Class<?> parameterType)
throws NoSuchMethodException {
private static Method getMethod(final Class<?> clazz, final String methodName, final Class<?> parameterType) throws NoSuchMethodException {
try {
return getMethod(clazz, clazz, methodName, parameterType);
} catch (final NoSuchMethodException e) {
if (parameterType == Boolean.class) {
try {
return getMethod(clazz, methodName, boolean.class);
} catch (final NoSuchMethodException e2) {
throw e;
}
} else {
final Method assignable = getMethodAssignable(clazz, methodName, parameterType);
if (assignable != null) {
return assignable;
}
final Method moreSpecific = getMethodMoreSpecific(clazz, methodName, parameterType);
if (moreSpecific != null) {
return moreSpecific;
}
final Method assignable = getMethodAssignable(clazz, methodName, parameterType);
if (assignable != null) {
return assignable;
}
final Method moreSpecific = getMethodMoreSpecific(clazz, methodName, parameterType);
if (moreSpecific != null) {
return moreSpecific;
}
throw e;
}
@@ -218,11 +209,26 @@ public class ObjectCopyUtil {
}
}
@SuppressWarnings("java:S3011") // low-level, reflection utility. intentionally changes the accessibility
// java:S3011 - low-level, reflection utility. intentionally changes the accessibility
// java:S3776 - complexity is due to reflection and dynamic method invocation
@SuppressWarnings({"java:S3011", "java:S3776"})
private static Method getMethodAssignable(final Class<?> clazz, final String methodName, final Class<?> parameterType) {
return Arrays.stream(clazz.getDeclaredMethods())
.filter(method -> methodName.equals(method.getName()))
.filter(method -> method.getParameterCount() == 1 && method.getParameterTypes()[0].isAssignableFrom(parameterType))
.filter(method -> {
if (method.getParameterCount() == 1) {
if (method.getParameterTypes()[0].isAssignableFrom(parameterType)) {
return true;
}
if ((parameterType == boolean.class && method.getParameterTypes()[0] == Boolean.class) ||
(parameterType == Boolean.class && method.getParameterTypes()[0] == boolean.class) ||
(parameterType == long.class && method.getParameterTypes()[0] == Long.class) ||
(parameterType == Long.class && method.getParameterTypes()[0] == long.class)) {
return true; // in/out boxing
}
}
return false;
})
.findFirst()
.map(method -> {
method.setAccessible(true);