project-ncl · thescouser89 · Jan 27, 2025 · Jan 27, 2025
diff --git a/eclipse-codeStyle.xml b/eclipse-codeStyle.xml
diff --git a/pom.xml b/pom.xml
@@ -301,20 +301,36 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>net.revelc.code.formatter</groupId>
-        <artifactId>formatter-maven-plugin</artifactId>
-        <version>2.24.0</version>
-        <configuration>
-          <configFile>eclipse-codeStyle.xml</configFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>java-format</id>
-            <goals>
-              <goal>format</goal>
-            </goals>
-          </execution>
-        </executions>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.44.2</version>
+          <dependencies>
+              <dependency>
+                  <groupId>org.jboss.pnc</groupId>
+                  <artifactId>ide-config</artifactId>
+                  <version>1.0.0</version>
+              </dependency>
+          </dependencies>
+          <configuration>
+              <java>
+                  <removeUnusedImports />
+                  <importOrder>
+                      <order>java,javax,jakarta,org,com</order>
+                  </importOrder>
+                  <eclipse>
+                      <file>java-formatter.xml</file>
+                  </eclipse>
+                  <lineEndings>UNIX</lineEndings>
+              </java>
+          </configuration>
+          <executions>
+              <execution>
+                  <goals>
+                      <goal>apply</goal>
+                  </goals>
+                  <phase>compile</phase>
+              </execution>
+          </executions>
       </plugin>
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/BifrostLogUploaderProducer.java b/src/main/java/org/jboss/pnc/environmentdriver/BifrostLogUploaderProducer.java
@@ -1,14 +1,16 @@
 package org.jboss.pnc.environmentdriver;
 
-import io.quarkus.oidc.client.OidcClient;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jboss.pnc.bifrost.upload.BifrostLogUploader;
+import java.net.URI;
+import java.time.Duration;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
-import java.net.URI;
-import java.time.Duration;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.pnc.bifrost.upload.BifrostLogUploader;
+
+import io.quarkus.oidc.client.OidcClient;
 
 @ApplicationScoped
 public class BifrostLogUploaderProducer {

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/Configuration.java b/src/main/java/org/jboss/pnc/environmentdriver/Configuration.java
@@ -21,9 +21,10 @@
 
 import javax.enterprise.context.Dependent;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 import lombok.Getter;
 import lombok.Setter;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 @Getter
 @Setter

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/Driver.java b/src/main/java/org/jboss/pnc/environmentdriver/Driver.java
@@ -48,7 +48,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 
-import io.quarkus.oidc.client.OidcClient;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.text.StringSubstitutor;
 import org.eclipse.microprofile.context.ManagedExecutor;
@@ -105,6 +104,7 @@
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.opentelemetry.instrumentation.annotations.SpanAttribute;
 import io.opentelemetry.instrumentation.annotations.WithSpan;
+import io.quarkus.oidc.client.OidcClient;
 import net.jodah.failsafe.Failsafe;
 import net.jodah.failsafe.RetryPolicy;
 
@@ -652,8 +652,7 @@ private double calculateAvailableResource(String resourceType) {
                 .list()
                 .getItems()
                 .stream()
-                .findFirst() // Only consider the first quota,
-                             // we generally only use one!
+                .findFirst() // Only consider the first quota, we generally only use one!
                 .map(
                         resourceQuota -> convertQuantity(resourceQuota.getStatus().getHard().get(identifier))
                                 - convertQuantity(resourceQuota.getStatus().getUsed().get(identifier)))

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/UserLogger.java b/src/main/java/org/jboss/pnc/environmentdriver/UserLogger.java
@@ -1,16 +1,16 @@
 package org.jboss.pnc.environmentdriver;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
 @Qualifier
 @Retention(RUNTIME)
 @Target({ METHOD, FIELD, PARAMETER, TYPE })

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/clients/IndyService.java b/src/main/java/org/jboss/pnc/environmentdriver/clients/IndyService.java
@@ -17,17 +17,17 @@
  */
 package org.jboss.pnc.environmentdriver.clients;
 
-import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-import org.jboss.pnc.api.indy.dto.IndyTokenRequestDTO;
-import org.jboss.pnc.api.indy.dto.IndyTokenResponseDTO;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.HeaderParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.jboss.pnc.api.indy.dto.IndyTokenRequestDTO;
+import org.jboss.pnc.api.indy.dto.IndyTokenResponseDTO;
+
 /**
  * Indy service representing the Indy server. It uses Quarkus magical rest client to generate the client implementation
  */

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/runtime/ApplicationLifecycle.java b/src/main/java/org/jboss/pnc/environmentdriver/runtime/ApplicationLifecycle.java
@@ -26,14 +26,15 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 
-import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.StartupEvent;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.pnc.common.concurrent.Sequence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>
  */

diff --git a/src/main/java/org/jboss/pnc/environmentdriver/runtime/LoggingFilter.java b/src/main/java/org/jboss/pnc/environmentdriver/runtime/LoggingFilter.java
@@ -29,15 +29,15 @@
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Provider;
 
-import io.opentelemetry.api.trace.Span;
-import io.quarkus.security.identity.SecurityIdentity;
-
 import org.jboss.pnc.api.constants.MDCKeys;
 import org.jboss.pnc.common.log.MDCUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
+import io.opentelemetry.api.trace.Span;
+import io.quarkus.security.identity.SecurityIdentity;
+
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>
  */

diff --git a/src/test/java/org/jboss/pnc/environmentdriver/DriverTest.java b/src/test/java/org/jboss/pnc/environmentdriver/DriverTest.java
@@ -17,6 +17,15 @@
  */
 package org.jboss.pnc.environmentdriver;
 
+import static io.restassured.RestAssured.given;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collections;
@@ -27,20 +36,6 @@
 
 import javax.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServicePort;
-import io.fabric8.kubernetes.api.model.ServiceSpec;
-import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.fabric8.kubernetes.client.dsl.PodResource;
-import io.fabric8.kubernetes.client.dsl.ServiceResource;
-import io.fabric8.openshift.client.OpenShiftClient;
-import io.quarkus.test.junit.QuarkusMock;
-import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.mockito.InjectMock;
-import io.quarkus.test.security.TestSecurity;
-import io.restassured.RestAssured;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.jboss.pnc.api.constants.HttpHeaders;
@@ -69,14 +64,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.restassured.RestAssured.given;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServicePort;
+import io.fabric8.kubernetes.api.model.ServiceSpec;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
+import io.fabric8.kubernetes.client.dsl.PodResource;
+import io.fabric8.kubernetes.client.dsl.ServiceResource;
+import io.fabric8.openshift.client.OpenShiftClient;
+import io.quarkus.test.junit.QuarkusMock;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.mockito.InjectMock;
+import io.quarkus.test.security.TestSecurity;
+import io.restassured.RestAssured;
 
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>
@@ -125,7 +127,8 @@ public static void beforeClass() throws Exception {
 
     @BeforeEach
     public void setup() {
-        when(indyService.getAuthToken(any(IndyTokenRequestDTO.class), any(String.class))).thenReturn(new IndyTokenResponseDTO("token-for-builder-pod"));
+        when(indyService.getAuthToken(any(IndyTokenRequestDTO.class), any(String.class)))
+                .thenReturn(new IndyTokenResponseDTO("token-for-builder-pod"));
     }
 
     @AfterAll

diff --git a/src/test/java/org/jboss/pnc/environmentdriver/MockOidcClient.java b/src/test/java/org/jboss/pnc/environmentdriver/MockOidcClient.java
@@ -17,17 +17,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import java.io.IOException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Map;
+
 import io.quarkus.logging.Log;
 import io.quarkus.oidc.client.OidcClient;
 import io.quarkus.oidc.client.Tokens;
 import io.quarkus.test.Mock;
 import io.smallrye.mutiny.Uni;
 
-import java.io.IOException;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Map;
-
 @Mock
 public class MockOidcClient implements OidcClient {
 

diff --git a/src/test/java/org/jboss/pnc/environmentdriver/SecureLogTest.java b/src/test/java/org/jboss/pnc/environmentdriver/SecureLogTest.java
@@ -17,15 +17,15 @@
  */
 package org.jboss.pnc.environmentdriver;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * @author Jakub Bartecek
  */

diff --git a/src/test/java/org/jboss/pnc/environmentdriver/invokerserver/CallbackHandler.java b/src/test/java/org/jboss/pnc/environmentdriver/invokerserver/CallbackHandler.java
@@ -27,9 +27,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jboss.pnc.api.dto.Request;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>
  */

diff --git a/src/test/java/org/jboss/pnc/environmentdriver/invokerserver/HttpServer.java b/src/test/java/org/jboss/pnc/environmentdriver/invokerserver/HttpServer.java
@@ -18,6 +18,10 @@
 
 package org.jboss.pnc.environmentdriver.invokerserver;
 
+import static io.undertow.servlet.Servlets.defaultContainer;
+import static io.undertow.servlet.Servlets.deployment;
+import static io.undertow.servlet.Servlets.servlet;
+
 import java.security.NoSuchAlgorithmException;
 import java.util.HashSet;
 import java.util.Set;
@@ -29,10 +33,6 @@
 import io.undertow.servlet.api.DeploymentInfo;
 import io.undertow.servlet.api.DeploymentManager;
 
-import static io.undertow.servlet.Servlets.defaultContainer;
-import static io.undertow.servlet.Servlets.deployment;
-import static io.undertow.servlet.Servlets.servlet;
-
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>
  */