fixes on impl

Author: csviri

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

@@ -31,8 +31,8 @@ public static <T extends CustomResource> UpdateControl<T> updateStatusSubResourc
    * As a results of this there will be two call to K8S API. First the custom resource will be
    * updates then the status sub-resource.
    */
-  public static <T extends CustomResource>
-      UpdateControl<T> updateCustomResourceAndStatus(T customResource) {
+  public static <T extends CustomResource> UpdateControl<T> updateCustomResourceAndStatus(
+      T customResource) {
     return new UpdateControl<>(customResource, true, true);
   }
 

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

@@ -105,7 +105,12 @@ private PostExecutionControl handleCreateOrUpdate(
       CustomResource updatedCustomResource = null;
       if (updateControl.isUpdateCustomResourceAndStatusSubResource()) {
         updatedCustomResource = updateCustomResource(updateControl.getCustomResource());
-        updatedCustomResource = customResourceFacade.updateStatus(updatedCustomResource);
+        updateControl
+            .getCustomResource()
+            .getMetadata()
+            .setResourceVersion(updatedCustomResource.getMetadata().getResourceVersion());
+        updatedCustomResource =
+            customResourceFacade.updateStatus(updateControl.getCustomResource());
       } else if (updateControl.isUpdateStatusSubResource()) {
         updatedCustomResource =
             customResourceFacade.updateStatus(updateControl.getCustomResource());

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

@@ -13,7 +13,6 @@
 import io.javaoperatorsdk.operator.doubleupdate.subresource.DoubleUpdateTestCustomResourceController;
 import io.javaoperatorsdk.operator.doubleupdate.subresource.DoubleUpdateTestCustomResourceSpec;
 import io.javaoperatorsdk.operator.doubleupdate.subresource.DoubleUpdateTestCustomResourceStatus;
-import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceStatus;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -41,13 +40,13 @@ public void updatesSubResourceStatus() {
 
           awaitStatusUpdated(resource.getMetadata().getName());
           // wait for sure, there are no more events
-          waitXms(200);
+          waitXms(300);
 
           DoubleUpdateTestCustomResource customResource =
               (DoubleUpdateTestCustomResource)
                   integrationTestSupport.getCustomResource(resource.getMetadata().getName());
           assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1);
-          assertThat(customResource.getStatus())
+          assertThat(customResource.getStatus().getState())
               .isEqualTo(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
           assertThat(customResource.getMetadata().getAnnotations().get(TEST_ANNOTATION))
               .isNotNull();
@@ -70,7 +69,7 @@ void awaitStatusUpdated(String name) {
               assertThat(cr).isNotNull();
               assertThat(cr.getStatus()).isNotNull();
               assertThat(cr.getStatus().getState())
-                  .isEqualTo(SubResourceTestCustomResourceStatus.State.SUCCESS);
+                  .isEqualTo(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
             });
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/doubleupdate/subresource/DoubleUpdateTestCustomResourceController.java

@@ -2,7 +2,6 @@
 
 import io.javaoperatorsdk.operator.TestExecutionInfoProvider;
 import io.javaoperatorsdk.operator.api.*;
-
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.slf4j.Logger;