fix(openapi): java.lang packaged classes aren't added as imports

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Oct 24, 2024 · 64a9e1f · 64a9e1f
1 parent b6bcc3d
commit 64a9e1f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/...napi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/ImportManager.java b/...napi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/ImportManager.java
@@ -26,9 +26,14 @@ public interface ImportManager {
 
   default void addImport(String importedClass) {
     // Only add import if it belongs to a different package
-    if (!Objects.equals(importedClass.substring(0, importedClass.lastIndexOf('.')), getPackageName())) {
-      getImports().add(importedClass);
+    if (Objects.equals(importedClass.substring(0, importedClass.lastIndexOf('.')), getPackageName())) {
+      return;
     }
+    // Do not import classes from java.lang
+    if (importedClass.substring(0, importedClass.lastIndexOf('.')).equals("java.lang")) {
+      return;
+    }
+    getImports().add(importedClass);
   }
 
   default void addAllImports(Collection<String> allImports) {

diff --git a/...er/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java b/...er/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java
@@ -1,7 +1,6 @@
 
 package io.fabric8.openshift.api.model.installer.baremetal.v1;
 
-import java.lang.String;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;

diff --git a/...r/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterNetworkEntry.java b/...r/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterNetworkEntry.java
@@ -1,7 +1,6 @@
 
 package io.fabric8.openshift.api.model.installer.v1;
 
-import java.lang.String;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.Generated;

diff --git a/...r/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachineNetworkEntry.java b/...r/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachineNetworkEntry.java
@@ -1,7 +1,6 @@
 
 package io.fabric8.openshift.api.model.installer.v1;
 
-import java.lang.String;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.Generated;

diff --git a/...-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Networking.java b/...-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Networking.java
@@ -1,7 +1,6 @@
 
 package io.fabric8.openshift.api.model.installer.v1;
 
-import java.lang.String;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;