[AMORO-2113] Apply spotless-maven-plugin in trino module

.github/workflows/core-hadoop2-ci.yml

@@ -23,7 +23,6 @@ on:
       - "flink/**"
       - "hive/**"
       - "spark/**"
-      - "trino/**"
       - "pom.xml"
 
 jobs:
@@ -43,7 +42,7 @@ jobs:
         run: mvn validate
 
       - name: Build all module with Maven
-        run: mvn clean install -pl '!trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2
+        run: mvn clean install -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2
 
       - name: Code coverage
         uses: codecov/codecov-action@v3

.github/workflows/core-hadoop3-ci.yml

@@ -23,7 +23,6 @@ on:
       - "flink/**"
       - "hive/**"
       - "spark/**"
-      - "trino/**"
       - "pom.xml"
 
 jobs:
@@ -43,7 +42,7 @@ jobs:
         run: mvn validate
 
       - name: Build all module with Maven
-        run: mvn clean install -pl '!trino' -Djacoco.flink.skip=true -B -ntp
+        run: mvn clean install -Djacoco.flink.skip=true -B -ntp
 
       - name: Code coverage
         uses: codecov/codecov-action@v3

.github/workflows/trino-ci.yml

@@ -20,9 +20,7 @@ on:
     paths:
       - "ams/**"
       - "core/**"
-      - "flink/**"
       - "hive/**"
-      - "spark/**"
       - "trino/**"
       - "pom.xml"
 
@@ -39,13 +37,13 @@ jobs:
           cache: maven
 
       - name: Validate checkstyle first
-        run: mvn validate
+        run: mvn validate -DwithTrino
 
       - name: Install dependency with Maven
-        run: mvn clean install -DskipTests -pl 'ams/api,core,hive' -Dhadoop=v2 -am -B
+        run: mvn clean install -DwithTrino -DskipTests -pl 'ams/api,core,hive' -Dhadoop=v2 -am -B
 
       - name: Build with Maven
-        run: mvn clean test -pl 'trino' -B -ntp -Dhadoop=v2
+        run: mvn clean test -DwithTrino -pl 'trino' -B -ntp -Dhadoop=v2
 
       - name: Code coverage
         uses: codecov/codecov-action@v3

README.md

@@ -110,9 +110,15 @@ Amoro contains modules as below:
 
 ## Building
 
-Amoro is built using Maven with Java 1.8 and Java 17(only for `trino` module).
+Amoro is built using Maven with Java 1.8 and Java 17(only for `trino` module). And `trino` module is skipped by default.
 
-* To build Trino module need config `toolchains.xml` in `${user.home}/.m2/` dir, the content is
+* To invoke a build and run tests: `mvn clean package`
+* To skip tests: `mvn clean package -DskipTests`
+* To build with hadoop 2.x(the default is 3.x) `mvn clean package -DskipTests -Dhadoop=v2`
+* To indicate flink version for optimizer(the default is 1.14, 1.15 and 1.16 are available)
+  `mvn clean package -DskipTests -Doptimizer.flink=1.15`
+
+To build `trino` module, Java 17 environment or config `toolchains.xml` in `${user.home}/.m2/` dir is needed. The content of `toolchains.xml` is:
 
 ```
 <?xml version="1.0" encoding="UTF-8"?>
@@ -129,14 +135,12 @@ Amoro is built using Maven with Java 1.8 and Java 17(only for `trino` module).
     </toolchain>
 </toolchains>
 ```
+>Spotless is used as the checkstyle plugin but Spotless cannot sense the Toolchains plugin. So if you want to perform checkstyle when building `trino` module, the toolchain plug-in must be separated from checkstyle.
 
-* To invoke a build and run tests: `mvn package -P toolchain`
-* To skip tests: `mvn -DskipTests package -P toolchain`
-* To package without trino module and JAVA 17 dependency: `mvn clean package -DskipTests -pl '!trino'`
-* To build with hadoop 2.x(the default is 3.x) `mvn clean package -DskipTests -Dhadoop=v2`
-* To indicate flink version for optimizer(the default is 1.14, 1.15 and 1.16 are available)
-`mvn clean package -DskipTests -Doptimizer.flink=1.15`
-
+* To invoke a build include `trino` module by toolchains: `mvn clean package -DwithTrino -DskipTests -Dspotless.check.skip=true -P toolchain`
+* To invoke a build include `trino` module in Java 17 environment: `mvn clean package -DwithTrino -DskipTests`
+* To only build `trino` and its dependent modules by toolchains: `mvn clean package -DwithTrino -DskipTests -Dspotless.check.skip=true -pl 'trino' -am -P toolchain`
+* To only build `trino` and its dependent modules in Java 17 environment: `mvn clean package -DwithTrino -DskipTests -pl 'trino' -am`
 ## Quickstart
 
 Visit [https://amoro.netease.com/quick-demo/](https://amoro.netease.com/quick-demo/) to quickly

pom.xml

@@ -37,16 +37,6 @@
         </license>
     </licenses>
 
-    <modules>
-        <module>core</module>
-        <module>hive</module>
-        <module>flink</module>
-        <module>spark</module>
-        <module>trino</module>
-        <module>ams</module>
-        <module>dist</module>
-    </modules>
-
     <scm>
         <connection>scm:git:git@github.com:NetEase/amoro.git</connection>
         <developerConnection>scm:git:git@github.com:NetEase/amoro.git</developerConnection>
@@ -985,6 +975,39 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <property>
+                    <name>!withTrino</name>
+                </property>
+            </activation>
+            <modules>
+                <module>core</module>
+                <module>hive</module>
+                <module>flink</module>
+                <module>spark</module>
+                <module>ams</module>
+                <module>dist</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>include-trino</id>
+            <activation>
+                <property>
+                    <name>withTrino</name>
+                </property>
+            </activation>
+            <modules>
+                <module>core</module>
+                <module>hive</module>
+                <module>flink</module>
+                <module>spark</module>
+                <module>trino</module>
+                <module>ams</module>
+                <module>dist</module>
+            </modules>
+        </profile>
         <profile>
             <id>hadoop2</id>
             <activation>

trino/pom.xml

@@ -594,6 +594,30 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <configuration>
+                    <java>
+                        <googleJavaFormat>
+                            <version>1.15.0</version>
+                        </googleJavaFormat>
+                        <removeUnusedImports />
+                        <importOrder>
+                            <order>,javax,java,\\#</order>
+                        </importOrder>
+                    </java>
+                </configuration>
+            </plugin>
         </plugins>
         <sourceDirectory>src/main/java</sourceDirectory>
     </build>

trino/src/main/java/com/netease/arctic/ArcticErrorCode.java

@@ -18,17 +18,14 @@
 
 package com.netease.arctic;
 
+import static io.trino.spi.ErrorType.EXTERNAL;
+
 import io.trino.spi.ErrorCode;
 import io.trino.spi.ErrorCodeSupplier;
 import io.trino.spi.ErrorType;
 
-import static io.trino.spi.ErrorType.EXTERNAL;
-
-/**
- * Error code
- */
-public enum ArcticErrorCode
-    implements ErrorCodeSupplier {
+/** Error code */
+public enum ArcticErrorCode implements ErrorCodeSupplier {
   ARCTIC_BAD_DATA(4, EXTERNAL);
 
   private final ErrorCode errorCode;

trino/src/main/java/com/netease/arctic/trino/ArcticCatalogFactory.java

@@ -21,14 +21,10 @@
 import com.netease.arctic.catalog.ArcticCatalog;
 import com.netease.arctic.table.TableMetaStore;
 
-/**
- * A interface of factory to generate ArcticCatalog
- */
+/** A interface of factory to generate ArcticCatalog */
 public interface ArcticCatalogFactory {
 
-  /**
-   * generate ArcticCatalog
-   */
+  /** generate ArcticCatalog */
   ArcticCatalog getArcticCatalog();
 
   TableMetaStore getTableMetastore();

trino/src/main/java/com/netease/arctic/trino/ArcticCatalogSupportTableSuffix.java

@@ -61,12 +61,14 @@
 import org.apache.iceberg.io.LocationProvider;
 import org.apache.iceberg.types.Types;
 import org.apache.iceberg.util.StructLikeMap;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * A wrapper of {@link ArcticCatalog} to resolve sub table, such as "tableName#change","tableName#base"
+ * A wrapper of {@link ArcticCatalog} to resolve sub table, such as
+ * "tableName#change","tableName#base"
  */
 public class ArcticCatalogSupportTableSuffix implements ArcticCatalog {
 
@@ -82,8 +84,7 @@
   }
 
   @Override
-  public void initialize(
-      AmsClient client, CatalogMeta meta, Map<String, String> properties) {
+  public void initialize(AmsClient client, CatalogMeta meta, Map<String, String> properties) {
     arcticCatalog.initialize(client, meta, properties);
   }
 
@@ -111,12 +112,18 @@
   public ArcticTable loadTable(TableIdentifier tableIdentifier) {
     TableNameResolve tableNameResolve = new TableNameResolve(tableIdentifier.getTableName());
     if (tableNameResolve.withSuffix()) {
-      TableIdentifier newTableIdentifier = TableIdentifier.of(tableIdentifier.getCatalog(),
-          tableIdentifier.getDatabase(), tableNameResolve.getTableName());
+      TableIdentifier newTableIdentifier =
+          TableIdentifier.of(
+              tableIdentifier.getCatalog(),
+              tableIdentifier.getDatabase(),
+              tableNameResolve.getTableName());
       ArcticTable arcticTable = arcticCatalog.loadTable(newTableIdentifier);
       if (arcticTable.isUnkeyedTable()) {
-        throw new IllegalArgumentException("table " + newTableIdentifier + " is not keyed table can not use " +
-            "change or base suffix");
+        throw new IllegalArgumentException(
+            "table "
+                + newTableIdentifier
+                + " is not keyed table can not use "
+                + "change or base suffix");
       }
       KeyedTable keyedTable = arcticTable.asKeyedTable();
       if (tableNameResolve.isBase()) {
@@ -139,8 +146,7 @@
   }
 
   @Override
-  public TableBuilder newTableBuilder(
-      TableIdentifier identifier, Schema schema) {
+  public TableBuilder newTableBuilder(TableIdentifier identifier, Schema schema) {
     return arcticCatalog.newTableBuilder(identifier, schema);
   }
 

trino/src/main/java/com/netease/arctic/trino/ArcticConfig.java

@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,9 +21,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 
-/**
- * Arctic config
- */
+/** Arctic config */
 public class ArcticConfig {
   private String catalogUrl;
   private boolean hdfsImpersonationEnabled;

trino/src/main/java/com/netease/arctic/trino/ArcticConnector.java

@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,6 +18,13 @@
 
 package com.netease.arctic.trino;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.collect.Sets.immutableEnumSet;
+import static io.trino.spi.connector.ConnectorCapabilities.NOT_NULL_COLUMN_CONSTRAINT;
+import static io.trino.spi.transaction.IsolationLevel.SERIALIZABLE;
+import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import io.airlift.bootstrap.LifeCycleManager;
@@ -43,20 +49,12 @@
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Sets.immutableEnumSet;
-import static io.trino.spi.connector.ConnectorCapabilities.NOT_NULL_COLUMN_CONSTRAINT;
-import static io.trino.spi.transaction.IsolationLevel.SERIALIZABLE;
-import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
-import static java.util.Objects.requireNonNull;
-
-/**
- * A Connector of arctic to Trino
- */
+/** A Connector of arctic to Trino */
 public class ArcticConnector implements Connector {
 
   private static final Logger log = LoggerFactory.getLogger(ArcticConnector.class);
@@ -93,15 +91,22 @@ public ArcticConnector(
     this.splitManager = requireNonNull(splitManager, "splitManager is null");
     this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
     this.pageSinkProvider = requireNonNull(pageSinkProvider, "pageSinkProvider is null");
-    this.nodePartitioningProvider = requireNonNull(nodePartitioningProvider, "nodePartitioningProvider is null");
-    this.sessionProperties = requireNonNull(sessionPropertiesProviders, "sessionPropertiesProviders is null").stream()
-        .flatMap(sessionPropertiesProvider -> sessionPropertiesProvider.getSessionProperties().stream())
-        .collect(toImmutableList());
-    this.schemaProperties = ImmutableList.copyOf(requireNonNull(schemaProperties, "schemaProperties is null"));
-    this.tableProperties = ImmutableList.copyOf(requireNonNull(tableProperties, "tableProperties is null"));
+    this.nodePartitioningProvider =
+        requireNonNull(nodePartitioningProvider, "nodePartitioningProvider is null");
+    this.sessionProperties =
+        requireNonNull(sessionPropertiesProviders, "sessionPropertiesProviders is null").stream()
+            .flatMap(
+                sessionPropertiesProvider ->
+                    sessionPropertiesProvider.getSessionProperties().stream())
+            .collect(toImmutableList());
+    this.schemaProperties =
+        ImmutableList.copyOf(requireNonNull(schemaProperties, "schemaProperties is null"));
+    this.tableProperties =
+        ImmutableList.copyOf(requireNonNull(tableProperties, "tableProperties is null"));
     this.accessControl = requireNonNull(accessControl, "accessControl is null");
     this.procedures = ImmutableSet.copyOf(requireNonNull(procedures, "procedures is null"));
-    this.tableProcedures = ImmutableSet.copyOf(requireNonNull(tableProcedures, "tableProcedures is null"));
+    this.tableProcedures =
+        ImmutableSet.copyOf(requireNonNull(tableProcedures, "tableProcedures is null"));
   }
 
   @Override
@@ -110,7 +115,8 @@ public Set<ConnectorCapabilities> getCapabilities() {
   }
 
   @Override
-  public ConnectorMetadata getMetadata(ConnectorSession session, ConnectorTransactionHandle transaction) {
+  public ConnectorMetadata getMetadata(
+      ConnectorSession session, ConnectorTransactionHandle transaction) {
     ConnectorMetadata metadata = transactionManager.get(transaction);
     return new ClassLoaderSafeConnectorMetadata(metadata, getClass().getClassLoader());
   }
@@ -172,9 +178,7 @@ public ConnectorAccessControl getAccessControl() {
 
   @Override
   public ConnectorTransactionHandle beginTransaction(
-      IsolationLevel isolationLevel,
-      boolean readOnly,
-      boolean autoCommit) {
+      IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit) {
     checkConnectorSupports(SERIALIZABLE, isolationLevel);
     ConnectorTransactionHandle transaction = new HiveTransactionHandle(autoCommit);
     transactionManager.begin(transaction);