Allow property type overrides from CSDL

Author: hylkevds

src/main/java/de/fraunhofer/iosb/ilt/frostclient/model/PropertyType.java

@@ -29,6 +29,7 @@
 import de.fraunhofer.iosb.ilt.frostclient.utils.ParserUtils;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import tools.jackson.databind.ValueDeserializer;
 import tools.jackson.databind.ValueSerializer;
 
@@ -134,4 +135,30 @@ public String toString() {
         return getFullName();
     }
 
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 53 * hash + Objects.hashCode(this.name);
+        hash = 53 * hash + Objects.hashCode(this.namespace);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final PropertyType other = (PropertyType) obj;
+        if (!Objects.equals(this.name, other.name)) {
+            return false;
+        }
+        return Objects.equals(this.namespace, other.namespace);
+    }
+
 }

src/main/java/de/fraunhofer/iosb/ilt/frostclient/model/csdl/CsdlPropertyEntity.java

@@ -102,7 +102,14 @@ public void applyTo(ModelRegistry mr, EntityType entityType, String name) {
             EntityPropertyMain ep = createProperty(mr, name);
             entityType.registerProperty(ep);
         } else {
-            LOGGER.debug("      EntityType {} already has property {}", entityType, name);
+            final PropertyType newType = createPropertyType(mr);
+            final PropertyType oldType = existingProp.getType();
+            if (oldType.equals(newType)) {
+                LOGGER.debug("      EntityType {} already has property {}", entityType, name);
+            } else {
+                existingProp.setType(newType);
+                LOGGER.info("      Replaced type of {}/{} from {} to {}", entityType, existingProp, oldType, newType);
+            }
         }
     }
 
@@ -113,6 +120,13 @@ public void applyTo(ModelRegistry mr, TypeComplex tc, String name) {
     }
 
     private EntityPropertyMain createProperty(ModelRegistry mr, String name) throws IllegalArgumentException {
+        PropertyType propertyType = createPropertyType(mr);
+        EntityPropertyMain ep = new EntityPropertyMain(name, propertyType);
+        ep.setNullable(nullable);
+        return ep;
+    }
+
+    public PropertyType createPropertyType(ModelRegistry mr) throws IllegalArgumentException {
         PropertyType propertyType = mr.getPropertyType(type);
         if (collection) {
             if (propertyType instanceof TypePrimitive ptp) {
@@ -123,9 +137,7 @@ private EntityPropertyMain createProperty(ModelRegistry mr, String name) throws
                 throw new IllegalArgumentException("Can't create Type for Set of " + propertyType.getName());
             }
         }
-        EntityPropertyMain ep = new EntityPropertyMain(name, propertyType);
-        ep.setNullable(nullable);
-        return ep;
+        return propertyType;
     }
 
     @JsonAnyGetter

src/main/java/de/fraunhofer/iosb/ilt/frostclient/model/property/type/TypeComplex.java

@@ -57,8 +57,8 @@ public class TypeComplex extends PropertyType implements ContainerType<TypeCompl
 
     public static final String STA_MAP_NAME = "Object";
     public static final String STA_OBJECT_NAME = "ANY";
-    public static final String STA_TIMEINTERVAL_NAME = "TimeInterval";
-    public static final String STA_TIMEVALUE_NAME = "TimeValue";
+    public static final String STA_TIMEINTERVAL_NAME = "TM_Period";
+    public static final String STA_TIMEVALUE_NAME = "TM_Object";
     public static final String NAME_INTERVAL_START = "start";
     public static final String NAME_INTERVAL_END = "end";
 
@@ -95,6 +95,7 @@ public class TypeComplex extends PropertyType implements ContainerType<TypeCompl
             }
             try {
                 final TypeComplex type = (TypeComplex) FieldUtils.readStaticField(field, false);
+                type.setNamespace("org.OGC.STA");
                 final String name = type.getName();
                 TYPES.put(name, type);
                 LOGGER.debug("Registered type: {}", name);
@@ -190,9 +191,4 @@ public static interface Instantiator {
         public ComplexValue instantiate(TypeComplex type);
     }
 
-    @Override
-    public String toString() {
-        return "TypeComplex: " + getName();
-    }
-
 }

src/main/java/de/fraunhofer/iosb/ilt/frostclient/models/SensorThingsV20Core.java

@@ -135,7 +135,7 @@ public class SensorThingsV20Core implements DataModel {
     public final EntityType etLocation = new EntityType(NAME_LOCATION, NAME_LOCATIONS).setNamespace(NAMESPACE);
     public final EntityType etObservedProperty = new EntityType(NAME_OBSERVEDPROPERTY, NAME_OBSERVEDPROPERTIES).setNamespace(NAMESPACE);
     public final EntityType etObservation = new EntityType(NAME_OBSERVATION, NAME_OBSERVATIONS)
-            .setToStringMethod(e -> e.getType().toString() + ": " + e.getPrimaryKeyValues() + " " + e.getProperty(EP_PHENOMENONTIME) + " " + e.getProperty(EP_RESULT))
+            .setToStringMethod(e -> e.getPrimaryKeyValues() + " " + e.getProperty(EP_PHENOMENONTIME) + " " + e.getProperty(EP_RESULT))
             .setNamespace(NAMESPACE);
     public final EntityType etSensor = new EntityType(NAME_SENSOR, NAME_SENSORS).setNamespace(NAMESPACE);
     public final EntityType etThing = new EntityType(NAME_THING, NAME_THINGS).setNamespace(NAMESPACE);