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

Target attributes update: Allow null values

Browse Source 
Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>
This commit is contained in:
Stefan Behl
2018-08-01 09:12:21 +02:00
parent cd79b918b4
commit 6a0aa34c43
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java
View File

@@ -672,12 +672,12 @@ public class JpaControllerManagement implements ControllerManagement {
case REPLACE: case REPLACE:
// clear the attributes before adding the new attributes // clear the attributes before adding the new attributes
controllerAttributes.clear(); controllerAttributes.clear();
copyNonNull(data, controllerAttributes); copy(data, controllerAttributes);
target.setRequestControllerAttributes(false); target.setRequestControllerAttributes(false);
break; break;
case MERGE: case MERGE:
// just merge the attributes in // just merge the attributes in
copyNonNull(data, controllerAttributes); copy(data, controllerAttributes);
target.setRequestControllerAttributes(false); target.setRequestControllerAttributes(false);
break; break;
default: default:
@@ -689,11 +689,17 @@ public class JpaControllerManagement implements ControllerManagement {
return targetRepository.save(target); return targetRepository.save(target);
} }
private static void copyNonNull(final Map<String, String> src, final Map<String, String> trg) { private static void copy(final Map<String, String> src, final Map<String, String> trg) {
if (src == null || src.isEmpty()) { if (src == null || src.isEmpty()) {
return; return;
} }
src.entrySet().stream().filter(e -> e.getValue() != null).forEach(e -> trg.put(e.getKey(), e.getValue())); src.entrySet().stream().forEach(e -> {
if (e.getValue() != null) {
trg.put(e.getKey(), e.getValue());
} else {
trg.remove(e.getKey());
}
});
} }
private void assertTargetAttributesQuota(final JpaTarget target) { private void assertTargetAttributesQuota(final JpaTarget target) {