Updates for FROST-Client-Dynamic

FraunhoferIOSB · Feb 1, 2024 · 84f9234 · 84f9234
1 parent 8203f0d
commit 84f9234
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,25 +14,24 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
         <mainClass>de.fraunhofer.iosb.ilt.sensorthingsmanager.MainApp</mainClass>
 
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <maven-gpg-plugin>3.0.1</maven-gpg-plugin>
         <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
         <maven-javafx-plugin>0.0.8</maven-javafx-plugin>
         <maven-nexus-staging-plugin>1.6.13</maven-nexus-staging-plugin>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 
-        <commons-io.version>2.11.0</commons-io.version>
-        <commons-lang.version>3.12.0</commons-lang.version>
+        <commons-io.version>2.15.1</commons-io.version>
+        <commons-lang.version>3.14.0</commons-lang.version>
         <configurable.version>0.34</configurable.version>
-        <logback.version>1.4.6</logback.version>
-        <openjfx.version>19.0.2.1</openjfx.version>
-        <FROST-Client.version>2.2-SNAPSHOT</FROST-Client.version>
+        <logback.version>1.4.14</logback.version>
+        <openjfx.version>21.0.1</openjfx.version>
+        <FROST-Client.version>2.6-SNAPSHOT</FROST-Client.version>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <licenses>

diff --git a/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/AggregateCombo.java b/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/AggregateCombo.java
@@ -22,22 +22,18 @@
 import de.fraunhofer.iosb.ilt.frostclient.model.Entity;
 import de.fraunhofer.iosb.ilt.frostclient.model.EntitySet;
 import de.fraunhofer.iosb.ilt.frostclient.model.EntityType;
-import de.fraunhofer.iosb.ilt.frostclient.model.ext.TimeInterval;
-import de.fraunhofer.iosb.ilt.frostclient.model.ext.TimeValue;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.NavigationPropertyEntitySet;
 import de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11;
 import de.fraunhofer.iosb.ilt.frostclient.models.ext.MapValue;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.TimeInterval;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.TimeValue;
 import static de.fraunhofer.iosb.ilt.frostclient.utils.ParserUtils.formatKeyValuesForUrl;
 import java.time.DateTimeException;
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import net.time4j.ClockUnit;
 import net.time4j.Moment;
 import net.time4j.ZonalDateTime;
 import net.time4j.tz.TZID;

diff --git a/...ain/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/ControllerAggManager.java b/...ain/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/ControllerAggManager.java
@@ -21,14 +21,14 @@
 import de.fraunhofer.iosb.ilt.frostclient.SensorThingsService;
 import de.fraunhofer.iosb.ilt.frostclient.exception.ServiceFailureException;
 import de.fraunhofer.iosb.ilt.frostclient.model.Entity;
-import de.fraunhofer.iosb.ilt.frostclient.model.ext.TimeValue;
-import de.fraunhofer.iosb.ilt.frostclient.model.ext.UnitOfMeasurement;
 import de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsMultiDatastreamV11;
 import de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_DESCRIPTION;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_PHENOMENONTIME;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_UNITOFMEASUREMENT;
 import de.fraunhofer.iosb.ilt.frostclient.models.ext.MapValue;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.TimeValue;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.UnitOfMeasurement;
 import de.fraunhofer.iosb.ilt.frostclient.utils.CollectionsHelper;
 import de.fraunhofer.iosb.ilt.frostclient.utils.ParserUtils;
 import de.fraunhofer.iosb.ilt.sensorthingsmanager.utils.ButtonTableCell;

diff --git a/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/SensorThingsUtils.java b/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/SensorThingsUtils.java
@@ -20,14 +20,14 @@
 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.ext.UnitOfMeasurement;
 import de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsMultiDatastreamV11;
 import de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_DEFINITION;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_DESCRIPTION;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_NAME;
 import static de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11.EP_PROPERTIES;
 import de.fraunhofer.iosb.ilt.frostclient.models.ext.MapValue;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.UnitOfMeasurement;
 import de.fraunhofer.iosb.ilt.frostclient.query.Query;
 import de.fraunhofer.iosb.ilt.frostclient.utils.StringHelper;
 import java.util.ArrayList;

diff --git a/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/Utils.java b/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/aggregation/Utils.java
@@ -17,9 +17,9 @@
 package de.fraunhofer.iosb.ilt.sensorthingsmanager.aggregation;
 
 import de.fraunhofer.iosb.ilt.frostclient.model.Entity;
-import de.fraunhofer.iosb.ilt.frostclient.model.ext.TimeValue;
-import de.fraunhofer.iosb.ilt.frostclient.model.ext.UnitOfMeasurement;
 import de.fraunhofer.iosb.ilt.frostclient.models.SensorThingsSensingV11;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.TimeValue;
+import de.fraunhofer.iosb.ilt.frostclient.models.ext.UnitOfMeasurement;
 import java.nio.charset.Charset;
 import java.util.regex.Pattern;
 import net.time4j.Moment;

diff --git a/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/controller/ControllerServer.java b/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/controller/ControllerServer.java
@@ -80,7 +80,7 @@ public void setServerEntry(Server entry) {
                 if (et.getProperty(SensorThingsSensingV11.NAME_NAME) != null) {
                     orderBy = "name asc";
                 }
-                addTabFor(et.plural, orderBy, service.query(et));
+                addTabFor(et.mainContainer, orderBy, service.query(et));
             }
 
             if (service.hasModel(SensorThingsMultiDatastreamV11.class)) {

diff --git a/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/controller/EntityGuiController.java b/src/main/java/de/fraunhofer/iosb/ilt/sensorthingsmanager/controller/EntityGuiController.java
@@ -3,14 +3,15 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.fraunhofer.iosb.ilt.frostclient.SensorThingsService;
+import de.fraunhofer.iosb.ilt.frostclient.model.ComplexValue;
 import de.fraunhofer.iosb.ilt.frostclient.model.Entity;
 import de.fraunhofer.iosb.ilt.frostclient.model.EntityType;
+import de.fraunhofer.iosb.ilt.frostclient.model.Property;
 import de.fraunhofer.iosb.ilt.frostclient.model.PropertyType;
+import de.fraunhofer.iosb.ilt.frostclient.model.property.EntityProperty;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.EntityPropertyMain;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.NavigationProperty;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.NavigationPropertyEntitySet;
-import de.fraunhofer.iosb.ilt.frostclient.model.ComplexValue;
-import de.fraunhofer.iosb.ilt.frostclient.model.property.EntityProperty;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.type.TypeComplex;
 import de.fraunhofer.iosb.ilt.frostclient.model.property.type.TypePrimitive;
 import static de.fraunhofer.iosb.ilt.frostclient.model.property.type.TypePrimitive.EDM_STRING_NAME;
@@ -217,9 +218,11 @@ public GuiGlueComplex init(String namePrefix, GridPane gridProperties, AtomicInt
                     value = ptc.instantiate();
                     entity.setProperty(property, value);
                 }
-                for (EntityProperty subProperty : ptc.getProperties()) {
-                    PropertyGuiGlue subItem = PropertyGuiGlue.createGuiElement(value, subProperty, editable, gridProperties, itemCount);
-                    subProperties.put(subProperty.getJsonName(), subItem);
+                for (Property subProperty : ptc.getProperties()) {
+                    if (subProperty instanceof EntityProperty ep) {
+                        PropertyGuiGlue subItem = PropertyGuiGlue.createGuiElement(value, ep, editable, gridProperties, itemCount);
+                        subProperties.put(subProperty.getJsonName(), subItem);
+                    }
                 }
             }
             return this;