Fix another unit-test to not load a real client

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
@@ -16,12 +16,10 @@
 import javax.annotation.Nonnull;
 
 import io.kubernetes.client.extended.controller.reconciler.Result;
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
 import oracle.kubernetes.common.logging.MessageKeys;
-import oracle.kubernetes.operator.calls.Client;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.KubernetesUtils;
 import oracle.kubernetes.operator.helpers.LastKnownStatus;
@@ -166,13 +164,12 @@ private static class ServerStatusReaderStep extends Step {
       final boolean tty = false;
       Process proc = null;
       String state = null;
-      ApiClient client = Client.getInstance();
 
       try {
         try (ThreadLoggingContext stack =
                  setThreadContext().namespace(getNamespace(currentPod)).domainUid(getDomainUid(currentPod))) {
 
-          KubernetesExec kubernetesExec = execFactory.create(client, currentPod, WLS_CONTAINER_NAME);
+          KubernetesExec kubernetesExec = execFactory.create(currentPod, WLS_CONTAINER_NAME);
           kubernetesExec.setStdin(stdin);
           kubernetesExec.setTty(tty);
           proc = kubernetesExec.exec("/weblogic-operator/scripts/readState.sh");

operator/src/main/java/oracle/kubernetes/operator/utils/KubernetesExecFactory.java

@@ -1,20 +1,18 @@
-// Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2019, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.utils;
 
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.models.V1Pod;
 
 /** A factory for objects which can execute commands in Kubernetes containers. */
 public interface KubernetesExecFactory {
   /**
    * Creates an object to execute a command in a Kubernetes container.
    *
-   * @param client the api client to dispatch the "exec" command
    * @param pod the pod which has the container in which the command should be run
    * @param containerName the container in which the command is to be run
    * @return the object to execute the command
    */
-  KubernetesExec create(ApiClient client, V1Pod pod, String containerName);
+  KubernetesExec create(V1Pod pod, String containerName);
 }

operator/src/main/java/oracle/kubernetes/operator/utils/KubernetesExecFactoryImpl.java

@@ -1,36 +1,34 @@
-// Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2019, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.utils;
 
 import java.io.IOException;
 
 import io.kubernetes.client.Exec;
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1Pod;
+import oracle.kubernetes.operator.calls.Client;
 
 /** The live implementation of this factory, which uses the 'kubectl exec' command. */
 public class KubernetesExecFactoryImpl implements KubernetesExecFactory {
   @Override
-  public KubernetesExec create(ApiClient client, V1Pod pod, String containerName) {
-    return new KubernetesExecImpl(client, pod, containerName);
+  public KubernetesExec create(V1Pod pod, String containerName) {
+    return new KubernetesExecImpl(pod, containerName);
   }
 
   public static class KubernetesExecImpl extends KubernetesExec {
-    private final ApiClient client;
     private final V1Pod pod;
     private final String containerName;
 
-    KubernetesExecImpl(ApiClient client, V1Pod pod, String containerName) {
-      this.client = client;
+    KubernetesExecImpl(V1Pod pod, String containerName) {
       this.pod = pod;
       this.containerName = containerName;
     }
 
     @Override
     public Process exec(String... command) throws ApiException, IOException {
-      return new Exec(client).exec(pod, command, containerName, isStdin(), isTty());
+      return new Exec(Client.getInstance()).exec(pod, command, containerName, isStdin(), isTty());
     }
   }
 }

operator/src/test/java/oracle/kubernetes/operator/KubernetesExecFactoryFake.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
@@ -10,7 +10,6 @@
 
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.models.V1Pod;
 import oracle.kubernetes.operator.helpers.LegalNames;
 import oracle.kubernetes.operator.utils.KubernetesExec;
@@ -38,7 +37,7 @@ void defineResponse(String serverName, String response, Integer exitCode) {
   }
 
   @Override
-  public KubernetesExec create(ApiClient client, V1Pod pod, String containerName) {
+  public KubernetesExec create(V1Pod pod, String containerName) {
     return new KubernetesExec() {
       @Override
       public Process exec(String... command) {