update resource and status impl, unit test

Author: csviri

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

@@ -27,6 +27,11 @@ public static <T extends CustomResource> UpdateControl<T> updateStatusSubResourc
     return new UpdateControl<>(customResource, true, false);
   }
 
+  public static <T extends CustomResource>
+      UpdateControl<T> updateCustomResourceAndStatusSubResource(T customResource) {
+    return new UpdateControl<>(customResource, true, true);
+  }
+
   public static <T extends CustomResource> UpdateControl<T> noUpdate() {
     return new UpdateControl<>(null, false, false);
   }
@@ -42,4 +47,8 @@ public boolean isUpdateStatusSubResource() {
   public boolean isUpdateCustomResource() {
     return updateCustomResource;
   }
+
+  public boolean isUpdateCustomResourceAndStatusSubResource() {
+    return updateCustomResource && updateStatusSubResource;
+  }
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

@@ -103,12 +103,16 @@ private PostExecutionControl handleCreateOrUpdate(
       UpdateControl<? extends CustomResource> updateControl =
           controller.createOrUpdateResource(resource, context);
       CustomResource updatedCustomResource = null;
-      if (updateControl.isUpdateStatusSubResource()) {
+      if (updateControl.isUpdateCustomResourceAndStatusSubResource()) {
+        updatedCustomResource = updateCustomResource(updateControl.getCustomResource());
+        updatedCustomResource = customResourceFacade.updateStatus(updatedCustomResource);
+      } else if (updateControl.isUpdateStatusSubResource()) {
         updatedCustomResource =
             customResourceFacade.updateStatus(updateControl.getCustomResource());
       } else if (updateControl.isUpdateCustomResource()) {
         updatedCustomResource = updateCustomResource(updateControl.getCustomResource());
       }
+
       if (updatedCustomResource != null) {
         return PostExecutionControl.customResourceUpdated(updatedCustomResource);
       } else {

operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java

@@ -72,6 +72,19 @@ void updatesOnlyStatusSubResource() {
     verify(customResourceFacade, never()).replaceWithLock(any());
   }
 
+  @Test
+  void updatesBothResourceAndStatus() {
+    when(controller.createOrUpdateResource(eq(testCustomResource), any()))
+        .thenReturn(UpdateControl.updateCustomResourceAndStatusSubResource(testCustomResource));
+    when(customResourceFacade.replaceWithLock(testCustomResource)).thenReturn(testCustomResource);
+
+    eventDispatcher.handleExecution(
+        executionScopeWithCREvent(Watcher.Action.MODIFIED, testCustomResource));
+
+    verify(customResourceFacade, times(1)).replaceWithLock(testCustomResource);
+    verify(customResourceFacade, times(1)).updateStatus(testCustomResource);
+  }
+
   @Test
   void callCreateOrUpdateOnModifiedResource() {
     eventDispatcher.handleExecution(