fix #3845 #3407: refining resourceList to use common logic

fabric8io · Feb 17, 2022 · ea29ffe · ea29ffe
1 parent 0e6b058
commit ea29ffe
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 667 deletions.
diff --git a/...ain/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassOperationsImpl.java b/...ain/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassOperationsImpl.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
@@ -42,7 +41,7 @@ public VolumeSnapshotClassOperationsImpl(OperationContext context) {
   }
 
   @Override
-  public BaseOperation<VolumeSnapshotClass, VolumeSnapshotClassList, VolumeSnapshotClassResource> newInstance(OperationContext context) {
+  public VolumeSnapshotClassOperationsImpl newInstance(OperationContext context) {
     return new VolumeSnapshotClassOperationsImpl(context);
   }
 

diff --git a/...n/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentOperationsImpl.java b/...n/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentOperationsImpl.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
@@ -38,7 +37,7 @@ public VolumeSnapshotContentOperationsImpl(OperationContext context) {
   }
 
   @Override
-  public BaseOperation<VolumeSnapshotContent, VolumeSnapshotContentList, VolumeSnapshotContentResource> newInstance(OperationContext context) {
+  public VolumeSnapshotContentOperationsImpl newInstance(OperationContext context) {
     return new VolumeSnapshotContentOperationsImpl(context);
   }
 

diff --git a/...src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotOperationsImpl.java b/...src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotOperationsImpl.java
@@ -16,7 +16,6 @@
 package io.fabric8.volumesnapshot.client.internal;
 
 import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
@@ -35,7 +34,7 @@ public VolumeSnapshotOperationsImpl(OperationContext ctx) {
   }
 
   @Override
-  public BaseOperation<VolumeSnapshot, VolumeSnapshotList, VolumeSnapshotResource> newInstance(OperationContext context) {
+  public VolumeSnapshotOperationsImpl newInstance(OperationContext context) {
     return new VolumeSnapshotOperationsImpl(context);
   }
 

diff --git a/.../io/fabric8/kubernetes/client/dsl/ListVisitFromServerGetDeleteRecreateWaitApplicable.java b/.../io/fabric8/kubernetes/client/dsl/ListVisitFromServerGetDeleteRecreateWaitApplicable.java
@@ -16,14 +16,21 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-import java.util.List;
-
 import io.fabric8.kubernetes.api.builder.Visitable;
 import io.fabric8.kubernetes.client.FromServerGettable;
 
+import java.util.List;
+
 public interface ListVisitFromServerGetDeleteRecreateWaitApplicable<T> extends Visitable<ListVisitFromServerGetDeleteRecreateWaitApplicable<T>>,
   FromServerGettable<List<T>>,
   Waitable<List<T>, T>,
   ListVisitFromServerWritable<T>,
   DryRunable<ListVisitFromServerWritable<T>> {
+
+
+  /**
+   * Get each item as as a {@link Resource}
+   * @return the resources
+   */
+  List<Resource<T>> getResources();
 }
diff --git a/...es-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/VisitFromServerWritable.java b/...es-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/VisitFromServerWritable.java
diff --git a/...netes-client/src/main/java/io/fabric8/kubernetes/client/NamespaceableResourceAdapter.java b/...netes-client/src/main/java/io/fabric8/kubernetes/client/NamespaceableResourceAdapter.java
@@ -70,12 +70,15 @@ public class NamespaceableResourceAdapter<T extends HasMetadata> implements Name
   public NamespaceableResourceAdapter(T item, HasMetadataOperation<T, ?, ?> op) {
     this.operation = op;
     this.item = item;
+    this.resource = getResource(item, op);
+  }
+
+  public static <T extends HasMetadata> Resource<T> getResource(T item, HasMetadataOperation<T, ?, ?> op) {
     String namespace = KubernetesResourceUtil.getNamespace(item);
     if (namespace != null) {
-      this.resource = op.inNamespace(namespace).withItem(item);
-    } else {
-      this.resource = op.withItem(item);
+      return op.inNamespace(namespace).withItem(item);
     }
+    return op.withItem(item);
   }
 
   @Override

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/BaseOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/BaseOperation.java
@@ -259,7 +259,7 @@ public ExtensibleResource<T> cascading(boolean cascading) {
 
   @Override
   public R load(InputStream is) {
-    return newResource(context.withItem(unmarshal(is, type)));
+    return withItem(unmarshal(is, type));
   }
 
   @Override
@@ -519,6 +519,8 @@ public T patchStatus(T item) {
 
   @Override
   public R withItem(T item) {
+    // set both the item and the name - not all operations are looking at the item for the name
+    // things like configMaps().load(...).watch(...) for example
     return newResource(context.withItem(item).withName(KubernetesResourceUtil.getName(item)));
   }
 

diff --git a/...etes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/HasMetadataOperation.java b/...etes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/HasMetadataOperation.java
@@ -267,7 +267,7 @@ public T patch(PatchContext patchContext, String patch) {
   }
 
   @Override
-  public BaseOperation<T, L, R> newInstance(OperationContext context) {
+  public HasMetadataOperation<T, L, R> newInstance(OperationContext context) {
     return new HasMetadataOperation<>(context, type, listType);
   }
 

diff --git a/...va/io/fabric8/kubernetes/client/dsl/internal/GenericKubernetesResourceOperationsImpl.java b/...va/io/fabric8/kubernetes/client/dsl/internal/GenericKubernetesResourceOperationsImpl.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResourceList;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 
@@ -38,7 +37,7 @@ protected void validateOperation(Class<GenericKubernetesResource> type) {
   }
 
   @Override
-  public BaseOperation<GenericKubernetesResource, GenericKubernetesResourceList, Resource<GenericKubernetesResource>> newInstance(OperationContext context) {
+  public HasMetadataOperation<GenericKubernetesResource, GenericKubernetesResourceList, Resource<GenericKubernetesResource>> newInstance(OperationContext context) {
     return new GenericKubernetesResourceOperationsImpl(context, resourceNamespaced);
   }
 

diff --git a/...src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubernetesListOperationsImpl.java b/...src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubernetesListOperationsImpl.java
@@ -18,9 +18,9 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesList;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
-import io.fabric8.kubernetes.client.BaseClient;
 import io.fabric8.kubernetes.client.ClientContext;
 import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.NamespaceableResourceAdapter;
 import io.fabric8.kubernetes.client.ResourceHandler;
 import io.fabric8.kubernetes.client.dsl.Createable;
 import io.fabric8.kubernetes.client.dsl.Gettable;
@@ -124,9 +124,14 @@ public KubernetesList get() {
     return new KubernetesListBuilder(list).withItems(list.getItems().stream().map(meta -> getResource(meta).get()).collect(Collectors.toList())).build();
   }
 
+  /**
+   * Similar to Loadable.load - does not use the namespace from the resource
+   * 
+   * see also {@link NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl#getResource(OperationContext, HasMetadata)}
+   */
   private Resource<HasMetadata> getResource(HasMetadata resource) {
-    ResourceHandler<HasMetadata, ?> handler = NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.handlerOf(resource, context);
-    return handler.operation(this.context, null).newInstance(context.withItem(resource));
+    ResourceHandler<HasMetadata, ?> handler = NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl.handlerOf(resource, context);
+    return handler.operation(context, null).newInstance(context.withItem(null)).withItem(resource);
   }
 
   @Override

diff --git a/...tes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable.java b/...tes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable.java