Fixed validator reference in json

FraunhoferIOSB · Aug 13, 2024 · e7f6e88 · e7f6e88
1 parent 359efdc
commit e7f6e88
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/...ore.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/model/loader/DefValidator.java b/...ore.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/model/loader/DefValidator.java
@@ -97,7 +97,7 @@ public static class NamedValidator {
 
         @ConfigurableField(editor = EditorSubclass.class,
                 label = "validator", description = "The implementation class of the validator.")
-        @EditorSubclass.EdOptsSubclass(iface = EntityValidator.class)
+        @EditorSubclass.EdOptsSubclass(iface = EntityValidator.class, merge = true, nameField = "@class", shortenClassNames = true)
         public EntityValidator validator;
     }
 

diff --git a/...c/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/PersistenceManagerFactory.java b/...c/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/PersistenceManagerFactory.java
@@ -66,16 +66,16 @@ private PersistenceManagerFactory(CoreSettings settings) {
             throw new IllegalArgumentException("settings must be non-null");
         }
         this.settings = settings;
+        String pmiClsName = settings.getPersistenceSettings().getPersistenceManagerImplementationClass();
         try {
-            String pmiClsName = settings.getPersistenceSettings().getPersistenceManagerImplementationClass();
             Class<?> clazz = Class.forName(pmiClsName, false, getClass().getClassLoader());
             if (PersistenceManager.class.isAssignableFrom(clazz)) {
                 persistenceManagerClass = (Class<PersistenceManager>) clazz;
             } else {
                 throw new IllegalArgumentException("Class " + pmiClsName + " does not implement the interface PersistenceManager");
             }
         } catch (ClassNotFoundException ex) {
-            throw new IllegalArgumentException(ERROR_MSG + "Class '" + settings.getPersistenceSettings().getPersistenceManagerImplementationClass() + "' could not be found", ex);
+            throw new IllegalArgumentException(ERROR_MSG + "Class '" + pmiClsName + "' could not be found", ex);
         }
 
     }

diff --git a/...c/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/bindings/JsonValue.java b/...c/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/bindings/JsonValue.java
@@ -23,8 +23,7 @@
 import java.util.Map;
 
 /**
- *
- * @author scf
+ * Wrapper for JSON values in the database.
  */
 public class JsonValue {
 

diff --git a/Plugins/Actuation/src/main/resources/actuationv2/model/Task.json b/Plugins/Actuation/src/main/resources/actuationv2/model/Task.json
@@ -122,7 +122,7 @@
           {
             "name": "AC-Task-CrationTime",
             "validator": {
-              "className": "de.fraunhofer.iosb.ilt.frostserver.plugin.actuation.CreateTimeValidator"
+              "@class": "de.fraunhofer.iosb.ilt.frostserver.plugin.actuation.CreateTimeValidator"
             }
           }
         ],

diff --git a/Plugins/CoreModelV2/src/main/resources/plugincoremodelv2/model/Observation.json b/Plugins/CoreModelV2/src/main/resources/plugincoremodelv2/model/Observation.json
@@ -144,7 +144,7 @@
                     {
                         "name": "CM-ObsPhenTime",
                         "validator": {
-                            "className": "de.fraunhofer.iosb.ilt.frostserver.plugin.coremodel.PhenomenonTimeValidator"
+                            "@class": "de.fraunhofer.iosb.ilt.frostserver.plugin.coremodel.PhenomenonTimeValidator"
                         }
                     }
                 ],