refactor: API changes of Update Control (#694)

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java

@@ -23,7 +23,7 @@ public static <T extends HasMetadata> UpdateControl<T> updateResource(T customRe
     return new UpdateControl<>(customResource, false, true);
   }
 
-  public static <T extends HasMetadata> UpdateControl<T> updateStatusSubResource(
+  public static <T extends HasMetadata> UpdateControl<T> updateStatus(
       T customResource) {
     return new UpdateControl<>(customResource, true, false);
   }
@@ -35,7 +35,7 @@ public static <T extends HasMetadata> UpdateControl<T> updateStatusSubResource(
    * @param customResource - custom resource to use in both API calls
    * @return UpdateControl instance
    */
-  public static <T extends HasMetadata> UpdateControl<T> updateCustomResourceAndStatus(
+  public static <T extends HasMetadata> UpdateControl<T> updateResourceAndStatus(
       T customResource) {
     return new UpdateControl<>(customResource, true, true);
   }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/ReconciliationDispatcherTest.java

@@ -92,7 +92,7 @@ void updatesOnlyStatusSubResourceIfFinalizerSet() {
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);
 
     when(reconciler.reconcile(eq(testCustomResource), any()))
-        .thenReturn(UpdateControl.updateStatusSubResource(testCustomResource));
+        .thenReturn(UpdateControl.updateStatus(testCustomResource));
 
     reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
 
@@ -105,7 +105,7 @@ void updatesBothResourceAndStatusIfFinalizerSet() {
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);
 
     when(reconciler.reconcile(eq(testCustomResource), any()))
-        .thenReturn(UpdateControl.updateCustomResourceAndStatus(testCustomResource));
+        .thenReturn(UpdateControl.updateResourceAndStatus(testCustomResource));
     when(customResourceFacade.replaceWithLock(testCustomResource)).thenReturn(testCustomResource);
 
     reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
@@ -281,7 +281,7 @@ void setReScheduleToPostExecutionControlFromUpdateControl() {
 
     when(reconciler.reconcile(eq(testCustomResource), any()))
         .thenReturn(
-            UpdateControl.updateStatusSubResource(testCustomResource).rescheduleAfter(1000L));
+            UpdateControl.updateStatus(testCustomResource).rescheduleAfter(1000L));
 
     PostExecutionControl control =
         reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
@@ -315,7 +315,7 @@ void setObservedGenerationForStatusIfNeeded() {
 
     when(lConfiguration.isGenerationAware()).thenReturn(true);
     when(lController.reconcile(eq(observedGenResource), any()))
-        .thenReturn(UpdateControl.updateStatusSubResource(observedGenResource));
+        .thenReturn(UpdateControl.updateStatus(observedGenResource));
     when(lFacade.updateStatus(observedGenResource)).thenReturn(observedGenResource);
 
     PostExecutionControl<ObservedGenCustomResource> control = lDispatcher.handleExecution(

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java

@@ -173,7 +173,7 @@ public UpdateControl<TestCustomResource> reconcile(
 
       consumer.accept(resource);
 
-      return UpdateControl.updateStatusSubResource(resource);
+      return UpdateControl.updateStatus(resource);
     }
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/deployment/DeploymentReconciler.java

@@ -42,7 +42,7 @@ public UpdateControl<Deployment> reconcile(
     if (condition.isEmpty()) {
       conditions.add(new DeploymentCondition(null, null, STATUS_MESSAGE, null,
           "unknown", "DeploymentReconciler"));
-      return UpdateControl.updateStatusSubResource(resource);
+      return UpdateControl.updateStatus(resource);
     } else {
       return UpdateControl.noUpdate();
     }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java

@@ -34,7 +34,7 @@ public UpdateControl<DoubleUpdateTestCustomResource> reconcile(
     ensureStatusExists(resource);
     resource.getStatus().setState(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
 
-    return UpdateControl.updateCustomResourceAndStatus(resource);
+    return UpdateControl.updateResourceAndStatus(resource);
   }
 
   private void ensureStatusExists(DoubleUpdateTestCustomResource resource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java

@@ -27,7 +27,7 @@ public UpdateControl<EventSourceTestCustomResource> reconcile(
     ensureStatusExists(resource);
     resource.getStatus().setState(EventSourceTestCustomResourceStatus.State.SUCCESS);
 
-    return UpdateControl.updateStatusSubResource(resource).rescheduleAfter(TIMER_PERIOD);
+    return UpdateControl.updateStatus(resource).rescheduleAfter(TIMER_PERIOD);
   }
 
   private void ensureStatusExists(EventSourceTestCustomResource resource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java

@@ -55,7 +55,7 @@ public UpdateControl<InformerEventSourceTestCustomResource> reconcile(
     LOGGER.debug("Setting target status for CR: {}", targetStatus);
     resource.setStatus(new InformerEventSourceTestCustomResourceStatus());
     resource.getStatus().setConfigMapValue(targetStatus);
-    return UpdateControl.updateStatusSubResource(resource);
+    return UpdateControl.updateStatus(resource);
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/retry/RetryTestCustomReconciler.java

@@ -46,7 +46,7 @@ public UpdateControl<RetryTestCustomResource> reconcile(
     ensureStatusExists(resource);
     resource.getStatus().setState(RetryTestCustomResourceStatus.State.SUCCESS);
 
-    return UpdateControl.updateStatusSubResource(resource);
+    return UpdateControl.updateStatus(resource);
   }
 
   private void ensureStatusExists(RetryTestCustomResource resource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java

@@ -128,7 +128,7 @@ public UpdateControl<TestCustomResource> reconcile(
       }
       resource.getStatus().setConfigMapStatus("ConfigMap Ready");
     }
-    return UpdateControl.updateStatusSubResource(resource);
+    return UpdateControl.updateStatus(resource);
   }
 
   private Map<String, String> configMapData(TestCustomResource resource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomReconciler.java

@@ -36,7 +36,7 @@ public UpdateControl<SubResourceTestCustomResource> reconcile(
     ensureStatusExists(resource);
     resource.getStatus().setState(SubResourceTestCustomResourceStatus.State.SUCCESS);
 
-    return UpdateControl.updateStatusSubResource(resource);
+    return UpdateControl.updateStatus(resource);
   }
 
   private void ensureStatusExists(SubResourceTestCustomResource resource) {

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

@@ -75,7 +75,7 @@ public UpdateControl<Tomcat> reconcile(Tomcat tomcat, Context context) {
           tomcat.getMetadata().getName(),
           tomcat.getMetadata().getNamespace(),
           tomcat.getStatus().getReadyReplicas());
-      return UpdateControl.updateStatusSubResource(updatedTomcat);
+      return UpdateControl.updateStatus(updatedTomcat);
     }
     return UpdateControl.noUpdate();
   }

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

@@ -98,7 +98,7 @@ public UpdateControl<Webapp> reconcile(Webapp webapp, Context context) {
       }
       webapp.getStatus().setDeployedArtifact(webapp.getSpec().getUrl());
       webapp.getStatus().setDeploymentStatus(commandStatusInAllPods);
-      return UpdateControl.updateStatusSubResource(webapp);
+      return UpdateControl.updateStatus(webapp);
     } else {
       log.info("WebappController invoked but Tomcat not ready yet ({}/{})",
           tomcat.getStatus() != null ? tomcat.getStatus().getReadyReplicas() : 0,