Fixed CategoryBuilder

FraunhoferIOSB · Sep 8, 2023 · 5309c9f · 5309c9f
1 parent 3c99282
commit 5309c9f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/de/fraunhofer/iosb/ilt/sta/model/builder/api/ext/AbstractCategoryBuilder.java b/src/main/java/de/fraunhofer/iosb/ilt/sta/model/builder/api/ext/AbstractCategoryBuilder.java
@@ -58,10 +58,17 @@ public T allowedValue(final String value) {
     }
 
     public T allowedValues(final List<String> values) {
-        if (getBuildingInstance().getConstraint() == null) {
-            getBuildingInstance().setConstraint(new AllowedTokens());
+        AllowedTokens constraint = getBuildingInstance().getConstraint();
+        if (constraint == null) {
+            constraint = new AllowedTokens();
+            getBuildingInstance().setConstraint(constraint);
+        }
+        final List<String> value = constraint.getValue();
+        if (value == null) {
+            constraint.setValue(values);
+        } else {
+            value.addAll(values);
         }
-        getBuildingInstance().getConstraint().getValue().addAll(values);
         return getSelf();
     }
 

diff --git a/src/test/java/de/iosb/fraunhofer/ilt/sta/EntityFormatterTest.java b/src/test/java/de/iosb/fraunhofer/ilt/sta/EntityFormatterTest.java
@@ -552,13 +552,13 @@ public void writeTaskingParameter() throws IOException {
 
         final ObjectMapper mapper = ObjectMapperFactory.get();
         String json = mapper.writeValueAsString(entity);
-        assert (jsonEqual(expResult, json));
+        Assert.assertTrue(jsonEqual(expResult, json));
 
         TaskingCapability parsed = mapper.readValue(expResult, TaskingCapability.class);
         Assert.assertEquals(entity, parsed);
 
         String json2 = mapper.writeValueAsString(parsed);
-        assert (jsonEqual(expResult, json2));
+        Assert.assertTrue(jsonEqual(expResult, json2));
     }
 
 }