fix: formatter plugin update and related issues (#1261)

csviri · web-flow · commit b136008c3d58 · 2022-06-02T10:09:08.000+02:00
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java
@@ -205,15 +205,15 @@ void reScheduleOnlyIfNotExecutedEventsReceivedMeanwhile() throws InterruptedExce
     var testDelay = 10000L;
     doAnswer(new AnswersWithDelay(FAKE_CONTROLLER_EXECUTION_DURATION,
         new Returns(PostExecutionControl.defaultDispatch().withReSchedule(testDelay))))
-            .when(reconciliationDispatcherMock).handleExecution(any());
+        .when(reconciliationDispatcherMock).handleExecution(any());
     var resourceId = new ResourceID("test1", "default");
     eventProcessor.handleEvent(prepareCREvent(resourceId));
     Thread.sleep(FAKE_CONTROLLER_EXECUTION_DURATION / 3);
     eventProcessor.handleEvent(prepareCREvent(resourceId));
 
     verify(retryTimerEventSourceMock,
         after((long) (FAKE_CONTROLLER_EXECUTION_DURATION * 1.5)).times(0))
-            .scheduleOnce(any(), eq(testDelay));
+        .scheduleOnce(any(), eq(testDelay));
   }
 
   @Test
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java
@@ -442,7 +442,7 @@ void setObservedGenerationForStatusIfNeeded() throws Exception {
         executionScopeWithCREvent(observedGenResource));
     assertThat(control.getUpdatedCustomResource().orElseGet(() -> fail("Missing optional"))
         .getStatus().getObservedGeneration())
-            .isEqualTo(1L);
+        .isEqualTo(1L);
   }
 
   @Test
@@ -462,7 +462,7 @@ void updatesObservedGenerationOnNoUpdateUpdateControl() throws Exception {
         executionScopeWithCREvent(observedGenResource));
     assertThat(control.getUpdatedCustomResource().orElseGet(() -> fail("Missing optional"))
         .getStatus().getObservedGeneration())
-            .isEqualTo(1L);
+        .isEqualTo(1L);
   }
 
   @Test
@@ -483,7 +483,7 @@ void updateObservedGenerationOnCustomResourceUpdate() throws Exception {
         executionScopeWithCREvent(observedGenResource));
     assertThat(control.getUpdatedCustomResource().orElseGet(() -> fail("Missing optional"))
         .getStatus().getObservedGeneration())
-            .isEqualTo(1L);
+        .isEqualTo(1L);
   }
 
   @Test
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java
@@ -45,7 +45,7 @@ void addNewAndRemoveOldNamespaceTest() {
       await().pollDelay(Duration.ofMillis(200)).untilAsserted(
           () -> assertThat(
               reconciler.numberOfResourceReconciliations(resourceInAdditionalTestNamespace))
-                  .isZero());
+              .isZero());
 
       // adding additional namespace
       RegisteredController registeredController =
@@ -56,7 +56,7 @@ void addNewAndRemoveOldNamespaceTest() {
       await().untilAsserted(
           () -> assertThat(
               reconciler.numberOfResourceReconciliations(resourceInAdditionalTestNamespace))
-                  .isEqualTo(2));
+              .isEqualTo(2));
 
       // removing a namespace
       registeredController.changeNamespaces(Set.of(ADDITIONAL_TEST_NAMESPACE));
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/CreateUpdateInformerEventSourceEventFilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/CreateUpdateInformerEventSourceEventFilterIT.java
@@ -45,7 +45,7 @@ void updateEventNotReceivedAfterCreateOrUpdate() {
     assertThat(
         ((CreateUpdateEventFilterTestReconciler) operator.getFirstReconciler())
             .getNumberOfExecutions())
-                .isEqualTo(1); // this should be 1 usually but sometimes event is received
+        .isEqualTo(1); // this should be 1 usually but sometimes event is received
     // faster than added resource added to the cache
 
 
@@ -70,8 +70,8 @@ void updateEventNotReceivedAfterCreateOrUpdate() {
     assertThat(
         ((CreateUpdateEventFilterTestReconciler) operator.getFirstReconciler())
             .getNumberOfExecutions())
-                // same as for previous assert (usually this should be 2)
-                .isEqualTo(2);
+        // same as for previous assert (usually this should be 2)
+        .isEqualTo(2);
   }
 
   private CreateUpdateEventFilterTestCustomResource prepareTestResource() {
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/CustomResourceFilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/CustomResourceFilterIT.java
@@ -30,7 +30,7 @@ void doesCustomFiltering() throws InterruptedException {
 
     assertThat(
         ((CustomFilteringTestReconciler) operator.getReconcilers().get(0)).getNumberOfExecutions())
-            .isEqualTo(1);
+        .isEqualTo(1);
   }
 
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentOperationEventFilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentOperationEventFilterIT.java
@@ -37,7 +37,7 @@ void reconcileNotTriggeredWithDependentResourceCreateOrUpdate() {
         .until(
             () -> ((DependentOperationEventFilterCustomResourceTestReconciler) operator
                 .getFirstReconciler())
-                    .getNumberOfExecutions() == 1);
+                .getNumberOfExecutions() == 1);
     assertThat(operator.get(ConfigMap.class, TEST).getData())
         .containsEntry(ConfigMapDependentResource.KEY, SPEC_VAL_1);
 
@@ -48,7 +48,7 @@ void reconcileNotTriggeredWithDependentResourceCreateOrUpdate() {
         .until(
             () -> ((DependentOperationEventFilterCustomResourceTestReconciler) operator
                 .getFirstReconciler())
-                    .getNumberOfExecutions() == 2);
+                .getNumberOfExecutions() == 2);
     assertThat(operator.get(ConfigMap.class, TEST).getData())
         .containsEntry(ConfigMapDependentResource.KEY, SPEC_VAL_2);
   }
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerEventSourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerEventSourceIT.java
@@ -60,7 +60,7 @@ void deletingSecondaryResource() {
     waitForCRStatusValue(MISSING_CONFIG_MAP);
     assertThat(((InformerEventSourceTestCustomReconciler) operator.getReconcilers().get(0))
         .getNumberOfExecutions())
-            .isEqualTo(3);
+        .isEqualTo(3);
   }
 
   private ConfigMap relatedConfigMap(String relatedResourceAnnotation) {
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/KubernetesResourceStatusUpdateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/KubernetesResourceStatusUpdateIT.java
@@ -36,7 +36,8 @@ void testReconciliationOfNonCustomResourceAndStatusUpdate() {
       assertThat(d.getStatus().getReadyReplicas()).isGreaterThanOrEqualTo(1);
       assertThat(
           d.getStatus().getConditions().stream().filter(c -> c.getMessage().equals(STATUS_MESSAGE))
-              .count()).isEqualTo(1);
+              .count())
+          .isEqualTo(1);
     });
   }
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java
@@ -66,7 +66,7 @@ void invalidEventsDoesNotBreakEventHandling() {
         operator
             .get(MultiVersionCRDTestCustomResource2.class, CR_V2_NAME)
             .getStatus())
-                .isNull();
+        .isNull();
   }
 
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java
@@ -50,7 +50,7 @@ void retryFailedExecution() {
         .untilAsserted(() -> {
           assertThat(
               TestUtils.getNumberOfExecutions(operator))
-                  .isEqualTo(NUMBER_FAILED_EXECUTIONS + 1);
+              .isEqualTo(NUMBER_FAILED_EXECUTIONS + 1);
 
           RetryTestCustomResource finalResource =
               operator.get(RetryTestCustomResource.class,
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/StandaloneDependentResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/StandaloneDependentResourceIT.java
@@ -37,7 +37,7 @@ void dependentResourceManagesDeployment() {
     awaitForDeploymentReadyReplicas(1);
     assertThat(
         ((StandaloneDependentTestReconciler) operator.getFirstReconciler()).isErrorOccurred())
-            .isFalse();
+        .isFalse();
   }
 
   @Test
@@ -58,7 +58,7 @@ void executeUpdateForTestingCacheUpdateForGetResource() {
     awaitForDeploymentReadyReplicas(2);
     assertThat(
         ((StandaloneDependentTestReconciler) operator.getFirstReconciler()).isErrorOccurred())
-            .isFalse();
+        .isFalse();
   }
 
   void awaitForDeploymentReadyReplicas(int expectedReplicaCount) {
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java
@@ -36,7 +36,7 @@ void noOptimisticLockingDoneOnStatusUpdate() throws InterruptedException {
     await().pollDelay(Duration.ofMillis(WAIT_TIME)).untilAsserted(() -> {
       assertThat(
           operator.getReconcilerOfType(StatusPatchLockingReconciler.class).getNumberOfExecutions())
-              .isEqualTo(1);
+          .isEqualTo(1);
       var actual = operator.get(StatusPatchLockingCustomResource.class,
           TEST_RESOURCE_NAME);
       assertThat(actual
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusUpdateLockingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusUpdateLockingIT.java
@@ -34,7 +34,7 @@ void optimisticLockingDoneOnStatusUpdate() throws InterruptedException {
     await().pollDelay(Duration.ofMillis(WAIT_TIME)).untilAsserted(() -> {
       assertThat(
           operator.getReconcilerOfType(StatusUpdateLockingReconciler.class).getNumberOfExecutions())
-              .isEqualTo(2);
+          .isEqualTo(2);
       assertThat(operator.get(StatusUpdateLockingCustomResource.class, TEST_RESOURCE_NAME)
           .getStatus().getValue()).isEqualTo(1);
     });
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java
@@ -45,7 +45,7 @@ void updatesSubResourceStatus() {
             .getMetadata()
             .getAnnotations()
             .get(DoubleUpdateTestCustomReconciler.TEST_ANNOTATION))
-                .isNotNull();
+        .isNotNull();
   }
 
   void awaitStatusUpdated(String name) {
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
         <git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
-        <formatter-maven-plugin.version>2.18.0</formatter-maven-plugin.version>
+        <formatter-maven-plugin.version>2.19.0</formatter-maven-plugin.version>
         <directory-maven-plugin.version>1.0</directory-maven-plugin.version>
         <impsort-maven-plugin.version>1.7.0</impsort-maven-plugin.version>
     </properties>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ void doesCustomFiltering() throws InterruptedException {`
`30`	`30`
`31`	`31`	`assertThat(`
`32`	`32`	`((CustomFilteringTestReconciler) operator.getReconcilers().get(0)).getNumberOfExecutions())`
`33`		`- .isEqualTo(1);`
	`33`	`+ .isEqualTo(1);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ void deletingSecondaryResource() {`
`60`	`60`	`waitForCRStatusValue(MISSING_CONFIG_MAP);`
`61`	`61`	`assertThat(((InformerEventSourceTestCustomReconciler) operator.getReconcilers().get(0))`
`62`	`62`	`.getNumberOfExecutions())`
`63`		`- .isEqualTo(3);`
	`63`	`+ .isEqualTo(3);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`private ConfigMap relatedConfigMap(String relatedResourceAnnotation) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ void testReconciliationOfNonCustomResourceAndStatusUpdate() {`
`36`	`36`	`assertThat(d.getStatus().getReadyReplicas()).isGreaterThanOrEqualTo(1);`
`37`	`37`	`assertThat(`
`38`	`38`	`d.getStatus().getConditions().stream().filter(c -> c.getMessage().equals(STATUS_MESSAGE))`
`39`		`- .count()).isEqualTo(1);`
	`39`	`+ .count())`
	`40`	`+ .isEqualTo(1);`
`40`	`41`	`});`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ void invalidEventsDoesNotBreakEventHandling() {`
`66`	`66`	`operator`
`67`	`67`	`.get(MultiVersionCRDTestCustomResource2.class, CR_V2_NAME)`
`68`	`68`	`.getStatus())`
`69`		`- .isNull();`
	`69`	`+ .isNull();`
`70`	`70`	`}`
`71`	`71`
`72`	`72`