Updated FROST-Client-Dynamic version

Author: hylkevds

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/c03filtering/JsonPropertiesTests.java

@@ -181,7 +181,7 @@ private static void createEntities() throws ServiceFailureException, URISyntaxEx
         JsonNode rqArray = mapper.readTree(resultQualityArrayString);
 
         for (int i = 0; i <= 12; i++) {
-            Map<String, Object> parameters = new HashMap<>();
+            MapValue parameters = new MapValue();
             Entity o = sMdl.newObservation(i, datastream);
             parameters.put("string", generateString(i, 10));
             parameters.put("boolean", i % 2 == 0);
@@ -196,7 +196,7 @@ private static void createEntities() throws ServiceFailureException, URISyntaxEx
         }
         {
             // 13
-            Map<String, Object> parameters = new HashMap<>();
+            MapValue parameters = new MapValue();
             Entity o = sMdl.newObservation("badVales1", datastream);
             parameters.put("int", generateString(13, 10));
             parameters.put("string", 13 % 2 == 0);
@@ -210,7 +210,7 @@ private static void createEntities() throws ServiceFailureException, URISyntaxEx
         }
         {
             // 14
-            Map<String, Object> parameters = new HashMap<>();
+            MapValue parameters = new MapValue();
             Entity o = sMdl.newObservation("badVales2", datastream);
             parameters.put("boolean", generateString(14, 10));
             parameters.put("int", 14 % 2 == 0);
@@ -224,7 +224,7 @@ private static void createEntities() throws ServiceFailureException, URISyntaxEx
         }
         {
             // 15
-            Map<String, Object> parameters = new HashMap<>();
+            MapValue parameters = new MapValue();
             Entity o = sMdl.newObservation("badVales3", datastream);
             parameters.put("boolean", "true");
             parameters.put("int", "5");

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/c08mqttsubscribe/MqttCoreTests.java

@@ -32,7 +32,6 @@
 import de.fraunhofer.iosb.ilt.frostclient.exception.ServiceFailureException;
 import de.fraunhofer.iosb.ilt.frostclient.model.Entity;
 import de.fraunhofer.iosb.ilt.frostclient.model.EntitySet;
-import de.fraunhofer.iosb.ilt.frostclient.model.EntitySetImpl;
 import de.fraunhofer.iosb.ilt.frostclient.model.EntityType;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.NavigationProperty;
 import de.fraunhofer.iosb.ilt.statests.AbstractTestClass;
@@ -619,7 +618,7 @@ void check14SubscribeToHistoricalLocationSetUpdateThingLocations() throws Servic
         final Callable<Object> updateAction = () -> {
             Entity thing = eh2.getCache(sMdl.etThing, 0);
             Entity loc2 = eh2.getCache(sMdl.etLocation, 1);
-            EntitySet thingLocs = new EntitySetImpl(sMdl.npThingLocations);
+            EntitySet thingLocs = new EntitySet(thing, sMdl.npThingLocations);
             thing.setProperty(sMdl.npThingLocations, thingLocs);
             thingLocs.add(loc2.withOnlyPk());
             sSrvc.update(thing);

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/util/EntityHelper2.java

@@ -370,7 +370,7 @@ public Entity newObservation(Entity datastream) {
                 .setProperty(EP_PARAMETERS, propertiesBuilder()
                         .addItem("param1", "some value1")
                         .addItem("param2", "some value2")
-                        .buildMap());
+                        .build());
         list.add(obs);
         return obs;
     }

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/util/EntityUtils.java

@@ -54,10 +54,8 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Assertions;
@@ -612,7 +610,7 @@ public static void createObservationSet(SensorThingsService srvc, Entity datastr
 
     public static Entity createObservation(SensorThingsService srvc, Entity datastream, long result, ZonedDateTime phenomenonTime, TimeInterval validTime, List<Entity> registry) throws ServiceFailureException {
         int idx = registry.size();
-        Map<String, Object> parameters = new HashMap<>();
+        MapValue parameters = new MapValue();
         parameters.put("idx", idx);
         SensorThingsV11Sensing sMdl = srvc.getModel(SensorThingsV11Sensing.class);
         Entity obs = sMdl.newObservation(result, phenomenonTime, datastream)

pom.xml

@@ -93,7 +93,7 @@
         <sonar.language>java</sonar.language>
         <sonar.organization>fraunhofer-iosb</sonar.organization>
 
-        <version.FROST-Client-Dynamic>2.22</version.FROST-Client-Dynamic>
+        <version.FROST-Client-Dynamic>2.25</version.FROST-Client-Dynamic>
         <version.annotation-api>1.3.1</version.annotation-api>
         <version.commons-csv>1.13.0</version.commons-csv>
         <version.commons-io>2.18.0</version.commons-io>