Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor checkstyle fixes #251

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Minor checkstyle fixes #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions src/main/java/software/aws/neptune/common/IAMHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
}
}
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/common/gremlindatamodel/MetadataCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/software/aws/neptune/common/gremlindatamodel/resultset/ResultSetGetColumns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/common/gremlindatamodel/resultset/ResultSetGetTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/gremlin/adapter/converter/SqlConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/software/aws/neptune/gremlin/adapter/converter/ast/nodes/select/GremlinSqlSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ftware/aws/neptune/gremlin/adapter/converter/ast/nodes/select/GremlinSqlSelectSingle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/software/aws/neptune/gremlin/adapter/util/SqlGremlinError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/gremlin/resultset/GremlinResultSetGetColumns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/gremlin/resultset/GremlinResultSetGetTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/opencypher/resultset/OpenCypherResultSetGetColumns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/opencypher/resultset/OpenCypherResultSetGetTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/software/aws/neptune/sparql/SparqlQueryExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading