Fix fabric8io#1661: Remove generic parameter from KubernetesResource

mgorniew · Jul 26, 2019 · 5f576c4 · 5f576c4
1 parent ab7438b
commit 5f576c4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
    * Fix #1589: Move HorizontalPodAutoscaler to autoscaling/v1
    * Fix #1553: Allow to explicitly set non-matching field selectors using `withoutField`
    * Cleaned up kubernetes-model pom.xml
+   * Fix #1661: Remove generic parameter from KubernetesResource
 
   Dependency Upgrade
 

diff --git a/...tes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java b/...tes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java
@@ -15,7 +15,7 @@
  */
 package io.fabric8.kubernetes.api.model;
 
-public interface HasMetadata extends KubernetesResource {
+public interface HasMetadata<E extends HasMetadata<E>> extends KubernetesResource<E> {
 
   ObjectMeta getMetadata();
   void setMetadata(ObjectMeta metadata);

diff --git a/...el/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResource.java b/...el/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResource.java
@@ -20,5 +20,5 @@
 import java.io.Serializable;
 
 @JsonDeserialize(using = KubernetesDeserializer.class)
-public interface KubernetesResource<E extends io.fabric8.kubernetes.api.model.HasMetadata> extends Serializable {
+public interface KubernetesResource extends Serializable {
 }
diff --git a/...ubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResourceList.java b/...ubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesResourceList.java
@@ -22,7 +22,7 @@
 import java.io.Serializable;
 
 @JsonDeserialize(using = KubernetesDeserializer.class)
-public interface KubernetesResourceList<E extends io.fabric8.kubernetes.api.model.HasMetadata> extends Serializable  {
+public interface KubernetesResourceList<E extends io.fabric8.kubernetes.api.model.HasMetadata<E>> extends Serializable  {
 
   ListMeta getMetadata();