Checkstyle fixes

Import ordering, javadoc descriptions, indentation
aws · Feb 6, 2024 · ab40659 · ab40659
1 parent bbc7505
commit ab40659
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 31 deletions.
diff --git a/src/main/java/software/aws/neptune/common/IAMHelper.java b/src/main/java/software/aws/neptune/common/IAMHelper.java
@@ -24,19 +24,17 @@
 
 public class IAMHelper {
     public static void addHandshakeInterceptor(Cluster.Builder builder) {
-        builder.handshakeInterceptor( r ->
-                {
-                    try {
-                        NeptuneNettyHttpSigV4Signer sigV4Signer =
-                                new NeptuneNettyHttpSigV4Signer(
-                                        new ChainedSigV4PropertiesProvider().getSigV4Properties().getServiceRegion(),
-                                        new DefaultAWSCredentialsProviderChain());
-                        sigV4Signer.signRequest(r);
-                    } catch (NeptuneSigV4SignerException e) {
-                        throw new RuntimeException("Exception occurred while signing the request", e);
-                    }
-                    return r;
-                }
-        );
+        builder.handshakeInterceptor( r -> {
+            try {
+                NeptuneNettyHttpSigV4Signer sigV4Signer =
+                        new NeptuneNettyHttpSigV4Signer(
+                                new ChainedSigV4PropertiesProvider().getSigV4Properties().getServiceRegion(),
+                                new DefaultAWSCredentialsProviderChain());
+                sigV4Signer.signRequest(r);
+            } catch (NeptuneSigV4SignerException e) {
+                throw new RuntimeException("Exception occurred while signing the request", e);
+            }
+            return r;
+        });
     }
 }
diff --git a/src/main/java/software/aws/neptune/common/gremlindatamodel/MetadataCache.java b/src/main/java/software/aws/neptune/common/gremlindatamodel/MetadataCache.java
@@ -19,10 +19,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.aws.neptune.gremlin.adapter.converter.schema.SqlSchemaGrabber;
+import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.gremlin.adapter.converter.schema.gremlin.GremlinEdgeTable;
 import software.aws.neptune.gremlin.adapter.converter.schema.gremlin.GremlinVertexTable;
-import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetColumns;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetTables;
 import software.aws.neptune.gremlin.GremlinConnectionProperties;

diff --git a/...main/java/software/aws/neptune/common/gremlindatamodel/resultset/ResultSetGetColumns.java b/...main/java/software/aws/neptune/common/gremlindatamodel/resultset/ResultSetGetColumns.java
@@ -19,9 +19,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
+import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.gremlin.adapter.converter.schema.gremlin.GremlinProperty;
 import software.aws.neptune.gremlin.adapter.converter.schema.gremlin.GremlinTableBase;
-import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.jdbc.ResultSet;
 import software.aws.neptune.jdbc.utilities.JavaToJdbcTypeConverter;
 import software.aws.neptune.jdbc.utilities.JdbcType;

diff --git a/src/main/java/software/aws/neptune/common/gremlindatamodel/resultset/ResultSetGetTables.java b/src/main/java/software/aws/neptune/common/gremlindatamodel/resultset/ResultSetGetTables.java
@@ -19,9 +19,9 @@
 import com.google.common.collect.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.gremlin.adapter.converter.schema.gremlin.GremlinTableBase;
-import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.jdbc.utilities.SqlError;
 import software.aws.neptune.jdbc.utilities.SqlState;
 import java.sql.SQLException;

diff --git a/src/main/java/software/aws/neptune/gremlin/adapter/converter/SqlConverter.java b/src/main/java/software/aws/neptune/gremlin/adapter/converter/SqlConverter.java
@@ -32,9 +32,9 @@
 import org.apache.calcite.tools.Planner;
 import org.apache.calcite.tools.Program;
 import org.apache.calcite.tools.Programs;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.aws.neptune.gremlin.adapter.converter.ast.nodes.GremlinSqlFactory;

diff --git a/...ava/software/aws/neptune/gremlin/adapter/converter/ast/nodes/select/GremlinSqlSelect.java b/...ava/software/aws/neptune/gremlin/adapter/converter/ast/nodes/select/GremlinSqlSelect.java
@@ -18,9 +18,9 @@
 
 import org.apache.calcite.sql.SqlNumericLiteral;
 import org.apache.calcite.sql.SqlSelect;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.aws.neptune.gremlin.adapter.converter.SqlMetadata;

diff --git a/...ftware/aws/neptune/gremlin/adapter/converter/ast/nodes/select/GremlinSqlSelectSingle.java b/...ftware/aws/neptune/gremlin/adapter/converter/ast/nodes/select/GremlinSqlSelectSingle.java
@@ -23,10 +23,10 @@
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlPrefixOperator;
 import org.apache.calcite.sql.SqlSelect;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
 import org.apache.tinkerpop.gremlin.structure.Column;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/software/aws/neptune/gremlin/adapter/util/SqlGremlinError.java b/src/main/java/software/aws/neptune/gremlin/adapter/util/SqlGremlinError.java
@@ -148,9 +148,9 @@ public static SQLException create(final SqlGremlinError key, final Logger logger
      * @param formatArgs    Any additional arguments to format the error message with.
      * @return SQLException
      */
-     public static SQLException create(final SqlGremlinError key, final Logger logger, final Object... formatArgs) {
+    public static SQLException create(final SqlGremlinError key, final Logger logger, final Object... formatArgs) {
         return create(key, logger, null, false, formatArgs);
-     }
+    }
 
     /**
      * Helper method for creating an appropriate SQLException.
@@ -160,9 +160,9 @@ public static SQLException create(final SqlGremlinError key, final Logger logger
      * @param formatArgs    Any additional arguments to format the error message with.
      * @return SQLException
      */
-     public static SQLException create(final SqlGremlinError key, final Throwable cause, final Object... formatArgs) {
+    public static SQLException create(final SqlGremlinError key, final Throwable cause, final Object... formatArgs) {
         return create(key, null, cause, false, formatArgs);
-     }
+    }
 
     /**
      * Helper method for creating an appropriate SQLException.
@@ -171,9 +171,9 @@ public static SQLException create(final SqlGremlinError key, final Throwable cau
      * @param formatArgs    Any additional arguments to format the error message with.
      * @return SQLException
      */
-     public static SQLException create(final SqlGremlinError key, final Object... formatArgs) {
+    public static SQLException create(final SqlGremlinError key, final Object... formatArgs) {
         return create(key, null, null, false, formatArgs);
-     }
+    }
 
     /**
      * Helper method for creating an appropriate SQLNotSupportedException.

diff --git a/src/main/java/software/aws/neptune/gremlin/resultset/GremlinResultSetGetColumns.java b/src/main/java/software/aws/neptune/gremlin/resultset/GremlinResultSetGetColumns.java
@@ -16,9 +16,9 @@
 
 package software.aws.neptune.gremlin.resultset;
 
-import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetColumns;
+import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;

diff --git a/src/main/java/software/aws/neptune/gremlin/resultset/GremlinResultSetGetTables.java b/src/main/java/software/aws/neptune/gremlin/resultset/GremlinResultSetGetTables.java
@@ -16,9 +16,9 @@
 
 package software.aws.neptune.gremlin.resultset;
 
-import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetTables;
+import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import java.sql.ResultSetMetaData;
 import java.sql.Statement;
 import java.util.ArrayList;

diff --git a/src/main/java/software/aws/neptune/opencypher/resultset/OpenCypherResultSetGetColumns.java b/src/main/java/software/aws/neptune/opencypher/resultset/OpenCypherResultSetGetColumns.java
@@ -18,9 +18,9 @@
 
 import org.neo4j.driver.internal.types.InternalTypeSystem;
 import org.neo4j.driver.types.Type;
-import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetColumns;
+import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;

diff --git a/src/main/java/software/aws/neptune/opencypher/resultset/OpenCypherResultSetGetTables.java b/src/main/java/software/aws/neptune/opencypher/resultset/OpenCypherResultSetGetTables.java
@@ -18,9 +18,9 @@
 
 import org.neo4j.driver.internal.types.InternalTypeSystem;
 import org.neo4j.driver.types.Type;
-import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetTables;
+import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;

diff --git a/src/main/java/software/aws/neptune/sparql/SparqlQueryExecutor.java b/src/main/java/software/aws/neptune/sparql/SparqlQueryExecutor.java
@@ -41,9 +41,9 @@
 import org.apache.jena.rdfconnection.RDFConnectionRemoteBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.common.ResultSetInfoWithoutRows;
 import software.aws.neptune.common.gremlindatamodel.resultset.ResultSetGetTables;
+import software.aws.neptune.gremlin.adapter.converter.schema.calcite.GremlinSchema;
 import software.aws.neptune.jdbc.utilities.AuthScheme;
 import software.aws.neptune.jdbc.utilities.QueryExecutor;
 import software.aws.neptune.jdbc.utilities.SqlError;