Use call factory for custom resource definition calls

Author: russgold

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

@@ -250,7 +250,7 @@ public Step replaceDomainAsync(String name, String namespace, Domain body, Respo
   public V1beta1CustomResourceDefinition readCustomResourceDefinition(String name) throws ApiException {
     ApiClient client = helper.take();
     try {
-      return new ApiextensionsV1beta1Api(client).readCustomResourceDefinition(name, pretty, exact, export);
+      return CALL_FACTORY.readCustomResourceDefinition(client, name, pretty, exact, export);
     } finally {
       helper.recycle(client);
     }
@@ -266,7 +266,7 @@ public V1beta1CustomResourceDefinition createCustomResourceDefinition(V1beta1Cus
       throws ApiException {
     ApiClient client = helper.take();
     try {
-      return new ApiextensionsV1beta1Api(client).createCustomResourceDefinition(body, pretty);
+      return CALL_FACTORY.createCustomResourceDefinition(client, body, pretty);
     } finally {
       helper.recycle(client);
     }
@@ -968,6 +968,16 @@ private <T> Step createRequestAsync(ResponseStep<T> next, RequestParams requestP
 
 
   public static class SynchronousCallFactoryImpl implements SynchronousCallFactory {
+    @Override
+    public V1beta1CustomResourceDefinition readCustomResourceDefinition(ApiClient client, String name, String pretty, Boolean exact, Boolean export) throws ApiException {
+      return new ApiextensionsV1beta1Api(client).readCustomResourceDefinition(name, pretty, exact, export);
+    }
+
+    @Override
+    public V1beta1CustomResourceDefinition createCustomResourceDefinition(ApiClient client, V1beta1CustomResourceDefinition body, String pretty) throws ApiException {
+      return new ApiextensionsV1beta1Api(client).createCustomResourceDefinition(body, pretty);
+    }
+
     @Override
     public V1SelfSubjectRulesReview createSelfSubjectRulesReview(ApiClient client, V1SelfSubjectRulesReview body, String pretty) throws ApiException {
       return new AuthorizationV1Api(client).createSelfSubjectRulesReview(body, pretty);

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

@@ -4,11 +4,16 @@
 import io.kubernetes.client.ApiException;
 import io.kubernetes.client.models.V1PersistentVolumeList;
 import io.kubernetes.client.models.V1SelfSubjectRulesReview;
+import io.kubernetes.client.models.V1beta1CustomResourceDefinition;
 import io.kubernetes.client.models.VersionInfo;
 import oracle.kubernetes.weblogic.domain.v1.DomainList;
 
 public interface SynchronousCallFactory {
 
+  V1beta1CustomResourceDefinition readCustomResourceDefinition(ApiClient client, String name, String pretty, Boolean exact, Boolean export) throws ApiException;
+
+  V1beta1CustomResourceDefinition createCustomResourceDefinition(ApiClient client, V1beta1CustomResourceDefinition body, String pretty) throws ApiException;
+
   V1SelfSubjectRulesReview createSelfSubjectRulesReview(ApiClient client, V1SelfSubjectRulesReview body, String pretty) throws ApiException;
 
   V1PersistentVolumeList listPersistentVolumes(String _continue, ApiClient client, String pretty, String fieldSelector, Boolean includeUninitialized, String labelSelector, Integer limit, String resourceVersion, Integer timeoutSeconds, Boolean watch) throws ApiException;

operator/src/test/java/oracle/kubernetes/operator/builders/StubWatchFactory.java

@@ -69,7 +69,7 @@ public static List<Map<String, String>> getRecordedParameters() {
     public <T> WatchI<T> createWatch(Pool<ApiClient> pool, CallParams callParams, Class<?> responseBodyType, BiFunction<ApiClient, CallParams, Call> function) throws ApiException {
         getRecordedParameters().add(recordedParams(callParams));
 
-        if (exceptionOnNext == null && hasDefinedCallResponses())
+        if (exceptionOnNext == null)
             return new WatchStub<T>((List)calls.remove(0));
         else try {
             return new ExceptionThrowingWatchStub<T>(exceptionOnNext);
@@ -78,10 +78,6 @@ public <T> WatchI<T> createWatch(Pool<ApiClient> pool, CallParams callParams, Cl
         }
     }
 
-    private boolean hasDefinedCallResponses() {
-        return calls != null && !calls.isEmpty();
-    }
-
     private Map<String,String> recordedParams(CallParams callParams) {
         Map<String,String> result = new HashMap<>();
         if (callParams.getResourceVersion() != null)