Add more test and edge cases

Author: andreaTP

crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java

@@ -116,7 +116,6 @@ protected T internalFrom(TypeDef definition, String... ignore) {
   }
 
   private T internalFromImpl(TypeDef definition, Set<String> visited, String... ignore) {
-    visited.add(definition.getFullyQualifiedName());
     final B builder = newBuilder();
     Set<String> ignores =
       ignore.length > 0 ? new LinkedHashSet<>(Arrays.asList(ignore)) : Collections
@@ -417,9 +416,11 @@ private T internalFromImpl(String name, TypeRef typeRef, Set<String> visited) {
               .toArray(JsonNode[]::new);
             return enumProperty(enumValues);
           } else {
-            if (!def.getFullyQualifiedName().startsWith("java") && visited.contains(def.getFullyQualifiedName())) {
-              throw new IllegalArgumentException("Found a cyclic reference involving " + def.getFullyQualifiedName());
+            String visitedName = def.getFullyQualifiedName() + "-" + name;
+            if (!def.getFullyQualifiedName().startsWith("java") && visited.contains(visitedName)) {
+              throw new IllegalArgumentException("Found a cyclic reference involving the field " + name + " of type " + def.getFullyQualifiedName());
             }
+            visited.add(visitedName);
             return internalFromImpl(def, visited);
           }
 

crd-generator/api/src/test/java/io/fabric8/crd/example/nocyclic/NoCyclic.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.crd.example.nocyclic;
+
+import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("sample.fabric8.io")
+@Version("v1alpha1")
+public class NoCyclic extends CustomResource<NoCyclicSpec, NoCyclicStatus> implements Namespaced {
+
+}

crd-generator/api/src/test/java/io/fabric8/crd/example/nocyclic/NoCyclicSpec.java

@@ -0,0 +1,21 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.crd.example.nocyclic;
+
+public class NoCyclicSpec {
+  private Ref ref1;
+  private Ref ref2;
+}

crd-generator/api/src/test/java/io/fabric8/crd/example/nocyclic/NoCyclicStatus.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.crd.example.nocyclic;
+
+public class NoCyclicStatus {
+  private String message;
+  // private Ref ref1;
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+}

crd-generator/api/src/test/java/io/fabric8/crd/example/nocyclic/Ref.java

@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.crd.example.nocyclic;
+
+public class Ref {
+
+  private int ref;
+
+}

crd-generator/api/src/test/java/io/fabric8/crd/generator/CRDGeneratorTest.java

@@ -26,6 +26,7 @@
 import io.fabric8.crd.example.joke.JokeRequestStatus;
 import io.fabric8.crd.example.multiple.v1.Multiple;
 import io.fabric8.crd.example.multiple.v1.MultipleSpec;
+import io.fabric8.crd.example.nocyclic.NoCyclic;
 import io.fabric8.crd.example.simplest.Simplest;
 import io.fabric8.crd.example.simplest.SimplestSpec;
 import io.fabric8.crd.example.simplest.SimplestStatus;
@@ -207,10 +208,19 @@ void shouldProperlyGenerateMultipleVersionsOfCRDs() {
     assertThrows(
       IllegalArgumentException.class,
       () -> generator.detailedGenerate(),
-      "Found a cyclic reference involving io.fabric8.crd.example.cyclic.Ref"
+      "An IllegalArgument Exception hasn't been thrown when generating a CRD with cyclic references"
     );
   }
 
+  @Test void notGeneratingACycleButReusingShouldSucceed() {
+    final CRDGenerator generator = new CRDGenerator()
+      .customResourceClasses(NoCyclic.class)
+      .forCRDVersions("v1", "v1beta1")
+      .withOutput(output);
+
+    CRDGenerationInfo info = generator.detailedGenerate();
+    assertEquals(2, info.numberOfGeneratedCRDs());
+  }
 
   @FunctionalInterface
   private interface CRTest {