fix json schema validation

Author: azahnen

libxtracfg/java/build.gradle

@@ -26,10 +26,8 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'de.interactive_instruments', name: 'ldproxy-cfg', version: '4.2.0-SNAPSHOT'
-    implementation group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.35'
-    // use this instead for debugging purposes
-    //implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.35'
+    implementation group: 'de.interactive_instruments', name: 'ldproxy-cfg', version: '4.3.0-SNAPSHOT'
+    implementation group: 'org.slf4j', name: project.hasProperty('CI') ? 'slf4j-nop' : 'slf4j-simple', version: '2.0.16'
 
     // 24.x is for JDK 21
     compileOnly group: 'org.graalvm.nativeimage', name: 'svm', version: '24.1.0'

libxtracfg/java/dev.gradle

@@ -13,6 +13,9 @@ sourceSets {
         java {
             srcDirs 'src/dev/java'
         }
+        resources {
+            srcDirs 'src/dev/resources'
+        }
     }
 }
 

libxtracfg/java/src/dev/java/de/ii/xtraplatform/cli/dev/XtraCfgDev.java

@@ -7,6 +7,12 @@ public class XtraCfgDev {
 
   public static void main(String[] args) {
     if (args.length == 0) {
+      System.out.println(
+          "Example: ./gradlew run --rerun --args='{\"command\":\"check\",\"subcommand\":\"entities\",\"ignoreRedundant\":true,\"verbose\":true,\"debug\":true,\"source\":\"/path/to/store\"}'");
+      System.out.println(
+          "Or:      ./gradlew run --rerun --args=\"{command:check,subcommand:entities,ignoreRedundant:true,verbose:true,debug:true,source:/path/to/store}\"");
+      System.out.println();
+
       throw new IllegalArgumentException("No command given");
     }
 

libxtracfg/java/src/dev/resources/simplelogger.properties

@@ -0,0 +1,7 @@
+org.slf4j.simpleLogger.logFile=System.out
+org.slf4j.simpleLogger.defaultLogLevel=error
+org.slf4j.simpleLogger.log.de.ii=debug
+org.slf4j.simpleLogger.levelInBrackets=true
+org.slf4j.simpleLogger.showDateTime=false
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+org.slf4j.simpleLogger.showThreadName=false

libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/EntitiesHandler.java

@@ -40,6 +40,9 @@ public enum Type {
 
   public static boolean DEV = false;
 
+  private static final org.slf4j.Logger LOGGER =
+      org.slf4j.LoggerFactory.getLogger(EntitiesHandler.class);
+
   private static final TypeReference<LinkedHashMap<String, Object>> AS_MAP =
       new TypeReference<LinkedHashMap<String, Object>>() {};
 
@@ -426,6 +429,10 @@ private static List<Upgrade> getUpgrades(
             ? ldproxyCfg.getOverrideIdentifiers()
             : List.of();
 
+    if (debug && LOGGER.isDebugEnabled()) {
+      LOGGER.debug("defaultIdentifiers: {}", defaultIdentifiers);
+    }
+
     // TODO: optionally compare ordering of elements
     return Stream.concat(
             Stream.concat(
@@ -629,6 +636,10 @@ private static Optional<Upgrade> getDefaultUpgrade(
     Path relYml = ldproxyCfg.getDataDirectory().relativize(yml);
     FileInfo fileInfo = new FileType(Map.of("path", relYml.toString())).get(ldproxyCfg);
 
+    if (debug && LOGGER.isDebugEnabled()) {
+      LOGGER.debug("fileInfo: {} {}", fileInfo.isValid(), fileInfo.entitySubType);
+    }
+
     if (!fileInfo.isValid() || fileInfo.entitySubType.isEmpty()) {
       return Optional.empty();
     }
@@ -639,7 +650,12 @@ private static Optional<Upgrade> getDefaultUpgrade(
     Map<String, Object> original = ldproxyCfg.getObjectMapper().readValue(yml.toFile(), AS_MAP);
     Map<String, Object> upgraded =
         getUpgradedDefaultsOrOverrides(
-            ldproxyCfg, yml, storeIdentifier, Type.Defaults, fileInfo, original);
+            ldproxyCfg, yml, storeIdentifier, Type.Defaults, fileInfo, original, debug);
+
+    if (debug && LOGGER.isDebugEnabled()) {
+      LOGGER.debug("original1: {}", original);
+      LOGGER.debug("upgraded1: {}", upgraded);
+    }
 
     if (fileInfo.subProperty.isPresent()) {
       try {
@@ -674,8 +690,7 @@ private static Optional<Upgrade> getDefaultUpgrade(
     }
 
     if (force || !diff.isEmpty()) {
-      return Optional.of(
-          new Upgrade(Type.Defaults, relYml, original, upgraded, null, Map.of()));
+      return Optional.of(new Upgrade(Type.Defaults, relYml, original, upgraded, null, Map.of()));
     }
 
     return Optional.empty();
@@ -699,7 +714,7 @@ private static Optional<Upgrade> getOverrideUpgrade(
     Map<String, Object> original = ldproxyCfg.getObjectMapper().readValue(yml.toFile(), AS_MAP);
     Map<String, Object> upgraded =
         getUpgradedDefaultsOrOverrides(
-            ldproxyCfg, yml, identifier, Type.Overrides, fileInfo, original);
+            ldproxyCfg, yml, identifier, Type.Overrides, fileInfo, original, debug);
 
     Map<String, String> diff = MapDiffer.diff(original, upgraded, true);
     if (debug) {
@@ -719,9 +734,16 @@ private static Map<String, Object> getUpgradedDefaultsOrOverrides(
       Identifier identifier,
       Type type,
       FileInfo fileInfo,
-      Map<String, Object> original)
+      Map<String, Object> original,
+      boolean debug)
       throws IOException {
     String fileContent = Validation.loadFileContent(yml, type, fileInfo);
+
+    if (debug && LOGGER.isDebugEnabled()) {
+      LOGGER.debug("fileInfo: {} {}", fileInfo.entityType, fileInfo.entitySubType);
+      LOGGER.debug("fileContent: {}", fileContent);
+    }
+
     EntityDataBuilder<? extends EntityData> builder =
         ldproxyCfg
             .getEntityFactories()
@@ -735,6 +757,10 @@ private static Map<String, Object> getUpgradedDefaultsOrOverrides(
         .readerForUpdating(builder)
         .readValue(fileContent);
 
+    if (debug && LOGGER.isDebugEnabled()) {
+      LOGGER.debug("builder: {}", builder.build());
+    }
+
     Map<String, Object> upgraded =
         ldproxyCfg.getEntityDataDefaultsStore().asMap(identifier, builder.build());
     Map<String, Object> cleanUpgraded = new LinkedHashMap<>();
@@ -746,6 +772,15 @@ private static Map<String, Object> getUpgradedDefaultsOrOverrides(
         if (entry.getKey().equals("label") && !original.containsKey("label")) {
           continue;
         }
+        if (entry.getKey().equals("providerType") && !original.containsKey("providerType")) {
+          continue;
+        }
+        if (entry.getKey().equals("providerSubType") && !original.containsKey("providerSubType")) {
+          continue;
+        }
+        if (entry.getKey().equals("serviceType") && !original.containsKey("serviceType")) {
+          continue;
+        }
         if (entry.getKey().equals("enabled")
             && !(original.containsKey("enabled") || original.containsKey("shouldStart"))) {
           continue;

libxtracfg/java/src/main/java/de/ii/xtraplatform/cli/cmd/FileType.java

@@ -86,7 +86,7 @@ public Result run(LdproxyCfg ldproxyCfg) {
 
     // TODO: multi-file overrides
     if (path.getNameCount() >= 3
-        && Objects.equals(path.getName(1).toString(), "overrides")
+        && !Objects.equals(type, "defaults")
         && CONTENT_TYPES.contains(type)
         && ENTITY_TYPES.contains(path.getFileName().toString())) {