Merge pull request #76 from axonivy/noContainer

allow @Implementations types provisioning without sub-types container

jsonschema-module-expressive-annotations/src/main/java/io/github/axonivy/json/schema/annotations/Implementations.java

@@ -17,7 +17,10 @@
   /** the property that will define the implementing type of this generic object */
   public String type() default "type";
 
-  /** the property that will hold the implementation specific properties */
+  /**
+   * Name of the property that will hold the implementation specific properties.
+   * Use an empty string to flag, that you don't need a container for sub-types.
+   */
   public String container() default "config";
 
   /** the provider of at least all valid-subtypes */

jsonschema-module-expressive-annotations/src/main/java/io/github/axonivy/json/schema/impl/ImplementationTypesProvider.java

@@ -86,13 +86,19 @@ private CustomDefinition supplyVirtualContainer(ResolvedType type, SchemaGenerat
     storeCommonProps(subTypes, props);
     props.set(impls.type(), craftTypeConsts(context, registry));
 
-    var container = props.putObject(impls.container());
+    String containerName = impls.container();
+    if (!containerName.isBlank()) {
+      var container = props.putObject(containerName);
+      if (conditional) {
+        container.put("type", "object"); //vs-code needs a generic block for validation
+      } else {
+        container.setAll(craftAnyOf(context, subTypes));
+      }
+    }
+
     if (!conditional) {
-      container.setAll(craftAnyOf(context, subTypes));
       return new CustomDefinition(std, false);
     }
-
-    container.put("type", "object"); //vs-code needs a generic block for validation
     return conditional(context, impls, registry)
       .toDefinition(()->std)
       .map(node -> new CustomDefinition(node, false))

jsonschema-module-expressive-annotations/src/test/java/io/github/axonivy/json/schema/tests/TestImplementationTypes.java

@@ -132,6 +132,28 @@ void subTypes_anyOf_unconditional() {
       );
   }
 
+  static class MyRootTypeNoContainer {
+    public GenericNoContainer provider;
+  }
+
+  @Implementations(value = LocalFactory.class, container = "")
+  public static interface GenericNoContainer {
+    String idX();
+  }
+
+  @Test
+  void types_withoutContainer() {
+    var unconditional = new ExpressiveSchemaGenerator().generateSchema(MyRootTypeNoContainer.class);
+    System.out.println(unconditional.toPrettyString());
+
+    var generic = unconditional.get("$defs").get(GenericNoContainer.class.getSimpleName());
+    var props = generic.get("properties");
+    assertThat(namesOf(props))
+      .as("empty 'container' name omits its declaration: this allows custom property rules to reflect children")
+      .doesNotContain("config", "");
+  }
+
+
   private static List<String> namesOf(JsonNode defs) {
     var names = new ArrayList<String>();
     defs.fieldNames().forEachRemaining(names::add);