cleanup: fix java linting errors

.github/cloudbuild/pos-pr-open-to-main.yaml

@@ -18,9 +18,9 @@
 ###########################################################
 
 steps:
-###########################################################
-# npm install to ensure ui dependencies have no errors
-###########################################################
+  ###########################################################
+  # npm install to ensure ui dependencies have no errors
+  ###########################################################
 - id: 'npm-install'
   name: 'node:16.14.0'
   dir: 'src/ui'
@@ -29,11 +29,25 @@ steps:
   # indicates that the step need not wait for any other step
   waitFor: [ '-' ]
 
+  ###########################################################
+  # Verify that Java code has no errors
+  ###########################################################
+- id: 'maven-verify-java'
+  name: 'gcr.io/cloud-builders/mvn'
+  entrypoint: bash
+  args:
+  - -c
+  - |
+    # This will only check and report errors. Can fix them by using [./mvnw com.coveo:fmt-maven-plugin:format]
+    mvn clean verify -DskipTests
+  # indicates that the step need not wait for any other step
+  waitFor: [ '-' ]
+
   ###########################################################
   # create namespace yaml for the PR
   ###########################################################
 - id: 'create-namespace.yaml'
-  name: ubuntu
+  name: 'ubuntu'
   entrypoint: bash
   args:
   - -c
@@ -75,7 +89,7 @@ steps:
   # create the skaffold deploy script
   ###########################################################
 - id: 'create-skaffold-exec-script'
-  name: ubuntu
+  name: 'ubuntu'
   entrypoint: bash
   args:
   - -c

.mvn/jvm.config

@@ -0,0 +1,5 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

pom.xml

@@ -45,6 +45,8 @@
     <maven-checkstyle.plugin.version>3.1.2</maven-checkstyle.plugin.version>
     <maven-surefire.plugin.version>2.22.2</maven-surefire.plugin.version>
     <jacoco-maven.plugin.version>0.8.7</jacoco-maven.plugin.version>
+    <coveo-fmt-maven-plugin.version>2.13</coveo-fmt-maven-plugin.version>
+    <googlejavaformat.version>1.15.0</googlejavaformat.version>
     <artifactregistry-maven-wagon.extension.version>2.1.5
     </artifactregistry-maven-wagon.extension.version>
   </properties>
@@ -109,12 +111,12 @@
       <dependency>
         <groupId>com.google.abm-edge</groupId>
         <artifactId>ui</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.abm-edge</groupId>
         <artifactId>service-sdk</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -161,6 +163,30 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>com.coveo</groupId>
+          <artifactId>fmt-maven-plugin</artifactId>
+          <version>${coveo-fmt-maven-plugin.version}</version>
+          <configuration>
+            <style>google</style>
+            <verbose>true</verbose>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>com.google.googlejavaformat</groupId>
+              <artifactId>google-java-format</artifactId>
+              <version>${googlejavaformat.version}</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <!-- <phase>validate</phase> -->
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
     <extensions>

src/api-server/pom.xml

@@ -126,6 +126,11 @@
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <!--Coveo plugin is used to validate for code formatting. It uses 'google-java-format'-->
+        <groupId>com.coveo</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>

src/api-server/src/main/java/com/google/abmedge/apiserver/ApiServerApplication.java

@@ -19,32 +19,27 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  * The main entry point into the api-server of the point-of-sale application stack. This class
  * serves the key requirement of starting the Springboot service and the embedded web server along
  * wih to start accepting requests
  *
- * <p>The api-server service APIs are the only publicly-accessible APIs in stack. All requests to the
- * other services essentially pass-through this service. The static files from the UI consume the
- * api-server APIs to load items and process payment
+ * <p>The api-server service APIs are the only publicly-accessible APIs in stack. All requests to
+ * the other services essentially pass-through this service. The static files from the UI consume
+ * the api-server APIs to load items and process payment
  */
 @SpringBootApplication
 public class ApiServerApplication {
-	private static final Logger LOGGER =
-			LogManager.getLogger(ApiServerApplication.class);
+  private static final Logger LOGGER = LogManager.getLogger(ApiServerApplication.class);
 
-	public static void main(String[] args) {
-		SpringApplication.run(ApiServerApplication.class, args);
-	}
+  public static void main(String[] args) {
+    SpringApplication.run(ApiServerApplication.class, args);
+  }
 
-	/** A utility method to print out a log message when the Springboot application terminates */
-	@PreDestroy
-	public void destroy() {
-		LOGGER.info("Api-Server is shutting down");
-	}
+  /** A utility method to print out a log message when the Springboot application terminates */
+  @PreDestroy
+  public void destroy() {
+    LOGGER.info("Api-Server is shutting down");
+  }
 }