Create support for async request unit tests

Author: russgold

operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java

@@ -3,6 +3,14 @@
 
 package oracle.kubernetes.operator.calls;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import io.kubernetes.client.ApiCallback;
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
@@ -18,14 +26,6 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 /**
  * A Step driven by an asynchronous call to the Kubernetes API, which results in a series of callbacks until canceled.
  */
@@ -120,7 +120,7 @@ public void onSuccess(T result, int statusCode, Map<String, List<String>> respon
       };
 
       try {
-        CancelableCall c = factory.generate(requestParams, client, _continue, callback);
+        CancellableCall c = factory.generate(requestParams, client, _continue, callback);
 
         // timeout handling
         fiber.owner.getExecutor().schedule(() -> {

operator/src/main/java/oracle/kubernetes/operator/calls/CallFactory.java

@@ -9,5 +9,5 @@
 
 @FunctionalInterface
 public interface CallFactory<T> {
-  CancelableCall generate(RequestParams requestParams, ApiClient client, String cont, ApiCallback<T> callback) throws ApiException;
+  CancellableCall generate(RequestParams requestParams, ApiClient client, String cont, ApiCallback<T> callback) throws ApiException;
 }

operator/src/main/java/oracle/kubernetes/operator/calls/CallResponse.java

@@ -3,18 +3,18 @@
 
 package oracle.kubernetes.operator.calls;
 
-import io.kubernetes.client.ApiException;
-
 import java.util.List;
 import java.util.Map;
 
+import io.kubernetes.client.ApiException;
+
 public final class CallResponse<T> {
   public final T result;
   public final ApiException e;
   public final int statusCode;
   public final Map<String, List<String>> responseHeaders;
 
-  CallResponse(T result, ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
+  public CallResponse(T result, ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
     this.result = result;
     this.e = e;
     this.statusCode = statusCode;

operator/src/main/java/oracle/kubernetes/operator/calls/CallWrapper.java

@@ -8,7 +8,7 @@
 /**
  * A wrapper for an OKHttp call to isolate its own callers.
  */
-public class CallWrapper implements CancelableCall {
+public class CallWrapper implements CancellableCall {
 
   private Call underlyingCall;
 

operator/src/main/java/oracle/kubernetes/operator/calls/CancelableCall.java renamed to operator/src/main/java/oracle/kubernetes/operator/calls/CancellableCall.java

@@ -6,7 +6,7 @@
 /**
  * An interface for an asynchronous API invocation that can be canceled
  */
-public interface CancelableCall {
+public interface CancellableCall {
 
   /**
    * Cancels the active call.

operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java

@@ -3,6 +3,10 @@
 
 package oracle.kubernetes.operator.helpers;
 
+import java.util.function.Consumer;
+
+import com.squareup.okhttp.Call;
+
 import io.kubernetes.client.ApiCallback;
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
@@ -13,42 +17,18 @@
 import io.kubernetes.client.apis.CoreV1Api;
 import io.kubernetes.client.apis.ExtensionsV1beta1Api;
 import io.kubernetes.client.apis.VersionApi;
-import io.kubernetes.client.models.V1ConfigMap;
-import io.kubernetes.client.models.V1DeleteOptions;
-import io.kubernetes.client.models.V1EventList;
-import io.kubernetes.client.models.V1Job;
-import io.kubernetes.client.models.V1Namespace;
-import io.kubernetes.client.models.V1PersistentVolumeClaimList;
-import io.kubernetes.client.models.V1PersistentVolumeList;
-import io.kubernetes.client.models.V1Pod;
-import io.kubernetes.client.models.V1PodList;
-import io.kubernetes.client.models.V1Secret;
-import io.kubernetes.client.models.V1SelfSubjectAccessReview;
-import io.kubernetes.client.models.V1SelfSubjectRulesReview;
-import io.kubernetes.client.models.V1Service;
-import io.kubernetes.client.models.V1ServiceList;
-import io.kubernetes.client.models.V1Status;
-import io.kubernetes.client.models.V1SubjectAccessReview;
-import io.kubernetes.client.models.V1TokenReview;
-import io.kubernetes.client.models.V1beta1CustomResourceDefinition;
-import io.kubernetes.client.models.V1beta1Ingress;
-import io.kubernetes.client.models.V1beta1IngressList;
-import io.kubernetes.client.models.VersionInfo;
+import io.kubernetes.client.models.*;
 import oracle.kubernetes.operator.TuningParameters.CallBuilderTuning;
 import oracle.kubernetes.operator.calls.AsyncRequestStep;
 import oracle.kubernetes.operator.calls.CallFactory;
 import oracle.kubernetes.operator.calls.CallWrapper;
-import oracle.kubernetes.operator.calls.CancelableCall;
+import oracle.kubernetes.operator.calls.CancellableCall;
 import oracle.kubernetes.operator.calls.RequestParams;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.v1.Domain;
 import oracle.kubernetes.weblogic.domain.v1.DomainList;
 import oracle.kubernetes.weblogic.domain.v1.api.WeblogicApi;
 
-import com.squareup.okhttp.Call;
-
-import java.util.function.Consumer;
-
 /**
  * Simplifies synchronous and asynchronous call patterns to the Kubernetes API Server.
  * 
@@ -207,7 +187,7 @@ private com.squareup.okhttp.Call listDomainAsync(ApiClient client, String namesp
   private final CallFactory<DomainList> LIST_DOMAIN = (requestParams, usage, cont, callback)
         -> wrap(listDomainAsync(usage, requestParams.namespace, cont, callback));
 
-  private CancelableCall wrap(Call call) {
+  private CancellableCall wrap(Call call) {
     return new CallWrapper(call);
   }
 

operator/src/main/java/oracle/kubernetes/operator/steps/DeleteIngressListStep.java

@@ -19,7 +19,6 @@
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
-import oracle.kubernetes.operator.work.ContainerResolver;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
@@ -36,7 +35,7 @@ public DeleteIngressListStep(Collection<V1beta1Ingress> c, Step next) {
 
   @Override
   public NextAction apply(Packet packet) {
-    CallBuilderFactory factory = ContainerResolver.getInstance().getContainer().getSPI(CallBuilderFactory.class);
+    CallBuilderFactory factory = new CallBuilderFactory();
 
     if (it.hasNext()) {
       V1beta1Ingress v1beta1Ingress = it.next();