chore: bump spotless 2.44.1 and format code

Signed-off-by: Attila Mészáros <[email protected]>
operator-framework · Jan 8, 2025 · 77f9032 · 77f9032
1 parent d7c72b4
commit 77f9032
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 77 deletions.
diff --git a/operator-framework-bom/pom.xml b/operator-framework-bom/pom.xml
@@ -45,7 +45,7 @@
     <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
     <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
     <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
-    <spotless.version>2.43.0</spotless.version>
+    <spotless.version>2.44.1</spotless.version>
   </properties>
 
   <dependencyManagement>

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java
@@ -97,19 +97,8 @@ public static boolean debugThreadPool() {
     return getBooleanFromSystemPropsOrDefault(DEBUG_THREAD_POOL_ENV_KEY, false);
   }
 
-  static boolean getBooleanFromSystemPropsOrDefault(String propertyName, boolean defaultValue) {
-    var property = System.getProperty(propertyName);
-    if (property == null) {
-      return defaultValue;
-    } else {
-      property = property.trim().toLowerCase();
-      return switch (property) {
-        case "true" -> true;
-        case "false" -> false;
-        default -> defaultValue;
-      };
-    }
-  }
+  static boolean getBooleanFromSystemPropsOrDefault(String propertyName,
+      boolean defaultValue) {var property=System.getProperty(propertyName);if(property==null){return defaultValue;}else{property=property.trim().toLowerCase();return switch(property){case"true"->true;case"false"->false;default->defaultValue;};}}
 
   public static Class<?> getFirstTypeArgumentFromExtendedClass(Class<?> clazz) {
     return getTypeArgumentFromExtendedClassByIndex(clazz, 0);

diff --git a/...in/java/io/javaoperatorsdk/operator/processing/dependent/workflow/BaseWorkflowResult.java b/...in/java/io/javaoperatorsdk/operator/processing/dependent/workflow/BaseWorkflowResult.java
@@ -168,19 +168,26 @@ DetailBuilder<R> markForDelete() {
   }
 
 
-  record Detail<R>(Exception error, ReconcileResult<R> reconcileResult,
-      DetailedCondition.Result activationConditionResult,
-      DetailedCondition.Result deletePostconditionResult,
-      DetailedCondition.Result readyPostconditionResult,
-      DetailedCondition.Result reconcilePostconditionResult,
-      boolean deleted, boolean visited, boolean markedForDelete) {
-
-    boolean isConditionWithTypeMet(Condition.Type conditionType) {
-      return getResultForConditionWithType(conditionType).map(DetailedCondition.Result::isSuccess)
-          .orElse(true);
-    }
+  record Detail<R>(
+  Exception error, ReconcileResult<R>reconcileResult,
+  DetailedCondition.Result activationConditionResult,
+      DetailedCondition.
+  Result deletePostconditionResult,
+      DetailedCondition.
+  Result readyPostconditionResult,
+      DetailedCondition.
+  Result reconcilePostconditionResult,
+  boolean deleted,
+  boolean visited,
+  boolean markedForDelete)
+  {
+
+  boolean isConditionWithTypeMet(Condition.Type conditionType) {
+    return getResultForConditionWithType(conditionType).map(DetailedCondition.Result::isSuccess)
+        .orElse(true);
+  }
 
-    Optional<DetailedCondition.Result<?>> getResultForConditionWithType(
+  Optional<DetailedCondition.Result<?>> getResultForConditionWithType(
         Condition.Type conditionType) {
       return switch (conditionType) {
         case ACTIVATION -> Optional.ofNullable(activationConditionResult);
@@ -189,5 +196,4 @@ Optional<DetailedCondition.Result<?>> getResultForConditionWithType(
         case RECONCILE -> Optional.ofNullable(reconcilePostconditionResult);
       };
     }
-  }
-}
+}}
diff --git a/...e/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/Mappers.java b/...e/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/Mappers.java
@@ -119,16 +119,9 @@ private static <T extends HasMetadata> SecondaryToPrimaryMapper<T> fromMetadata(
   }
 
   public static ResourceID fromString(String cacheKey) {
-    if (cacheKey == null) {
-      return null;
-    }
+    if(cacheKey==null){return null;}
 
-    final String[] split = cacheKey.split("/");
-    return switch (split.length) {
-      case 1 -> new ResourceID(split[0]);
-      case 2 -> new ResourceID(split[1], split[0]);
-      default -> throw new IllegalArgumentException("Cannot extract a ResourceID from " + cacheKey);
-    };
+    final String[]split=cacheKey.split("/");return switch(split.length){case 1->new ResourceID(split[0]);case 2->new ResourceID(split[1],split[0]);default->throw new IllegalArgumentException("Cannot extract a ResourceID from "+cacheKey);};
   }
 
   /**

diff --git a/...operatorsdk/operator/processing/dependent/workflow/CRDPresentActivationConditionTest.java b/...operatorsdk/operator/processing/dependent/workflow/CRDPresentActivationConditionTest.java
@@ -37,12 +37,12 @@ void setup() {
 
 
   @Test
-    void checkCRDIfNotCheckedBefore() {
-        when(checkerMock.checkIfCRDPresent(any(),any())).thenReturn(true);
+  void checkCRDIfNotCheckedBefore() {
+    when(checkerMock.checkIfCRDPresent(any(), any())).thenReturn(true);
 
-        assertThat(condition.isMet(dr,null,context)).isTrue();
-        verify(checkerMock, times(1)).checkIfCRDPresent(any(),any());
-    }
+    assertThat(condition.isMet(dr, null, context)).isTrue();
+    verify(checkerMock, times(1)).checkIfCRDPresent(any(), any());
+  }
 
   @Test
   void instantMetCallSkipsApiCall() {
@@ -65,17 +65,17 @@ void intervalExpiredAPICheckedAgain() throws InterruptedException {
   }
 
   @Test
-    void crdIsNotCheckedAnymoreIfIfOnceFound() throws InterruptedException {
-        when(checkerMock.checkIfCRDPresent(any(),any())).thenReturn(true);
+  void crdIsNotCheckedAnymoreIfIfOnceFound() throws InterruptedException {
+    when(checkerMock.checkIfCRDPresent(any(), any())).thenReturn(true);
 
-        condition.isMet(dr,null,context);
-        verify(checkerMock, times(1)).checkIfCRDPresent(any(),any());
+    condition.isMet(dr, null, context);
+    verify(checkerMock, times(1)).checkIfCRDPresent(any(), any());
 
-        Thread.sleep(TEST_CHECK_INTERVAL_WITH_SLACK);
+    Thread.sleep(TEST_CHECK_INTERVAL_WITH_SLACK);
 
-        condition.isMet(dr,null,context);
-        verify(checkerMock, times(1)).checkIfCRDPresent(any(),any());
-    }
+    condition.isMet(dr, null, context);
+    verify(checkerMock, times(1)).checkIfCRDPresent(any(), any());
+  }
 
   @Test
   void crdNotCheckedAnymoreIfCountExpires() throws InterruptedException {

diff --git a/...k-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java b/...k-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java
@@ -421,13 +421,13 @@ void executionOfReconciliationShouldNotStartIfProcessorStopped() throws Interrup
           o.withConcurrentReconciliationThreads(1);
         });
     eventProcessor =
-            spy(new EventProcessor(controllerConfiguration(null, rateLimiterMock, configurationService),
-                    reconciliationDispatcherMock,
-                    eventSourceManagerMock, null));
+        spy(new EventProcessor(controllerConfiguration(null, rateLimiterMock, configurationService),
+            reconciliationDispatcherMock,
+            eventSourceManagerMock, null));
     eventProcessor.start();
 
-    eventProcessor.handleEvent(prepareCREvent(new ResourceID("test1","default")));
-    eventProcessor.handleEvent(prepareCREvent(new ResourceID("test1","default")));
+    eventProcessor.handleEvent(prepareCREvent(new ResourceID("test1", "default")));
+    eventProcessor.handleEvent(prepareCREvent(new ResourceID("test1", "default")));
     eventProcessor.stop();
 
     // wait until both event should be handled

diff --git a/...eratorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java b/...eratorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java
@@ -44,9 +44,9 @@ public void setup() {
     when(context.getPrimaryCache()).thenReturn(resourceCache);
 
     setUpSource(new PerResourcePollingEventSource<>(SampleExternalResource.class, context,
-                    new PerResourcePollingConfigurationBuilder<>(supplier, Duration.ofMillis(PERIOD))
-                            .withCacheKeyMapper(r -> r.getName() + "#" + r.getValue())
-                            .build()));
+        new PerResourcePollingConfigurationBuilder<>(supplier, Duration.ofMillis(PERIOD))
+            .withCacheKeyMapper(r -> r.getName() + "#" + r.getValue())
+            .build()));
   }
 
   @Test
@@ -147,44 +147,44 @@ void getsValueFromCacheOrSupplier() {
   @Test
   void supportsDynamicPollingDelay() {
     when(supplier.fetchResources(any()))
-            .thenReturn(Set.of(SampleExternalResource.testResource1()));
-    when(supplier.fetchDelay(any(),any()))
-            .thenReturn(Optional.of(Duration.ofMillis(PERIOD)))
-            .thenReturn(Optional.of(Duration.ofMillis(PERIOD*2)));
+        .thenReturn(Set.of(SampleExternalResource.testResource1()));
+    when(supplier.fetchDelay(any(), any()))
+        .thenReturn(Optional.of(Duration.ofMillis(PERIOD)))
+        .thenReturn(Optional.of(Duration.ofMillis(PERIOD * 2)));
 
     source.onResourceCreated(testCustomResource);
 
     await().pollDelay(Duration.ofMillis(PERIOD)).atMost(Duration.ofMillis((long) (1.5 * PERIOD)))
-            .pollInterval(Duration.ofMillis(20))
-            .untilAsserted(() -> verify(supplier,times(1)).fetchResources(any()));
+        .pollInterval(Duration.ofMillis(20))
+        .untilAsserted(() -> verify(supplier, times(1)).fetchResources(any()));
     // verifying that it is not called as with normal interval
-    await().pollDelay(Duration.ofMillis(PERIOD)).atMost(Duration.ofMillis((long) (1.5*PERIOD)))
-            .pollInterval(Duration.ofMillis(20))
-            .untilAsserted(() -> verify(supplier,times(1)).fetchResources(any()));
+    await().pollDelay(Duration.ofMillis(PERIOD)).atMost(Duration.ofMillis((long) (1.5 * PERIOD)))
+        .pollInterval(Duration.ofMillis(20))
+        .untilAsserted(() -> verify(supplier, times(1)).fetchResources(any()));
     await().pollDelay(Duration.ofMillis(PERIOD)).atMost(Duration.ofMillis(2 * PERIOD))
-            .pollInterval(Duration.ofMillis(20))
-            .untilAsserted(() -> verify(supplier,times(2)).fetchResources(any()));
+        .pollInterval(Duration.ofMillis(20))
+        .untilAsserted(() -> verify(supplier, times(2)).fetchResources(any()));
   }
 
   @Test
   void deleteEventCancelsTheScheduling() {
     when(supplier.fetchResources(any()))
-            .thenReturn(Set.of(SampleExternalResource.testResource1()));
+        .thenReturn(Set.of(SampleExternalResource.testResource1()));
 
     source.onResourceCreated(testCustomResource);
 
     await().pollDelay(Duration.ofMillis(PERIOD))
-            .atMost(Duration.ofMillis((2* PERIOD)))
-            .pollInterval(Duration.ofMillis(20))
-            .untilAsserted(() -> verify(supplier,times(1)).fetchResources(any()));
+        .atMost(Duration.ofMillis((2 * PERIOD)))
+        .pollInterval(Duration.ofMillis(20))
+        .untilAsserted(() -> verify(supplier, times(1)).fetchResources(any()));
 
     when(resourceCache.get(any())).thenReturn(Optional.empty());
     source.onResourceDeleted(testCustomResource);
 
     // check if not called again
-    await().pollDelay(Duration.ofMillis(2*PERIOD))
-            .atMost(Duration.ofMillis((4* PERIOD)))
-            .untilAsserted(() -> verify(supplier,times(1)).fetchResources(any()));
+    await().pollDelay(Duration.ofMillis(2 * PERIOD))
+        .atMost(Duration.ofMillis((4 * PERIOD)))
+        .untilAsserted(() -> verify(supplier, times(1)).fetchResources(any()));
   }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
     <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
     <git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
     <jib-maven-plugin.version>3.4.4</jib-maven-plugin.version>
-    <spotless.version>2.43.0</spotless.version>
+    <spotless.version>2.44.1</spotless.version>
   </properties>
 
   <dependencyManagement>