Fix: @SchemaSwap with no target type (defaults to void) should cause …

…the property to be skipped.
fabric8io · Aug 30, 2022 · 7025175 · 7025175
1 parent 671e70d
commit 7025175
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java
@@ -35,6 +35,7 @@
 import static io.sundr.model.utils.Types.INT_REF;
 import static io.sundr.model.utils.Types.LONG_REF;
 import static io.sundr.model.utils.Types.STRING_REF;
+import static io.sundr.model.utils.Types.VOID;
 
 /**
  * Encapsulates the common logic supporting OpenAPI schema generation for CRD generation.
@@ -169,7 +170,7 @@ private void extractSchemaSwap(ClassRef definitionType, Object annotation, Inter
       schemaSwaps.registerSwap(definitionType,
           extractClassRef(params.get("originalType")),
           (String) params.get("fieldName"),
-          extractClassRef(params.get("targetType")));
+          extractClassRef(params.getOrDefault("targetType", void.class)));
 
     } else {
       throw new IllegalArgumentException("Unmanaged annotation type passed to the SchemaSwaps: " + annotation);
@@ -537,7 +538,7 @@ private T internalFromImpl(String name, TypeRef typeRef, Set<String> visited, In
                 .map(JsonNodeFactory.instance::textNode)
                 .toArray(JsonNode[]::new);
             return enumProperty(enumValues);
-          } else {
+          } else if (!classRef.getFullyQualifiedName().equals(VOID.getName())) {
             return resolveNestedClass(name, def, visited, schemaSwaps);
           }