fix: spotless plugin activation issue

Signed-off-by: xstefank <[email protected]>

Author: xstefank

.github/workflows/pr.yml

@@ -26,7 +26,7 @@ jobs:
           cache: 'maven'
       - name: Check code format
         run: |
-          ./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml
+          ./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml -Dhighest-basedir=$PWD
       - name: Run unit tests
         run: ./mvnw ${MAVEN_ARGS} clean install -Pno-apt --file pom.xml
 

bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java

@@ -27,8 +27,7 @@ public class Bootstrapper {
   private static final Map<String, String> TOP_LEVEL_STATIC_FILES =
       Map.of("_.gitignore", ".gitignore", "README.md", "README.md");
   private static final List<String> JAVA_FILES =
-      List.of("CustomResource.java", "Reconciler.java",
-          "Spec.java", "Status.java");
+      List.of("CustomResource.java", "Reconciler.java", "Spec.java", "Status.java");
 
   public void create(File targetDir, String groupId, String artifactId) {
     try {
@@ -67,8 +66,7 @@ private void addJavaFiles(File projectDir, String groupId, String artifactId) {
       addTemplatedFile(projectDir, "Runner.java", groupId, artifactId, targetDir, null);
       addTemplatedFile(projectDir, "ConfigMapDependentResource.java", groupId, artifactId,
           targetDir, null);
-      addTemplatedFile(projectDir, "ReconcilerIntegrationTest.java", groupId,
-          artifactId,
+      addTemplatedFile(projectDir, "ReconcilerIntegrationTest.java", groupId, artifactId,
           targetTestDir, artifactClassId(artifactId) + "ReconcilerIntegrationTest.java");
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -89,10 +87,9 @@ private void addTemplatedFile(File projectDir, String fileName, String groupId,
   private void addTemplatedFile(File projectDir, String fileName, String groupId, String artifactId,
       File targetDir, String targetFileName) {
     try {
-      var values = Map.of("groupId", groupId, "artifactId", artifactId,
-          "artifactClassId", artifactClassId(artifactId),
-          "josdkVersion", Versions.JOSDK,
-          "fabric8Version", Versions.KUBERNETES_CLIENT);
+      var values = Map.of("groupId", groupId, "artifactId", artifactId, "artifactClassId",
+          artifactClassId(artifactId), "josdkVersion", Versions.JOSDK, "fabric8Version",
+          Versions.KUBERNETES_CLIENT);
 
       var mustache = mustacheFactory.compile("templates/" + fileName);
       var targetFile = new File(targetDir == null ? projectDir : targetDir,
@@ -132,8 +129,7 @@ private void addStaticFile(File targetDir, String fileName, String targetFilenam
 
   public static String artifactClassId(String artifactId) {
     var parts = artifactId.split("-");
-    return Arrays.stream(parts).map(p -> p.substring(0, 1)
-        .toUpperCase() + p.substring(1))
+    return Arrays.stream(parts).map(p -> p.substring(0, 1).toUpperCase() + p.substring(1))
         .collect(Collectors.joining(""));
   }
 

bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/BootstrapperMojo.java

@@ -8,17 +8,15 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 @Mojo(name = "create", requiresProject = false)
-public class BootstrapperMojo
-    extends AbstractMojo {
+public class BootstrapperMojo extends AbstractMojo {
 
   @Parameter(defaultValue = "${projectGroupId}")
   protected String projectGroupId;
 
   @Parameter(defaultValue = "${projectArtifactId}")
   protected String projectArtifactId;
 
-  public void execute()
-      throws MojoExecutionException {
+  public void execute() throws MojoExecutionException {
     String userDir = System.getProperty("user.dir");
     new Bootstrapper().create(new File(userDir), projectGroupId, projectArtifactId);
   }

bootstrapper-maven-plugin/src/test/java/io/javaoperatorsdk/bootstrapper/BootstrapperTest.java

@@ -30,9 +30,8 @@ void copiesFilesToTarget() {
 
   private void assertProjectCompiles() {
     try {
-      var process = Runtime.getRuntime()
-          .exec(
-              "mvn clean install -f target/test-project/pom.xml -DskipTests -Dspotless.apply.skip");
+      var process = Runtime.getRuntime().exec(
+          "mvn clean install -f target/test-project/pom.xml -DskipTests -Dspotless.apply.skip");
 
       BufferedReader stdOut = new BufferedReader(new InputStreamReader(process.getInputStream()));
 

caffeine-bounded-cache-support/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedItemStores.java

@@ -39,11 +39,8 @@ private CaffeineBoundedItemStores() {}
    */
   @SuppressWarnings("unused")
   public static <R extends HasMetadata> BoundedItemStore<R> boundedItemStore(
-      KubernetesClient client, Class<R> rClass,
-      Duration accessExpireDuration) {
-    Cache<String, R> cache = Caffeine.newBuilder()
-        .expireAfterAccess(accessExpireDuration)
-        .build();
+      KubernetesClient client, Class<R> rClass, Duration accessExpireDuration) {
+    Cache<String, R> cache = Caffeine.newBuilder().expireAfterAccess(accessExpireDuration).build();
     return boundedItemStore(client, rClass, cache);
   }
 

caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedCacheClusterScopeIT.java

@@ -17,23 +17,16 @@ public class CaffeineBoundedCacheClusterScopeIT
     extends BoundedCacheTestBase<BoundedCacheClusterScopeTestCustomResource> {
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
-      LocallyRunOperatorExtension.builder()
-          .withReconciler(new BoundedCacheClusterScopeTestReconciler(), o -> {
-            o.withItemStore(boundedItemStore(
-                new KubernetesClientBuilder().build(),
-                BoundedCacheClusterScopeTestCustomResource.class,
-                Duration.ofMinutes(1),
-                1));
-          })
-          .build();
+  LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder()
+      .withReconciler(new BoundedCacheClusterScopeTestReconciler(), o -> {
+        o.withItemStore(boundedItemStore(new KubernetesClientBuilder().build(),
+            BoundedCacheClusterScopeTestCustomResource.class, Duration.ofMinutes(1), 1));
+      }).build();
 
   @Override
   BoundedCacheClusterScopeTestCustomResource createTestResource(int index) {
     var res = new BoundedCacheClusterScopeTestCustomResource();
-    res.setMetadata(new ObjectMetaBuilder()
-        .withName(RESOURCE_NAME_PREFIX + index)
-        .build());
+    res.setMetadata(new ObjectMetaBuilder().withName(RESOURCE_NAME_PREFIX + index).build());
     res.setSpec(new BoundedCacheTestSpec());
     res.getSpec().setData(INITIAL_DATA_PREFIX + index);
     res.getSpec().setTargetNamespace(extension.getNamespace());

caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedCacheNamespacedIT.java

@@ -19,18 +19,13 @@ class CaffeineBoundedCacheNamespacedIT
   @RegisterExtension
   LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder().withReconciler(new BoundedCacheTestReconciler(), o -> {
-        o.withItemStore(boundedItemStore(
-            new KubernetesClientBuilder().build(), BoundedCacheTestCustomResource.class,
-            Duration.ofMinutes(1),
-            1));
-      })
-          .build();
+        o.withItemStore(boundedItemStore(new KubernetesClientBuilder().build(),
+            BoundedCacheTestCustomResource.class, Duration.ofMinutes(1), 1));
+      }).build();
 
   BoundedCacheTestCustomResource createTestResource(int index) {
     var res = new BoundedCacheTestCustomResource();
-    res.setMetadata(new ObjectMetaBuilder()
-        .withName(RESOURCE_NAME_PREFIX + index)
-        .build());
+    res.setMetadata(new ObjectMetaBuilder().withName(RESOURCE_NAME_PREFIX + index).build());
     res.setSpec(new BoundedCacheTestSpec());
     res.getSpec().setData(INITIAL_DATA_PREFIX + index);
     res.getSpec().setTargetNamespace(extension.getNamespace());

caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java

@@ -37,12 +37,9 @@ public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCac
   public static final String DATA_KEY = "dataKey";
 
   @Override
-  public UpdateControl<P> reconcile(
-      P resource,
-      Context<P> context) {
+  public UpdateControl<P> reconcile(P resource, Context<P> context) {
     var maybeConfigMap = context.getSecondaryResource(ConfigMap.class);
-    maybeConfigMap.ifPresentOrElse(
-        cm -> updateConfigMapIfNeeded(cm, resource, context),
+    maybeConfigMap.ifPresentOrElse(cm -> updateConfigMapIfNeeded(cm, resource, context),
         () -> createConfigMap(resource, context));
     ensureStatus(resource);
     log.info("Reconciled: {}", resource.getMetadata().getName());
@@ -59,32 +56,24 @@ protected void updateConfigMapIfNeeded(ConfigMap cm, P resource, Context<P> cont
 
   protected void createConfigMap(P resource, Context<P> context) {
     var cm = new ConfigMapBuilder()
-        .withMetadata(new ObjectMetaBuilder()
-            .withName(resource.getMetadata().getName())
-            .withNamespace(resource.getSpec().getTargetNamespace())
-            .build())
-        .withData(Map.of(DATA_KEY, resource.getSpec().getData()))
-        .build();
+        .withMetadata(new ObjectMetaBuilder().withName(resource.getMetadata().getName())
+            .withNamespace(resource.getSpec().getTargetNamespace()).build())
+        .withData(Map.of(DATA_KEY, resource.getSpec().getData())).build();
     cm.addOwnerReference(resource);
     context.getClient().configMaps().resource(cm).create();
   }
 
   @Override
-  public List<EventSource<?, P>> prepareEventSources(
-      EventSourceContext<P> context) {
-
-    var boundedItemStore =
-        boundedItemStore(new KubernetesClientBuilder().build(),
-            ConfigMap.class, Duration.ofMinutes(1), 1); // setting max size for testing purposes
-
-    var es = new InformerEventSource<>(
-        InformerEventSourceConfiguration.from(ConfigMap.class, primaryClass())
-            .withItemStore(boundedItemStore)
-            .withSecondaryToPrimaryMapper(
-                Mappers.fromOwnerReferences(context.getPrimaryResourceClass(),
-                    this instanceof BoundedCacheClusterScopeTestReconciler))
-            .build(),
-        context);
+  public List<EventSource<?, P>> prepareEventSources(EventSourceContext<P> context) {
+
+    var boundedItemStore = boundedItemStore(new KubernetesClientBuilder().build(), ConfigMap.class,
+        Duration.ofMinutes(1), 1); // setting max size for testing purposes
+
+    var es = new InformerEventSource<>(InformerEventSourceConfiguration
+        .from(ConfigMap.class, primaryClass()).withItemStore(boundedItemStore)
+        .withSecondaryToPrimaryMapper(Mappers.fromOwnerReferences(context.getPrimaryResourceClass(),
+            this instanceof BoundedCacheClusterScopeTestReconciler))
+        .build(), context);
 
     return List.of(es);
   }
@@ -96,14 +85,11 @@ private void ensureStatus(P resource) {
   }
 
   public static <R extends HasMetadata> BoundedItemStore<R> boundedItemStore(
-      KubernetesClient client, Class<R> rClass,
-      Duration accessExpireDuration,
+      KubernetesClient client, Class<R> rClass, Duration accessExpireDuration,
       // max size is only for testing purposes
       long cacheMaxSize) {
-    Cache<String, R> cache = Caffeine.newBuilder()
-        .expireAfterAccess(accessExpireDuration)
-        .maximumSize(cacheMaxSize)
-        .build();
+    Cache<String, R> cache = Caffeine.newBuilder().expireAfterAccess(accessExpireDuration)
+        .maximumSize(cacheMaxSize).build();
     return CaffeineBoundedItemStores.boundedItemStore(client, rClass, cache);
   }
 

caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/clusterscope/BoundedCacheClusterScopeTestReconciler.java

@@ -4,8 +4,8 @@
 import io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler;
 
 @ControllerConfiguration
-public class BoundedCacheClusterScopeTestReconciler extends
-    AbstractTestReconciler<BoundedCacheClusterScopeTestCustomResource> {
+public class BoundedCacheClusterScopeTestReconciler
+    extends AbstractTestReconciler<BoundedCacheClusterScopeTestCustomResource> {
 
   @Override
   protected Class<BoundedCacheClusterScopeTestCustomResource> primaryClass() {

contributing/eclipse-google-style.xml

@@ -65,7 +65,7 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>