fix(model-core) apiVersion for core k8s resources

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/ApiVersionUtil.java

@@ -25,7 +25,7 @@ private ApiVersionUtil() {
 
   /**
    * Extracts apiGroupName from apiGroupVersion when in resource for apiGroupName/apiGroupVersion combination
-   * 
+   *
    * @param <T> Template argument provided
    * @param item resource which is being used
    * @param apiGroup apiGroupName present if any
@@ -42,7 +42,7 @@ public static <T> String apiGroup(T item, String apiGroup) {
 
   /**
    * Returns the api version falling back to the items apiGroupVersion if not null.
-   * 
+   *
    * @param <T> type of parameter
    * @param item item to be processed
    * @param apiVersion apiVersion string
@@ -59,7 +59,7 @@ public static <T> String apiVersion(T item, String apiVersion) {
 
   /**
    * Separates apiGroupVersion for apiGroupName/apiGroupVersion combination.
-   * 
+   *
    * @param apiVersion The apiGroupVersion or apiGroupName/apiGroupVersion combo.
    * @return Just the apiGroupVersion part without the apiGroupName.
    */
@@ -75,7 +75,7 @@ public static String trimVersion(String apiVersion) {
 
   /**
    * Separates apiGroupName for apiGroupName/apiGroupVersion combination.
-   * 
+   *
    * @param apiVersion The apiGroupVersion or apiGroupName/apiGroupVersion combo.
    * @return Just the apiGroupName part without the apiGroupName, or apiVersion if no separator is found.
    */
@@ -91,7 +91,7 @@ public static String trimGroup(String apiVersion) {
 
   /**
    * Separates apiGroupName for apiGroupName/apiGroupVersion combination.
-   * 
+   *
    * @param apiVersion The apiGroupVersion or apiGroupName/apiGroupVersion combo.
    * @return Just the apiGroupName part without the apiGroupName, or null if no separator is found.
    */
@@ -110,9 +110,6 @@ public static String trimGroupOrNull(String apiVersion) {
    * @return version if group is null or empty, joined string otherwise.
    */
   public static String joinApiGroupAndVersion(String group, String version) {
-    if (Utils.isNullOrEmpty(group)) {
-      return version;
-    }
-    return group + "/" + version;
+    return HasMetadata.getApiVersion(group, version);
   }
 }

kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java

@@ -76,7 +76,7 @@ static String getApiVersion(Class<?> clazz) {
     final String group = getGroup(clazz);
     final String version = getVersion(clazz);
     if (group != null && version != null) {
-      return group + "/" + version;
+      return getApiVersion(group, version);
     }
     if (group != null || version != null) {
       throw new IllegalArgumentException(
@@ -86,6 +86,14 @@ static String getApiVersion(Class<?> clazz) {
     return null;
   }
 
+  static String getApiVersion(String group, String version) {
+    Objects.requireNonNull(version);
+    if (group == null || group.isBlank()) {
+      return version;
+    }
+    return group + "/" + version;
+  }
+
   /**
    * Retrieves the group associated with the specified HasMetadata as defined by the {@link Group} annotation.
    *

kubernetes-model-generator/kubernetes-model-core/src/test/java/io/fabric8/kubernetes/api/model/HasMetadataTest.java

@@ -206,6 +206,11 @@ void addingAndRemovingOwnerReferenceShouldWork() {
     assertFalse(hasMetadata.hasOwnerReferenceFor(owner2));
   }
 
+  @Test
+  void apiVersionOfConfigMapShouldBeCorrect() {
+    assertEquals("v1", HasMetadata.getApiVersion(ConfigMap.class));
+  }
+
   @Test
   void addingSameOwnerReferenceMultipleTimesShouldAddItOnlyOnce() {
     HasMetadata hasMetadata = new Default();