rename from CR

csviri · csviri · commit fe94ed8d983e · 2020-12-16T19:00:20.000+01:00
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/UpdateControl.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/api/UpdateControl.java
@@ -32,7 +32,7 @@ public static <T extends CustomResource> UpdateControl<T> updateStatusSubResourc
    * updates then the status sub-resource.
    */
   public static <T extends CustomResource>
-      UpdateControl<T> updateCustomResourceAndStatusSubResource(T customResource) {
+      UpdateControl<T> updateCustomResourceAndStatus(T customResource) {
     return new UpdateControl<>(customResource, true, true);
   }
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java
@@ -75,7 +75,7 @@ void updatesOnlyStatusSubResource() {
   @Test
   void updatesBothResourceAndStatus() {
     when(controller.createOrUpdateResource(eq(testCustomResource), any()))
-        .thenReturn(UpdateControl.updateCustomResourceAndStatusSubResource(testCustomResource));
+        .thenReturn(UpdateControl.updateCustomResourceAndStatus(testCustomResource));
     when(customResourceFacade.replaceWithLock(testCustomResource)).thenReturn(testCustomResource);
 
     eventDispatcher.handleExecution(
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/doubleupdate/subresource/DoubleUpdateTestCustomResourceController.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/doubleupdate/subresource/DoubleUpdateTestCustomResourceController.java
@@ -37,7 +37,7 @@ public UpdateControl<DoubleUpdateTestCustomResource> createOrUpdateResource(
     ensureStatusExists(resource);
     resource.getStatus().setState(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
 
-    return UpdateControl.updateCustomResourceAndStatusSubResource(resource);
+    return UpdateControl.updateCustomResourceAndStatus(resource);
   }
 
   private void ensureStatusExists(DoubleUpdateTestCustomResource resource) {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static <T extends CustomResource> UpdateControl<T> updateStatusSubResourc`
`32`	`32`	`* updates then the status sub-resource.`
`33`	`33`	`*/`
`34`	`34`	`public static <T extends CustomResource>`
`35`		`- UpdateControl<T> updateCustomResourceAndStatusSubResource(T customResource) {`
	`35`	`+ UpdateControl<T> updateCustomResourceAndStatus(T customResource) {`
`36`	`36`	`return new UpdateControl<>(customResource, true, true);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public UpdateControl<DoubleUpdateTestCustomResource> createOrUpdateResource(`
`37`	`37`	`ensureStatusExists(resource);`
`38`	`38`	`resource.getStatus().setState(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);`
`39`	`39`
`40`		`- return UpdateControl.updateCustomResourceAndStatusSubResource(resource);`
	`40`	`+ return UpdateControl.updateCustomResourceAndStatus(resource);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private void ensureStatusExists(DoubleUpdateTestCustomResource resource) {`