From fdf2c5348de381c3d3052fdfb34051c72d64ea3f Mon Sep 17 00:00:00 2001 From: Johannes Edmeier Date: Wed, 24 Jun 2020 13:47:23 +0200 Subject: [PATCH] move HasMetadataComparator to exported package The openshift-model needs to make use of the HasMetadataComparator and therefore it should reside in an exported package fixes #2309 --- .../{internal => api/model}/HasMetadataComparator.java | 2 +- .../java/io/fabric8/kubernetes/api/model/KubernetesList.java | 2 -- .../src/main/java/io/fabric8/openshift/api/model/Template.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) rename kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/{internal => api/model}/HasMetadataComparator.java (98%) diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/internal/HasMetadataComparator.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/HasMetadataComparator.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/internal/HasMetadataComparator.java rename to kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/HasMetadataComparator.java index 7ef1f2bd665..b4d1a3e687e 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/internal/HasMetadataComparator.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/HasMetadataComparator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.internal; +package io.fabric8.kubernetes.api.model; import io.fabric8.kubernetes.api.model.HasMetadata; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java index 4501ad5abbf..74c74745230 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java @@ -19,12 +19,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.internal.HasMetadataComparator; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.Inline; import javax.annotation.Generated; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java index 28d9b6afe35..9d79e6cb401 100644 --- a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java +++ b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java @@ -27,7 +27,7 @@ import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.internal.HasMetadataComparator; +import io.fabric8.kubernetes.api.model.HasMetadataComparator; import io.fabric8.kubernetes.model.annotation.ApiGroup; import io.fabric8.kubernetes.model.annotation.ApiVersion; import io.sundr.builder.annotations.Buildable;