Inf recursion fix backport clean

.blazar.yaml

@@ -1,19 +1,17 @@
+buildpack:
+  name: Blazar-Buildpack-Java-single-module
+  branch: kubernetes_client_changes
 enabled: true
 
 env:
   SET_VERSION_OVERRIDE: $GIT_BRANCH-SNAPSHOT
   MAVEN_OPTS: -Xmx4096m
-  MAVEN_ARGS: -DskipTests -am -pl kubernetes-server-mock,kubernetes-model-generator,kubernetes-model-generator/kubernetes-model-apiextensions,kubernetes-client
+  MAVEN_ARGS: -DskipTests -am -pl kubernetes-server-mock,kubernetes-model-generator,kubernetes-model-generator/kubernetes-model-apiextensions,kubernetes-client,crd-generator/api,crd-generator/apt
 
 buildResources:
   cpus: 2
   memoryMb: 5120
 
-buildpack:
-  host: git.hubteam.com
-  organization: HubSpot
-  repository: Blazar-Buildpack-Java
-  branch: v2-single-module
 
 provides:
   - name: kubernetes-client

crd-generator/api/src/main/java/io/fabric8/crd/generator/visitor/AdditionalPrinterColumnDetector.java

@@ -25,7 +25,7 @@ public AdditionalPrinterColumnDetector() {
   }
 
   public AdditionalPrinterColumnDetector(String prefix) {
-    super(prefix, PrinterColumn.class.getSimpleName(), new ArrayList<>());
+    super(prefix, PrinterColumn.class.getSimpleName());
   }
 }
 

crd-generator/api/src/main/java/io/fabric8/crd/generator/visitor/AnnotatedMultiPropertyPathDetector.java

@@ -21,13 +21,18 @@
 import io.sundr.model.Property;
 import io.sundr.model.TypeDef;
 import io.sundr.model.TypeDefBuilder;
+
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static io.fabric8.crd.generator.AbstractJsonSchema.ANNOTATION_JSON_IGNORE;
+
 public class AnnotatedMultiPropertyPathDetector extends TypedVisitor<TypeDefBuilder> {
 
   protected static final String DOT = ".";
@@ -37,54 +42,62 @@ public class AnnotatedMultiPropertyPathDetector extends TypedVisitor<TypeDefBuil
   private final String annotationName;
   private final List<Property> parents;
   private final Map<String, Property> properties;
+  private final Deque<Runnable> toRun;
 
   public AnnotatedMultiPropertyPathDetector(String prefix, String annotationName) {
-    this(prefix, annotationName, new ArrayList<>());
-  }
-
-  public AnnotatedMultiPropertyPathDetector(String prefix, String annotationName, List<Property> parents) {
-    this(prefix, annotationName, parents, new HashMap<>());
+    this(prefix, annotationName, new ArrayList<>(), new HashMap<>(), new ArrayDeque<>());
   }
 
-  public AnnotatedMultiPropertyPathDetector(String prefix, String annotationName, List<Property> parents, Map<String, Property> properties) {
+  public AnnotatedMultiPropertyPathDetector(String prefix, String annotationName, List<Property> parents,
+                                            Map<String, Property> properties, Deque<Runnable> toRun) {
     this.prefix = prefix;
     this.annotationName = annotationName;
     this.parents = parents;
     this.properties = properties;
+    this.toRun = toRun;
+  }
+
+  private boolean excludePropertyProcessing(Property p) {
+    return p.getAnnotations().stream()
+      .anyMatch(ann -> ann.getClassRef().getFullyQualifiedName().equals(ANNOTATION_JSON_IGNORE));
   }
 
   @Override
   public void visit(TypeDefBuilder builder) {
     TypeDef type = builder.build();
     final List<Property> props = type.getProperties();
     for (Property p : props) {
-        if (parents.contains(p)) {
-          continue;
-        }
+      if (parents.contains(p)) {
+        continue;
+      }
 
-        List<Property> newParents = new ArrayList<>(parents);
-        boolean match = p.getAnnotations().stream().anyMatch(a -> a.getClassRef().getName().equals(annotationName));
-        if (match) {
-          newParents.add(p);
-          this.properties
-            .put(newParents.stream().map(Property::getName).collect(Collectors.joining(DOT, prefix, "")), p);
-        }
+      List<Property> newParents = new ArrayList<>(parents);
+      boolean match = p.getAnnotations().stream().anyMatch(a -> a.getClassRef().getName().equals(annotationName));
+      if (match) {
+        newParents.add(p);
+        this.properties
+          .put(newParents.stream().map(Property::getName).collect(Collectors.joining(DOT, prefix, "")), p);
+      }
     }
 
     props.stream().filter(p -> p.getTypeRef() instanceof ClassRef).forEach(p -> {
-        if (!parents.contains(p)) {
-          ClassRef classRef = (ClassRef) p.getTypeRef();
-          TypeDef propertyType = Types.typeDefFrom(classRef);
-          if (!propertyType.isEnum()) {
-            List<Property> newParents = new ArrayList<>(parents);
-            newParents.add(p);
-            new TypeDefBuilder(propertyType)
-              .accept(new AnnotatedMultiPropertyPathDetector(prefix, annotationName, newParents,
-                this.properties))
-              .build();
-          }
+      if (!parents.contains(p) && !excludePropertyProcessing(p)) {
+        ClassRef classRef = (ClassRef) p.getTypeRef();
+        TypeDef propertyType = Types.typeDefFrom(classRef);
+        if (!propertyType.isEnum() && !classRef.getPackageName().startsWith("java.")) {
+          List<Property> newParents = new ArrayList<>(parents);
+          newParents.add(p);
+          toRun.add(() -> new TypeDefBuilder(propertyType)
+            .accept(new AnnotatedMultiPropertyPathDetector(prefix, annotationName, newParents, properties, toRun)));
         }
-      });
+      }
+    });
+
+    if (parents.isEmpty()) {
+      while (!toRun.isEmpty()) {
+        toRun.pop().run();
+      }
+    }
   }
 
   public Set<String> getPaths() {

crd-generator/api/src/main/java/io/fabric8/crd/generator/visitor/AnnotatedPropertyPathDetector.java

@@ -17,16 +17,22 @@
 
 import io.fabric8.crd.generator.utils.Types;
 import io.sundr.builder.TypedVisitor;
+import io.sundr.model.AnnotationRef;
 import io.sundr.model.ClassRef;
 import io.sundr.model.Property;
 import io.sundr.model.TypeDef;
 import io.sundr.model.TypeDefBuilder;
+
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
+import static io.fabric8.crd.generator.AbstractJsonSchema.ANNOTATION_JSON_IGNORE;
+
 public class AnnotatedPropertyPathDetector extends TypedVisitor<TypeDefBuilder> {
 
   protected static final String DOT = ".";
@@ -35,59 +41,74 @@ public class AnnotatedPropertyPathDetector extends TypedVisitor<TypeDefBuilder>
   private final String prefix;
   private final String annotationName;
   private final List<Property> parents;
-  private final AtomicReference<Optional<String>> reference;
+  private final AtomicReference<String> reference;
+  private final Deque<Runnable> toRun;
 
   public AnnotatedPropertyPathDetector(String prefix, String annotationName) {
-    this(prefix, annotationName, new ArrayList<>());
-  }
-
-  public AnnotatedPropertyPathDetector(String prefix, String annotationName, List<Property> parents) {
-    this(prefix, annotationName, parents, new AtomicReference<>(Optional.empty()));
+    this(prefix, annotationName, new ArrayList<>(), new AtomicReference<>(), new ArrayDeque<>());
   }
 
-  public AnnotatedPropertyPathDetector(String prefix, String annotationName, List<Property> parents, AtomicReference<Optional<String>> reference) {
+  public AnnotatedPropertyPathDetector(String prefix, String annotationName, List<Property> parents,
+                                       AtomicReference<String> reference, Deque<Runnable> toRun) {
     this.prefix = prefix;
     this.annotationName = annotationName;
     this.parents = parents;
     this.reference = reference;
+    this.toRun = toRun;
+  }
+
+  private static boolean excludePropertyProcessing(Property p) {
+    for (AnnotationRef annotation : p.getAnnotations()) {
+      if (annotation.getClassRef().getFullyQualifiedName().equals(ANNOTATION_JSON_IGNORE)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   @Override
   public void visit(TypeDefBuilder builder) {
     TypeDef type = builder.build();
     final List<Property> properties = type.getProperties();
+    visitProperties(properties);
+  }
+
+  private void visitProperties(List<Property> properties) {
     for (Property p : properties) {
       if (parents.contains(p)) {
-          continue;
-        }
+        continue;
+      }
 
-        List<Property> newParents = new ArrayList<>(parents);
-        boolean match = p.getAnnotations().stream().anyMatch(a -> a.getClassRef().getName().equals(annotationName));
+      List<Property> newParents = new ArrayList<>(parents);
+      boolean match = false;
+      for (AnnotationRef annotation : p.getAnnotations()) {
+        match = annotation.getClassRef().getName().equals(annotationName);
         if (match) {
           newParents.add(p);
-          reference.set(Optional.of(newParents.stream().map(Property::getName).collect(Collectors.joining(DOT, prefix, ""))));
+          reference.set(newParents.stream().map(Property::getName).collect(Collectors.joining(DOT, prefix, "")));
           return;
         }
-    }
+      }
 
-    properties.stream()
-      .filter(p -> p.getTypeRef() instanceof ClassRef)
-      .forEach(p -> {
-        if (!parents.contains(p)) {
-          ClassRef classRef = (ClassRef) p.getTypeRef();
-          TypeDef propertyType = Types.typeDefFrom(classRef);
-          if (!propertyType.isEnum()) {
-            List<Property> newParents = new ArrayList<>(parents);
-            newParents.add(p);
-            new TypeDefBuilder(propertyType)
-              .accept(new AnnotatedPropertyPathDetector(prefix, annotationName, newParents, reference))
-              .build();
-          }
+      if (p.getTypeRef() instanceof ClassRef && !excludePropertyProcessing(p)) {
+        ClassRef classRef = (ClassRef) p.getTypeRef();
+        TypeDef propertyType = Types.typeDefFrom(classRef);
+        if (!propertyType.isEnum() && !classRef.getPackageName().startsWith("java.")) {
+          newParents.add(p);
+          new TypeDefBuilder(propertyType)
+            .accept(new AnnotatedPropertyPathDetector(prefix, annotationName, newParents, reference, toRun));
         }
-      });
+      }
+    }
+
+    if (parents.isEmpty()) {
+      while (!toRun.isEmpty() && reference.get() == null) {
+        toRun.pop().run();
+      }
+    }
   }
 
   public Optional<String> getPath() {
-    return reference.get();
+    return Optional.ofNullable(reference.get());
   }
 }

crd-generator/api/src/main/java/io/fabric8/crd/generator/visitor/LabelSelectorPathDetector.java

@@ -25,6 +25,6 @@ public LabelSelectorPathDetector() {
   }
 
 	public LabelSelectorPathDetector(String prefix) {
-		super(prefix, LabelSelector.class.getSimpleName(), new ArrayList<>());
+		super(prefix, LabelSelector.class.getSimpleName());
 	}
 }

crd-generator/api/src/main/java/io/fabric8/crd/generator/visitor/SpecReplicasPathDetector.java

@@ -24,6 +24,6 @@ public SpecReplicasPathDetector() {
     this(DOT);
   }
 	public SpecReplicasPathDetector(String prefix) {
-		super(prefix, SpecReplicas.class.getSimpleName(), new ArrayList<>());
+		super(prefix, SpecReplicas.class.getSimpleName());
 	}
 }

crd-generator/api/src/main/java/io/fabric8/crd/generator/visitor/StatusReplicasPathDetector.java

@@ -21,7 +21,7 @@
 public class StatusReplicasPathDetector extends AnnotatedPropertyPathDetector {
 
 	public StatusReplicasPathDetector(String prefix) {
-    super(prefix, StatusReplicas.class.getSimpleName(), new ArrayList<>());
+    super(prefix, StatusReplicas.class.getSimpleName());
 
   }
 

crd-generator/api/src/test/java/io/fabric8/crd/example/map/ContainingMapsSpec.java

@@ -15,6 +15,7 @@
  */
 package io.fabric8.crd.example.map;
 
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,4 +33,10 @@ public Map<String, Map<String, List<Boolean>>> getTest2() {
     return test2;
   }
 
+  public enum Foo {
+    BAR
+  }
+
+  private EnumMap<Foo, String> enumToStringMap;
+
 }

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

@@ -275,7 +275,7 @@ void mapPropertyShouldHaveCorrectValueType() {
       final Map<String, JSONSchemaProps> specProps = version.getSchema().getOpenAPIV3Schema()
         .getProperties().get("spec").getProperties();
 
-      assertEquals(2, specProps.size());
+      assertEquals(3, specProps.size());
 
       checkMapProp(specProps, "test", "array");
       String arrayType = specProps.get("test").getAdditionalProperties().getSchema().getItems().getSchema().getType();

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoscalingAPIGroupClient.java

@@ -41,4 +41,9 @@ public V2beta1AutoscalingAPIGroupDSL v2beta1() {
   public V2beta2AutoscalingAPIGroupDSL v2beta2() {
     return adapt(V2beta2AutoscalingAPIGroupClient.class);
   }
+
+  @Override
+  public V2AutoscalingAPIGroupDSL v2() {
+    return adapt(V2AutoscalingAPIGroupClient.class);
+  }
 }

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupClient.java

@@ -0,0 +1,37 @@
+/**
+ * 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.kubernetes.client;
+
+import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler;
+import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class V2AutoscalingAPIGroupClient extends BaseClient implements V2AutoscalingAPIGroupDSL {
+
+  public V2AutoscalingAPIGroupClient() {
+    super();
+  }
+
+  public V2AutoscalingAPIGroupClient(ClientContext clientContext) {
+    super(clientContext);
+  }
+
+  @Override
+  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers() {
+    return Handlers.getOperation(HorizontalPodAutoscaler.class, HorizontalPodAutoscalerList.class, this);
+  }
+}

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupDSL.java

@@ -0,0 +1,25 @@
+/**
+ * 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.kubernetes.client;
+
+import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler;
+import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public interface V2AutoscalingAPIGroupDSL extends Client {
+  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers();
+}