You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by la...@apache.org on 2018/06/08 23:00:08 UTC
calcite-avatica git commit: [CALCITE-2352] Update to checkstyle 6.18
Repository: calcite-avatica
Updated Branches:
refs/heads/master 99ea23ec7 -> acb675de9
[CALCITE-2352] Update to checkstyle 6.18
Update project to maven-checkstyle-plugin 3.0.0/checkstyle 6.18.
Fix all new reported violations.
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/acb675de
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/acb675de
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/acb675de
Branch: refs/heads/master
Commit: acb675de97b9b0743c09368820a770e2ceda05f8
Parents: 99ea23e
Author: Laurent Goujon <la...@apache.org>
Authored: Tue Jun 5 19:39:38 2018 -0700
Committer: Laurent Goujon <la...@apache.org>
Committed: Tue Jun 5 19:39:38 2018 -0700
----------------------------------------------------------------------
.../calcite/avatica/AvaticaJdbc41Factory.java | 5 +-
.../calcite/avatica/AvaticaSqlException.java | 4 +-
.../calcite/avatica/ConnectionConfigImpl.java | 3 +-
.../calcite/avatica/InternalProperty.java | 2 +-
.../java/org/apache/calcite/avatica/Meta.java | 10 +-
.../org/apache/calcite/avatica/MetaImpl.java | 6 +-
.../org/apache/calcite/avatica/SqlType.java | 4 +-
.../apache/calcite/avatica/remote/Driver.java | 2 +-
.../apache/calcite/avatica/remote/Handler.java | 3 +-
.../HostnameVerificationConfigurable.java | 2 +-
.../avatica/remote/KerberosConnection.java | 2 +-
.../avatica/remote/ProtobufTranslationImpl.java | 4 +-
.../calcite/avatica/remote/RemoteMeta.java | 2 +-
.../apache/calcite/avatica/remote/Service.java | 4 +-
.../calcite/avatica/remote/TypedValue.java | 2 +
.../calcite/avatica/util/AbstractCursor.java | 58 +++----
.../apache/calcite/avatica/util/ByteString.java | 6 +-
.../calcite/avatica/util/DateTimeUtils.java | 2 +-
.../calcite/avatica/util/PositionedCursor.java | 7 +-
.../calcite/avatica/util/TimeUnitRange.java | 3 +-
.../AvaticaResultSetConversionsTest.java | 6 +-
.../apache/calcite/avatica/QueryStateTest.java | 164 +++++++++----------
.../remote/ProtobufTranslationImplTest.java | 12 +-
.../calcite/avatica/test/AvaticaUtilsTest.java | 4 +-
.../avatica/test/ConnectStringParserTest.java | 122 +++++++-------
pom.xml | 11 +-
.../apache/calcite/avatica/jdbc/JdbcMeta.java | 2 +-
.../calcite/avatica/server/HttpServer.java | 1 +
.../calcite/avatica/AvaticaSpnegoTest.java | 2 +-
.../calcite/avatica/RemoteDriverTest.java | 82 +++++-----
.../apache/calcite/avatica/SslDriverTest.java | 2 +-
.../remote/AlternatingRemoteMetaTest.java | 6 +-
.../calcite/avatica/remote/ArrayTypeTest.java | 1 +
.../calcite/avatica/remote/RemoteMetaTest.java | 6 +-
.../server/CustomAuthHttpServerTest.java | 6 +-
.../calcite/avatica/test/AvaticaSuite.java | 2 +-
36 files changed, 290 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java b/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
index 2edf515..a175796 100644
--- a/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
+++ b/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java
@@ -36,9 +36,12 @@ class AvaticaJdbc41Factory implements AvaticaFactory {
private final int minor;
/** Creates a JDBC factory. */
+ // CHECKSTYLE: stop RedundantModifierCheck
public AvaticaJdbc41Factory() {
this(4, 1);
}
+ // CHECKSTYLE: resume RedundantModifierCheck
+
/** Creates a JDBC factory with given major/minor version number. */
protected AvaticaJdbc41Factory(int major, int minor) {
@@ -108,7 +111,7 @@ class AvaticaJdbc41Factory implements AvaticaFactory {
/** Implementation of Statement for JDBC 4.1. */
private static class AvaticaJdbc41Statement extends AvaticaStatement {
- public AvaticaJdbc41Statement(AvaticaConnection connection,
+ private AvaticaJdbc41Statement(AvaticaConnection connection,
Meta.StatementHandle h, int resultSetType, int resultSetConcurrency,
int resultSetHoldability) {
super(connection, h, resultSetType, resultSetConcurrency,
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/AvaticaSqlException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/AvaticaSqlException.java b/core/src/main/java/org/apache/calcite/avatica/AvaticaSqlException.java
index 9408a7b..bb02f1f 100644
--- a/core/src/main/java/org/apache/calcite/avatica/AvaticaSqlException.java
+++ b/core/src/main/java/org/apache/calcite/avatica/AvaticaSqlException.java
@@ -103,12 +103,12 @@ public class AvaticaSqlException extends SQLException {
private PrintWriter writer;
private final Type type;
- public PrintStreamOrWriter(PrintStream stream) {
+ private PrintStreamOrWriter(PrintStream stream) {
this.stream = stream;
type = Type.STREAM;
}
- public PrintStreamOrWriter(PrintWriter writer) {
+ private PrintStreamOrWriter(PrintWriter writer) {
this.writer = writer;
type = Type.WRITER;
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/ConnectionConfigImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/ConnectionConfigImpl.java b/core/src/main/java/org/apache/calcite/avatica/ConnectionConfigImpl.java
index 63fbd8d..94cdc51 100644
--- a/core/src/main/java/org/apache/calcite/avatica/ConnectionConfigImpl.java
+++ b/core/src/main/java/org/apache/calcite/avatica/ConnectionConfigImpl.java
@@ -281,7 +281,8 @@ public class ConnectionConfigImpl implements ConnectionConfig {
}
}
- /** Callback to parse a property from string to its native type. */
+ /** Callback to parse a property from string to its native type.
+ * @param <T> the native type */
public interface Converter<T> {
T apply(ConnectionProperty connectionProperty, String s);
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java b/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java
index a5a3852..9d144e2 100644
--- a/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java
+++ b/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java
@@ -59,7 +59,7 @@ public enum InternalProperty {
this(type, null, defaultValue);
}
- private InternalProperty(Type type, Class enumClass, Object defaultValue) {
+ InternalProperty(Type type, Class enumClass, Object defaultValue) {
this.type = type;
this.enumClass = enumClass;
this.defaultValue = defaultValue;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/Meta.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/Meta.java b/core/src/main/java/org/apache/calcite/avatica/Meta.java
index 81ae594..b9cb42b 100644
--- a/core/src/main/java/org/apache/calcite/avatica/Meta.java
+++ b/core/src/main/java/org/apache/calcite/avatica/Meta.java
@@ -746,7 +746,7 @@ public interface Meta {
}
/** Result of preparing a statement. */
- public class Signature {
+ class Signature {
private static final FieldDescriptor SQL_DESCRIPTOR = Common.Signature
.getDescriptor().findFieldByNumber(Common.Signature.SQL_FIELD_NUMBER);
private static final FieldDescriptor CURSOR_FACTORY_DESCRIPTOR = Common.Signature
@@ -1190,7 +1190,7 @@ public interface Meta {
}
/** Connection handle. */
- public class ConnectionHandle {
+ class ConnectionHandle {
public final String id;
@Override public String toString() {
@@ -1205,7 +1205,7 @@ public interface Meta {
/** Statement handle. */
// Visible for testing
- public class StatementHandle {
+ class StatementHandle {
private static final FieldDescriptor SIGNATURE_DESCRIPTOR = Common.StatementHandle
.getDescriptor().findFieldByNumber(Common.StatementHandle.SIGNATURE_FIELD_NUMBER);
public final String connectionId;
@@ -1275,7 +1275,7 @@ public interface Meta {
defaultImpl = ConnectionPropertiesImpl.class)
@JsonSubTypes({
@JsonSubTypes.Type(value = ConnectionPropertiesImpl.class, name = "connPropsImpl")
- })
+ })
interface ConnectionProperties {
/** Overwrite fields in {@code this} with any non-null fields in {@code that}
@@ -1284,7 +1284,7 @@ public interface Meta {
*/
ConnectionProperties merge(ConnectionProperties that);
- /** @return {@code true} when no properies have been set, {@code false} otherwise. */
+ /** @return {@code true} when no properties have been set, {@code false} otherwise. */
@JsonIgnore
boolean isEmpty();
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/MetaImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/MetaImpl.java b/core/src/main/java/org/apache/calcite/avatica/MetaImpl.java
index f663ebb..f4f3e12 100644
--- a/core/src/main/java/org/apache/calcite/avatica/MetaImpl.java
+++ b/core/src/main/java/org/apache/calcite/avatica/MetaImpl.java
@@ -1508,7 +1508,7 @@ public abstract class MetaImpl implements Meta {
private final int sqlType;
private final String sqlTypeName;
- public TypeInfo(int sqlType, String sqlTypeName) {
+ private TypeInfo(int sqlType, String sqlTypeName) {
this.sqlType = sqlType;
this.sqlTypeName = sqlTypeName;
}
@@ -1542,7 +1542,7 @@ public abstract class MetaImpl implements Meta {
private final QueryState state;
private final Frame firstFrame;
- public FetchIterable(AvaticaStatement stmt, QueryState state, Frame firstFrame) {
+ private FetchIterable(AvaticaStatement stmt, QueryState state, Frame firstFrame) {
this.stmt = stmt;
this.state = state;
this.firstFrame = firstFrame;
@@ -1561,7 +1561,7 @@ public abstract class MetaImpl implements Meta {
private Iterator<Object> rows;
private long currentOffset = 0;
- public FetchIterator(AvaticaStatement stmt, QueryState state, Frame firstFrame) {
+ private FetchIterator(AvaticaStatement stmt, QueryState state, Frame firstFrame) {
this.stmt = stmt;
this.state = state;
if (firstFrame == null) {
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/SqlType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/SqlType.java b/core/src/main/java/org/apache/calcite/avatica/SqlType.java
index ff2f890..5111f9f 100644
--- a/core/src/main/java/org/apache/calcite/avatica/SqlType.java
+++ b/core/src/main/java/org/apache/calcite/avatica/SqlType.java
@@ -411,8 +411,8 @@ public enum SqlType {
EnumSet<SqlType> numericTypes = EnumSet.of(TINYINT, SMALLINT, INTEGER,
BIGINT, REAL, FLOAT, DOUBLE, DECIMAL, NUMERIC, BIT, BOOLEAN);
Class[] numericClasses = {
- BigDecimal.class, Boolean.class, Byte.class, Short.class, Integer.class,
- Long.class, Float.class, Double.class
+ BigDecimal.class, Boolean.class, Byte.class, Short.class, Integer.class,
+ Long.class, Float.class, Double.class
};
EnumSet<SqlType> charTypes = EnumSet.of(CHAR, VARCHAR, LONGVARCHAR);
EnumSet<SqlType> ncharTypes = EnumSet.of(NCHAR, NVARCHAR, LONGNVARCHAR);
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/Driver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/Driver.java b/core/src/main/java/org/apache/calcite/avatica/remote/Driver.java
index 3f6d4df..49dbd04 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/Driver.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/Driver.java
@@ -57,7 +57,7 @@ public class Driver extends UnregisteredDriver {
/**
* Defines the method of message serialization used by the Driver
*/
- public static enum Serialization {
+ public enum Serialization {
JSON,
PROTOBUF;
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/Handler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/Handler.java b/core/src/main/java/org/apache/calcite/avatica/remote/Handler.java
index 5d8a6a8..1a7e916 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/Handler.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/Handler.java
@@ -34,8 +34,9 @@ public interface Handler<T> {
/**
* Struct that encapsulates the context of the result of a request to Avatica.
+ * @param <T> the response type
*/
- public class HandlerResponse<T> {
+ class HandlerResponse<T> {
private final T response;
private final int statusCode;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/HostnameVerificationConfigurable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/HostnameVerificationConfigurable.java b/core/src/main/java/org/apache/calcite/avatica/remote/HostnameVerificationConfigurable.java
index 4f6d111..db4fa1a 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/HostnameVerificationConfigurable.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/HostnameVerificationConfigurable.java
@@ -24,7 +24,7 @@ public interface HostnameVerificationConfigurable {
/**
* Describes the support hostname verification methods of {@link AvaticaHttpClient}.
*/
- public enum HostnameVerification {
+ enum HostnameVerification {
/**
* The common name (CN) on the certificate must match the server's hostname.
*/
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/KerberosConnection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/KerberosConnection.java b/core/src/main/java/org/apache/calcite/avatica/remote/KerberosConnection.java
index 657297e..debe0cc 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/KerberosConnection.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/KerberosConnection.java
@@ -247,7 +247,7 @@ public class KerberosConnection {
private final long renewalPeriod;
private final AtomicBoolean keepRunning = new AtomicBoolean(true);
- public RenewalTask(KerberosConnection utilInstance, LoginContext context, Subject subject,
+ RenewalTask(KerberosConnection utilInstance, LoginContext context, Subject subject,
Configuration conf, long renewalPeriod) {
this.utilInstance = Objects.requireNonNull(utilInstance);
this.context = Objects.requireNonNull(context);
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java b/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java
index b1e92f1..eb616a2 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java
@@ -95,7 +95,7 @@ public class ProtobufTranslationImpl implements ProtobufTranslation {
private final Parser<? extends Message> parser;
private final Service.Request impl;
- public RequestTranslator(Parser<? extends Message> parser, Service.Request impl) {
+ RequestTranslator(Parser<? extends Message> parser, Service.Request impl) {
this.parser = parser;
this.impl = impl;
}
@@ -120,7 +120,7 @@ public class ProtobufTranslationImpl implements ProtobufTranslation {
private final Parser<? extends Message> parser;
private final Service.Response impl;
- public ResponseTranslator(Parser<? extends Message> parser, Service.Response impl) {
+ ResponseTranslator(Parser<? extends Message> parser, Service.Response impl) {
this.parser = parser;
this.impl = impl;
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/RemoteMeta.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/RemoteMeta.java b/core/src/main/java/org/apache/calcite/avatica/remote/RemoteMeta.java
index 75b9d58..c0c8c22 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/RemoteMeta.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/RemoteMeta.java
@@ -44,7 +44,7 @@ class RemoteMeta extends MetaImpl {
final Map<String, ConnectionPropertiesImpl> propsMap = new HashMap<>();
private Map<DatabaseProperty, Object> databaseProperties;
- public RemoteMeta(AvaticaConnection connection, Service service) {
+ RemoteMeta(AvaticaConnection connection, Service service) {
super(connection);
this.service = service;
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/Service.java b/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
index d7b5eee..76e1e6b 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
@@ -2289,7 +2289,7 @@ public interface Service {
* transport over the wire. Thus, {@link Service#apply} will never return
* an ErrorResponse.
*/
- public class ErrorResponse extends Response {
+ class ErrorResponse extends Response {
private static final FieldDescriptor ERROR_MESSAGE_DESCRIPTOR = Responses.ErrorResponse
.getDescriptor().findFieldByNumber(
Responses.ErrorResponse.ERROR_MESSAGE_FIELD_NUMBER);
@@ -2646,7 +2646,7 @@ public interface Service {
* <p>This isn't really a "response", but we want to be able to be able to convert it to protobuf
* and back again, so ignore that there isn't an explicit endpoint for it.
*/
- public class RpcMetadataResponse extends Response {
+ class RpcMetadataResponse extends Response {
private static final FieldDescriptor SERVER_ADDRESS_DESCRIPTOR = Responses.RpcMetadata
.getDescriptor().findFieldByNumber(Responses.RpcMetadata.SERVER_ADDRESS_FIELD_NUMBER);
public final String serverAddress;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/remote/TypedValue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/TypedValue.java b/core/src/main/java/org/apache/calcite/avatica/remote/TypedValue.java
index a2deef3..98f4523 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/TypedValue.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/TypedValue.java
@@ -655,6 +655,7 @@ public class TypedValue {
}
// Intentional fall-through to RTE because we can't serialize something we have no type
// insight into.
+ // fall through
case UNRECOGNIZED:
// Fail?
throw new RuntimeException("Unhandled value: " + type + " " + o.getClass());
@@ -760,6 +761,7 @@ public class TypedValue {
}
// Intentional fall through to RTE. If we sent an object over the wire, it could only
// possibly be null (at this point). Anything else has to be an error.
+ // fall through
case UNRECOGNIZED:
// Fail?
throw new RuntimeException("Unhandled type: " + protoValue.getType());
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/util/AbstractCursor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/util/AbstractCursor.java b/core/src/main/java/org/apache/calcite/avatica/util/AbstractCursor.java
index 419a58b..9372bfb 100644
--- a/core/src/main/java/org/apache/calcite/avatica/util/AbstractCursor.java
+++ b/core/src/main/java/org/apache/calcite/avatica/util/AbstractCursor.java
@@ -289,7 +289,7 @@ public abstract class AbstractCursor implements Cursor {
static class AccessorImpl implements Accessor {
protected final Getter getter;
- public AccessorImpl(Getter getter) {
+ AccessorImpl(Getter getter) {
assert getter != null;
this.getter = getter;
}
@@ -434,7 +434,7 @@ public abstract class AbstractCursor implements Cursor {
* {@link #getLong()} method.
*/
private abstract static class ExactNumericAccessor extends AccessorImpl {
- public ExactNumericAccessor(Getter getter) {
+ private ExactNumericAccessor(Getter getter) {
super(getter);
}
@@ -470,7 +470,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#BOOLEAN}.
*/
private static class BooleanAccessor extends ExactNumericAccessor {
- public BooleanAccessor(Getter getter) {
+ private BooleanAccessor(Getter getter) {
super(getter);
}
@@ -489,7 +489,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#TINYINT}.
*/
private static class ByteAccessor extends ExactNumericAccessor {
- public ByteAccessor(Getter getter) {
+ private ByteAccessor(Getter getter) {
super(getter);
}
@@ -513,7 +513,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#SMALLINT}.
*/
private static class ShortAccessor extends ExactNumericAccessor {
- public ShortAccessor(Getter getter) {
+ private ShortAccessor(Getter getter) {
super(getter);
}
@@ -537,7 +537,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#INTEGER}.
*/
private static class IntAccessor extends ExactNumericAccessor {
- public IntAccessor(Getter getter) {
+ private IntAccessor(Getter getter) {
super(getter);
}
@@ -556,7 +556,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#BIGINT}.
*/
private static class LongAccessor extends ExactNumericAccessor {
- public LongAccessor(Getter getter) {
+ private LongAccessor(Getter getter) {
super(getter);
}
@@ -571,7 +571,7 @@ public abstract class AbstractCursor implements Cursor {
*/
private abstract static class ApproximateNumericAccessor
extends AccessorImpl {
- public ApproximateNumericAccessor(Getter getter) {
+ private ApproximateNumericAccessor(Getter getter) {
super(getter);
}
@@ -603,7 +603,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#FLOAT}.
*/
private static class FloatAccessor extends ApproximateNumericAccessor {
- public FloatAccessor(Getter getter) {
+ private FloatAccessor(Getter getter) {
super(getter);
}
@@ -622,7 +622,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#DOUBLE}.
*/
private static class DoubleAccessor extends ApproximateNumericAccessor {
- public DoubleAccessor(Getter getter) {
+ private DoubleAccessor(Getter getter) {
super(getter);
}
@@ -642,7 +642,7 @@ public abstract class AbstractCursor implements Cursor {
* {@link #getLong()} method.
*/
private abstract static class BigNumberAccessor extends AccessorImpl {
- public BigNumberAccessor(Getter getter) {
+ private BigNumberAccessor(Getter getter) {
super(getter);
}
@@ -689,7 +689,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#DECIMAL}.
*/
private static class BigDecimalAccessor extends BigNumberAccessor {
- public BigDecimalAccessor(Getter getter) {
+ private BigDecimalAccessor(Getter getter) {
super(getter);
}
@@ -717,7 +717,7 @@ public abstract class AbstractCursor implements Cursor {
static class NumberAccessor extends BigNumberAccessor {
private final int scale;
- public NumberAccessor(Getter getter, int scale) {
+ NumberAccessor(Getter getter, int scale) {
super(getter);
this.scale = scale;
}
@@ -749,7 +749,7 @@ public abstract class AbstractCursor implements Cursor {
* and {@link java.sql.Types#VARCHAR}.
*/
private static class StringAccessor extends AccessorImpl {
- public StringAccessor(Getter getter) {
+ private StringAccessor(Getter getter) {
super(getter);
}
@@ -773,7 +773,7 @@ public abstract class AbstractCursor implements Cursor {
private static class FixedStringAccessor extends StringAccessor {
protected final Spacer spacer;
- public FixedStringAccessor(Getter getter, int length) {
+ private FixedStringAccessor(Getter getter, int length) {
super(getter);
this.spacer = new Spacer(length);
}
@@ -792,7 +792,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#CHAR}.
*/
private static class StringFromCharAccessor extends FixedStringAccessor {
- public StringFromCharAccessor(Getter getter, int length) {
+ private StringFromCharAccessor(Getter getter, int length) {
super(getter, length);
}
@@ -812,7 +812,7 @@ public abstract class AbstractCursor implements Cursor {
* and {@link java.sql.Types#VARBINARY}.
*/
private static class BinaryAccessor extends AccessorImpl {
- public BinaryAccessor(Getter getter) {
+ private BinaryAccessor(Getter getter) {
super(getter);
}
@@ -855,7 +855,7 @@ public abstract class AbstractCursor implements Cursor {
* and {@link java.sql.Types#VARBINARY} values in Base64 format.
*/
private static class BinaryFromStringAccessor extends StringAccessor {
- public BinaryFromStringAccessor(Getter getter) {
+ private BinaryFromStringAccessor(Getter getter) {
super(getter);
}
@@ -902,7 +902,7 @@ public abstract class AbstractCursor implements Cursor {
private static class DateFromNumberAccessor extends NumberAccessor {
private final Calendar localCalendar;
- public DateFromNumberAccessor(Getter getter, Calendar localCalendar) {
+ private DateFromNumberAccessor(Getter getter, Calendar localCalendar) {
super(getter, 0);
this.localCalendar = localCalendar;
}
@@ -945,7 +945,7 @@ public abstract class AbstractCursor implements Cursor {
private static class TimeFromNumberAccessor extends NumberAccessor {
private final Calendar localCalendar;
- public TimeFromNumberAccessor(Getter getter, Calendar localCalendar) {
+ private TimeFromNumberAccessor(Getter getter, Calendar localCalendar) {
super(getter, 0);
this.localCalendar = localCalendar;
}
@@ -987,7 +987,7 @@ public abstract class AbstractCursor implements Cursor {
private static class TimestampFromNumberAccessor extends NumberAccessor {
private final Calendar localCalendar;
- public TimestampFromNumberAccessor(Getter getter, Calendar localCalendar) {
+ private TimestampFromNumberAccessor(Getter getter, Calendar localCalendar) {
super(getter, 0);
this.localCalendar = localCalendar;
}
@@ -1037,7 +1037,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#DATE}.
*/
private static class DateAccessor extends ObjectAccessor {
- public DateAccessor(Getter getter) {
+ private DateAccessor(Getter getter) {
super(getter);
}
@@ -1076,7 +1076,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#TIME}.
*/
private static class TimeAccessor extends ObjectAccessor {
- public TimeAccessor(Getter getter) {
+ private TimeAccessor(Getter getter) {
super(getter);
}
@@ -1114,7 +1114,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#TIMESTAMP}.
*/
private static class TimestampAccessor extends ObjectAccessor {
- public TimestampAccessor(Getter getter) {
+ private TimestampAccessor(Getter getter) {
super(getter);
}
@@ -1171,7 +1171,7 @@ public abstract class AbstractCursor implements Cursor {
private static class TimestampFromUtilDateAccessor extends ObjectAccessor {
private final Calendar localCalendar;
- public TimestampFromUtilDateAccessor(Getter getter,
+ private TimestampFromUtilDateAccessor(Getter getter,
Calendar localCalendar) {
super(getter);
this.localCalendar = localCalendar;
@@ -1228,7 +1228,7 @@ public abstract class AbstractCursor implements Cursor {
private static class IntervalYearMonthAccessor extends IntAccessor {
private final TimeUnitRange range;
- public IntervalYearMonthAccessor(Getter getter, TimeUnitRange range) {
+ private IntervalYearMonthAccessor(Getter getter, TimeUnitRange range) {
super(getter);
this.range = range;
}
@@ -1250,7 +1250,7 @@ public abstract class AbstractCursor implements Cursor {
private final TimeUnitRange range;
private final int scale;
- public IntervalDayTimeAccessor(Getter getter, TimeUnitRange range,
+ private IntervalDayTimeAccessor(Getter getter, TimeUnitRange range,
int scale) {
super(getter);
this.range = range;
@@ -1377,7 +1377,7 @@ public abstract class AbstractCursor implements Cursor {
private static class StructAccessor extends AccessorImpl {
private final List<Accessor> fieldAccessors;
- public StructAccessor(Getter getter, List<Accessor> fieldAccessors) {
+ private StructAccessor(Getter getter, List<Accessor> fieldAccessors) {
super(getter);
this.fieldAccessors = fieldAccessors;
}
@@ -1419,7 +1419,7 @@ public abstract class AbstractCursor implements Cursor {
* corresponds to {@link java.sql.Types#JAVA_OBJECT}.
*/
private static class ObjectAccessor extends AccessorImpl {
- public ObjectAccessor(Getter getter) {
+ private ObjectAccessor(Getter getter) {
super(getter);
}
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/util/ByteString.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/util/ByteString.java b/core/src/main/java/org/apache/calcite/avatica/util/ByteString.java
index e5787ee..2bd24e0 100644
--- a/core/src/main/java/org/apache/calcite/avatica/util/ByteString.java
+++ b/core/src/main/java/org/apache/calcite/avatica/util/ByteString.java
@@ -37,8 +37,8 @@ public class ByteString implements Comparable<ByteString>, Serializable {
public static final ByteString EMPTY = new ByteString(new byte[0], false);
private static final char[] DIGITS = {
- '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
/**
@@ -251,7 +251,7 @@ public class ByteString implements Comparable<ByteString>, Serializable {
@SuppressWarnings({
"CloneDoesntCallSuperClone",
"CloneDoesntDeclareCloneNotSupportedException"
- })
+ })
@Override public Object clone() {
return this;
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java b/core/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
index b4148dc..25a9558 100644
--- a/core/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
+++ b/core/src/main/java/org/apache/calcite/avatica/util/DateTimeUtils.java
@@ -1136,7 +1136,7 @@ public class DateTimeUtils {
implements OffsetDateTimeHandler {
final Class offsetDateTimeClass;
- public ReflectiveOffsetDateTimeHandler() throws ClassNotFoundException {
+ private ReflectiveOffsetDateTimeHandler() throws ClassNotFoundException {
offsetDateTimeClass = Class.forName("java.time.OffsetDateTime");
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/util/PositionedCursor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/util/PositionedCursor.java b/core/src/main/java/org/apache/calcite/avatica/util/PositionedCursor.java
index 38d6eb4..1bee68b 100644
--- a/core/src/main/java/org/apache/calcite/avatica/util/PositionedCursor.java
+++ b/core/src/main/java/org/apache/calcite/avatica/util/PositionedCursor.java
@@ -120,7 +120,9 @@ public abstract class PositionedCursor<T> extends AbstractCursor {
protected class FieldGetter extends AbstractGetter {
protected final Field field;
- public FieldGetter(Field field) { this.field = field; }
+ public FieldGetter(Field field) {
+ this.field = field;
+ }
public Object getObject() throws SQLException {
Object o;
@@ -136,7 +138,8 @@ public abstract class PositionedCursor<T> extends AbstractCursor {
/** Implementation of
* {@link org.apache.calcite.avatica.util.AbstractCursor.Getter}
- * that reads entries from a {@link java.util.Map}. */
+ * that reads entries from a {@link java.util.Map}.
+ * @param <K> the key type */
protected class MapGetter<K> extends AbstractGetter {
protected final K key;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/main/java/org/apache/calcite/avatica/util/TimeUnitRange.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/util/TimeUnitRange.java b/core/src/main/java/org/apache/calcite/avatica/util/TimeUnitRange.java
index 2e65ed3..98e4fd2 100644
--- a/core/src/main/java/org/apache/calcite/avatica/util/TimeUnitRange.java
+++ b/core/src/main/java/org/apache/calcite/avatica/util/TimeUnitRange.java
@@ -93,7 +93,8 @@ public enum TimeUnitRange {
return ordinal() <= MONTH.ordinal();
}
- /** Immutable pair of values of the same type. */
+ /** Immutable pair of values of the same type.
+ * @param <E> the element type */
private static class Pair<E> {
final E left;
final E right;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/test/java/org/apache/calcite/avatica/AvaticaResultSetConversionsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/avatica/AvaticaResultSetConversionsTest.java b/core/src/test/java/org/apache/calcite/avatica/AvaticaResultSetConversionsTest.java
index cc9c9a4..500acbb 100644
--- a/core/src/test/java/org/apache/calcite/avatica/AvaticaResultSetConversionsTest.java
+++ b/core/src/test/java/org/apache/calcite/avatica/AvaticaResultSetConversionsTest.java
@@ -151,9 +151,9 @@ public class AvaticaResultSetConversionsTest {
List<Object> row = Collections.<Object>singletonList(
new Object[] {
- true, (byte) 1, (short) 2, 3, 4L, 5.0f, 6.0d, "testvalue",
- new Date(1476130718123L), new Time(1476130718123L),
- new Timestamp(1476130718123L)
+ true, (byte) 1, (short) 2, 3, 4L, 5.0f, 6.0d, "testvalue",
+ new Date(1476130718123L), new Time(1476130718123L),
+ new Timestamp(1476130718123L)
});
CursorFactory factory = CursorFactory.deduce(columns, null);
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java b/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java
index d97bfa2..64a9484 100644
--- a/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java
+++ b/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java
@@ -74,11 +74,11 @@ public class QueryStateTest {
final boolean nullable = true;
QueryState state = new QueryState(MetaDataOperation.GET_BEST_ROW_IDENTIFIER, new Object[] {
- catalog,
- schema,
- table,
- scope,
- nullable
+ catalog,
+ schema,
+ table,
+ scope,
+ nullable
});
state.invoke(conn, statement);
@@ -103,10 +103,10 @@ public class QueryStateTest {
final String columnNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_COLUMN_PRIVILEGES, new Object[] {
- catalog,
- schema,
- table,
- columnNamePattern
+ catalog,
+ schema,
+ table,
+ columnNamePattern
});
state.invoke(conn, statement);
@@ -122,10 +122,10 @@ public class QueryStateTest {
final String columnNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_COLUMNS, new Object[] {
- catalog,
- schemaPattern,
- tableNamePattern,
- columnNamePattern
+ catalog,
+ schemaPattern,
+ tableNamePattern,
+ columnNamePattern
});
state.invoke(conn, statement);
@@ -144,12 +144,12 @@ public class QueryStateTest {
final String foreignTable = "%";
QueryState state = new QueryState(MetaDataOperation.GET_CROSS_REFERENCE, new Object[] {
- parentCatalog,
- parentSchema,
- parentTable,
- foreignCatalog,
- foreignSchema,
- foreignTable
+ parentCatalog,
+ parentSchema,
+ parentTable,
+ foreignCatalog,
+ foreignSchema,
+ foreignTable
});
state.invoke(conn, statement);
@@ -165,9 +165,9 @@ public class QueryStateTest {
final String table = "mytable";
QueryState state = new QueryState(MetaDataOperation.GET_EXPORTED_KEYS, new Object[] {
- catalog,
- schema,
- table
+ catalog,
+ schema,
+ table
});
state.invoke(conn, statement);
@@ -183,10 +183,10 @@ public class QueryStateTest {
final String columnNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_FUNCTION_COLUMNS, new Object[] {
- catalog,
- schemaPattern,
- functionNamePattern,
- columnNamePattern
+ catalog,
+ schemaPattern,
+ functionNamePattern,
+ columnNamePattern
});
state.invoke(conn, statement);
@@ -202,9 +202,9 @@ public class QueryStateTest {
final String functionNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_FUNCTIONS, new Object[] {
- catalog,
- schemaPattern,
- functionNamePattern
+ catalog,
+ schemaPattern,
+ functionNamePattern
});
state.invoke(conn, statement);
@@ -219,9 +219,9 @@ public class QueryStateTest {
final String table = "my_table";
QueryState state = new QueryState(MetaDataOperation.GET_IMPORTED_KEYS, new Object[] {
- catalog,
- schema,
- table
+ catalog,
+ schema,
+ table
});
state.invoke(conn, statement);
@@ -238,11 +238,11 @@ public class QueryStateTest {
final boolean approximate = true;
QueryState state = new QueryState(MetaDataOperation.GET_INDEX_INFO, new Object[] {
- catalog,
- schema,
- table,
- unique,
- approximate
+ catalog,
+ schema,
+ table,
+ unique,
+ approximate
});
state.invoke(conn, statement);
@@ -257,9 +257,9 @@ public class QueryStateTest {
final String table = "my_table";
QueryState state = new QueryState(MetaDataOperation.GET_PRIMARY_KEYS, new Object[] {
- catalog,
- schema,
- table
+ catalog,
+ schema,
+ table
});
state.invoke(conn, statement);
@@ -275,10 +275,10 @@ public class QueryStateTest {
final String columnNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_PROCEDURE_COLUMNS, new Object[] {
- catalog,
- schemaPattern,
- procedureNamePattern,
- columnNamePattern
+ catalog,
+ schemaPattern,
+ procedureNamePattern,
+ columnNamePattern
});
state.invoke(conn, statement);
@@ -294,9 +294,9 @@ public class QueryStateTest {
final String procedureNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_PROCEDURES, new Object[] {
- catalog,
- schemaPattern,
- procedureNamePattern,
+ catalog,
+ schemaPattern,
+ procedureNamePattern,
});
state.invoke(conn, statement);
@@ -312,10 +312,10 @@ public class QueryStateTest {
final String columnNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_PSEUDO_COLUMNS, new Object[] {
- catalog,
- schemaPattern,
- tableNamePattern,
- columnNamePattern
+ catalog,
+ schemaPattern,
+ tableNamePattern,
+ columnNamePattern
});
state.invoke(conn, statement);
@@ -339,8 +339,8 @@ public class QueryStateTest {
final String schemaPattern = null;
QueryState state = new QueryState(MetaDataOperation.GET_SCHEMAS_WITH_ARGS, new Object[] {
- catalog,
- schemaPattern
+ catalog,
+ schemaPattern
});
state.invoke(conn, statement);
@@ -355,9 +355,9 @@ public class QueryStateTest {
final String tableNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_SUPER_TABLES, new Object[] {
- catalog,
- schemaPattern,
- tableNamePattern
+ catalog,
+ schemaPattern,
+ tableNamePattern
});
state.invoke(conn, statement);
@@ -372,9 +372,9 @@ public class QueryStateTest {
final String tableNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_SUPER_TYPES, new Object[] {
- catalog,
- schemaPattern,
- tableNamePattern
+ catalog,
+ schemaPattern,
+ tableNamePattern
});
state.invoke(conn, statement);
@@ -389,9 +389,9 @@ public class QueryStateTest {
final String tableNamePattern = "%";
QueryState state = new QueryState(MetaDataOperation.GET_TABLE_PRIVILEGES, new Object[] {
- catalog,
- schemaPattern,
- tableNamePattern
+ catalog,
+ schemaPattern,
+ tableNamePattern
});
state.invoke(conn, statement);
@@ -407,10 +407,10 @@ public class QueryStateTest {
final String[] types = new String[] {"VIEW", "TABLE"};
QueryState state = new QueryState(MetaDataOperation.GET_TABLES, new Object[] {
- catalog,
- schemaPattern,
- tableNamePattern,
- types
+ catalog,
+ schemaPattern,
+ tableNamePattern,
+ types
});
state.invoke(conn, statement);
@@ -444,10 +444,10 @@ public class QueryStateTest {
final int[] types = new int[] {1, 2};
QueryState state = new QueryState(MetaDataOperation.GET_UDTS, new Object[] {
- catalog,
- schemaPattern,
- typeNamePattern,
- types
+ catalog,
+ schemaPattern,
+ typeNamePattern,
+ types
});
state.invoke(conn, statement);
@@ -462,9 +462,9 @@ public class QueryStateTest {
final String table = "my_table";
QueryState state = new QueryState(MetaDataOperation.GET_VERSION_COLUMNS, new Object[] {
- catalog,
- schemaPattern,
- table
+ catalog,
+ schemaPattern,
+ table
});
state.invoke(conn, statement);
@@ -481,11 +481,11 @@ public class QueryStateTest {
final boolean nullable = true;
QueryState state = new QueryState(MetaDataOperation.GET_BEST_ROW_IDENTIFIER, new Object[] {
- catalog,
- schema,
- table,
- scope,
- nullable
+ catalog,
+ schema,
+ table,
+ scope,
+ nullable
});
assertEquals(state, QueryState.fromProto(state.toProto()));
@@ -495,10 +495,10 @@ public class QueryStateTest {
final int[] types = new int[] {1, 2};
state = new QueryState(MetaDataOperation.GET_UDTS, new Object[] {
- catalog,
- schemaPattern,
- typeNamePattern,
- types
+ catalog,
+ schemaPattern,
+ typeNamePattern,
+ types
});
assertEquals(state, QueryState.fromProto(state.toProto()));
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java b/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
index 8069c84..e490422 100644
--- a/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
+++ b/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
@@ -111,7 +111,7 @@ public class ProtobufTranslationImplTest<T> {
private static class RequestFunc implements IdentityFunction<Request> {
private final ProtobufTranslation translation;
- public RequestFunc(ProtobufTranslation translation) {
+ private RequestFunc(ProtobufTranslation translation) {
this.translation = translation;
}
@@ -127,7 +127,7 @@ public class ProtobufTranslationImplTest<T> {
private static class ResponseFunc implements IdentityFunction<Response> {
private final ProtobufTranslation translation;
- public ResponseFunc(ProtobufTranslation translation) {
+ private ResponseFunc(ProtobufTranslation translation) {
this.translation = translation;
}
@@ -244,10 +244,10 @@ public class ProtobufTranslationImplTest<T> {
private static QueryState getMetadataQueryState1() {
return new QueryState(MetaDataOperation.GET_COLUMNS, new Object[] {
- "",
- null,
- "%",
- "%"
+ "",
+ null,
+ "%",
+ "%"
});
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/test/java/org/apache/calcite/avatica/test/AvaticaUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/avatica/test/AvaticaUtilsTest.java b/core/src/test/java/org/apache/calcite/avatica/test/AvaticaUtilsTest.java
index b1a422c..a1561aa 100644
--- a/core/src/test/java/org/apache/calcite/avatica/test/AvaticaUtilsTest.java
+++ b/core/src/test/java/org/apache/calcite/avatica/test/AvaticaUtilsTest.java
@@ -211,10 +211,10 @@ public class AvaticaUtilsTest {
@Test public void testLongToIntegerTranslation() {
long[] longValues = new long[] {Integer.MIN_VALUE, -5, 0, 1, Integer.MAX_VALUE,
- ((long) Integer.MAX_VALUE) + 1L, Long.MAX_VALUE};
+ ((long) Integer.MAX_VALUE) + 1L, Long.MAX_VALUE};
int[] convertedValues = AvaticaUtils.toSaturatedInts(longValues);
int[] intValues = new int[] {Integer.MIN_VALUE, -5, 0, 1, Integer.MAX_VALUE,
- Integer.MAX_VALUE, Integer.MAX_VALUE};
+ Integer.MAX_VALUE, Integer.MAX_VALUE};
assertArrayEquals(convertedValues, intValues);
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/core/src/test/java/org/apache/calcite/avatica/test/ConnectStringParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/avatica/test/ConnectStringParserTest.java b/core/src/test/java/org/apache/calcite/avatica/test/ConnectStringParserTest.java
index cdc8d8a..b7a30c8 100644
--- a/core/src/test/java/org/apache/calcite/avatica/test/ConnectStringParserTest.java
+++ b/core/src/test/java/org/apache/calcite/avatica/test/ConnectStringParserTest.java
@@ -143,67 +143,67 @@ public class ConnectStringParserTest {
@Test public void testOleDbExamples() throws Throwable {
// test the parser with examples from OLE DB documentation
Quad[] quads = {
- // {reason for test, key, val, string to parse},
- new Quad(
- "printable chars",
- "Jet OLE DB:System Database", "c:\\system.mda",
- "Jet OLE DB:System Database=c:\\system.mda"),
- new Quad(
- "key embedded semi",
- "Authentication;Info", "Column 5",
- "Authentication;Info=Column 5"),
- new Quad(
- "key embedded equal",
- "Verification=Security", "True",
- "Verification==Security=True"),
- new Quad(
- "key many equals",
- "Many==One", "Valid",
- "Many====One=Valid"),
- new Quad(
- "key too many equal",
- "TooMany=", "False",
- "TooMany===False"),
- new Quad(
- "value embedded quote and semi",
- "ExtProps", "Data Source='localhost';Key Two='value 2'",
- "ExtProps=\"Data Source='localhost';Key Two='value 2'\""),
- new Quad(
- "value embedded double quote and semi",
- "ExtProps", "Integrated Security=\"SSPI\";Key Two=\"value 2\"",
- "ExtProps='Integrated Security=\"SSPI\";Key Two=\"value 2\"'"),
- new Quad(
- "value double quoted",
- "DataSchema", "\"MyCustTable\"",
- "DataSchema='\"MyCustTable\"'"),
- new Quad(
- "value single quoted",
- "DataSchema", "'MyCustTable'",
- "DataSchema=\"'MyCustTable'\""),
- new Quad(
- "value double quoted double trouble",
- "Caption", "\"Company's \"new\" customer\"",
- "Caption=\"\"\"Company's \"\"new\"\" customer\"\"\""),
- new Quad(
- "value single quoted double trouble",
- "Caption", "\"Company's \"new\" customer\"",
- "Caption='\"Company''s \"new\" customer\"'"),
- new Quad(
- "embedded blanks and trim",
- "My Keyword", "My Value",
- " My Keyword = My Value ;MyNextValue=Value"),
- new Quad(
- "value single quotes preserve blanks",
- "My Keyword", " My Value ",
- " My Keyword =' My Value ';MyNextValue=Value"),
- new Quad(
- "value double quotes preserve blanks",
- "My Keyword", " My Value ",
- " My Keyword =\" My Value \";MyNextValue=Value"),
- new Quad(
- "last redundant key wins",
- "SomeKey", "NextValue",
- "SomeKey=FirstValue;SomeKey=NextValue"),
+ // {reason for test, key, val, string to parse},
+ new Quad(
+ "printable chars",
+ "Jet OLE DB:System Database", "c:\\system.mda",
+ "Jet OLE DB:System Database=c:\\system.mda"),
+ new Quad(
+ "key embedded semi",
+ "Authentication;Info", "Column 5",
+ "Authentication;Info=Column 5"),
+ new Quad(
+ "key embedded equal",
+ "Verification=Security", "True",
+ "Verification==Security=True"),
+ new Quad(
+ "key many equals",
+ "Many==One", "Valid",
+ "Many====One=Valid"),
+ new Quad(
+ "key too many equal",
+ "TooMany=", "False",
+ "TooMany===False"),
+ new Quad(
+ "value embedded quote and semi",
+ "ExtProps", "Data Source='localhost';Key Two='value 2'",
+ "ExtProps=\"Data Source='localhost';Key Two='value 2'\""),
+ new Quad(
+ "value embedded double quote and semi",
+ "ExtProps", "Integrated Security=\"SSPI\";Key Two=\"value 2\"",
+ "ExtProps='Integrated Security=\"SSPI\";Key Two=\"value 2\"'"),
+ new Quad(
+ "value double quoted",
+ "DataSchema", "\"MyCustTable\"",
+ "DataSchema='\"MyCustTable\"'"),
+ new Quad(
+ "value single quoted",
+ "DataSchema", "'MyCustTable'",
+ "DataSchema=\"'MyCustTable'\""),
+ new Quad(
+ "value double quoted double trouble",
+ "Caption", "\"Company's \"new\" customer\"",
+ "Caption=\"\"\"Company's \"\"new\"\" customer\"\"\""),
+ new Quad(
+ "value single quoted double trouble",
+ "Caption", "\"Company's \"new\" customer\"",
+ "Caption='\"Company''s \"new\" customer\"'"),
+ new Quad(
+ "embedded blanks and trim",
+ "My Keyword", "My Value",
+ " My Keyword = My Value ;MyNextValue=Value"),
+ new Quad(
+ "value single quotes preserve blanks",
+ "My Keyword", " My Value ",
+ " My Keyword =' My Value ';MyNextValue=Value"),
+ new Quad(
+ "value double quotes preserve blanks",
+ "My Keyword", " My Value ",
+ " My Keyword =\" My Value \";MyNextValue=Value"),
+ new Quad(
+ "last redundant key wins",
+ "SomeKey", "NextValue",
+ "SomeKey=FirstValue;SomeKey=NextValue"),
};
for (Quad quad : quads) {
Properties props = ConnectStringParser.parse(quad.str);
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5fdbb6c..61dff66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@ limitations under the License.
<junit.version>4.12</junit.version>
<kerby.version>1.0.0-RC2</kerby.version>
<maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
- <maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version>
+ <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<!-- Apache 19 has 2.10.4, but need 3.0.1 for [MJAVADOC-517]. -->
@@ -435,7 +435,14 @@ limitations under the License.
<groupId>net.hydromatic</groupId>
<artifactId>toolbox</artifactId>
<version>${hydromatic-toolbox.version}</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- checkstyle requires Guava 19 -->
</dependencies>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java b/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java
index 38f92ff..b8f4ea4 100644
--- a/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java
+++ b/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java
@@ -230,7 +230,7 @@ public class JdbcMeta implements ProtobufMeta {
* Converts from JDBC metadata to Avatica columns.
*/
protected static List<ColumnMetaData>
- columns(ResultSetMetaData metaData) throws SQLException {
+ columns(ResultSetMetaData metaData) throws SQLException {
if (metaData == null) {
return Collections.emptyList();
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/main/java/org/apache/calcite/avatica/server/HttpServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/calcite/avatica/server/HttpServer.java b/server/src/main/java/org/apache/calcite/avatica/server/HttpServer.java
index f7b6e75..27fbda5 100644
--- a/server/src/main/java/org/apache/calcite/avatica/server/HttpServer.java
+++ b/server/src/main/java/org/apache/calcite/avatica/server/HttpServer.java
@@ -461,6 +461,7 @@ public class HttpServer {
/**
* Builder class for creating instances of {@link HttpServer}.
+ * @param <T> element type
*/
public static class Builder<T> {
private int port;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/AvaticaSpnegoTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/AvaticaSpnegoTest.java b/server/src/test/java/org/apache/calcite/avatica/AvaticaSpnegoTest.java
index eb02f88..77a0fd5 100644
--- a/server/src/test/java/org/apache/calcite/avatica/AvaticaSpnegoTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/AvaticaSpnegoTest.java
@@ -161,7 +161,7 @@ public class AvaticaSpnegoTest {
final LocalService localService = new LocalService(jdbcMeta);
for (Driver.Serialization serialization : new Driver.Serialization[] {
- Driver.Serialization.JSON, Driver.Serialization.PROTOBUF}) {
+ Driver.Serialization.JSON, Driver.Serialization.PROTOBUF}) {
// Build and start the server
HttpServer httpServer = new HttpServer.Builder()
.withPort(0)
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java b/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
index 6af67ff..66fcf8c 100644
--- a/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
@@ -145,45 +145,45 @@ public class RemoteDriverTest {
// Each test needs to get a fresh Connection and also access some internals on that Connection.
connections.add(
- new Object[] {
- "JSON",
- new Callable<Connection>() {
- public Connection call() {
- try {
- return ljs();
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
- },
- new QuasiRemoteJdbcServiceInternals(),
- new Callable<RequestInspection>() {
- public RequestInspection call() throws Exception {
- assert null != QuasiRemoteJdbcServiceFactory.requestInspection;
- return QuasiRemoteJdbcServiceFactory.requestInspection;
- }
- } });
+ new Object[] {
+ "JSON",
+ new Callable<Connection>() {
+ public Connection call() {
+ try {
+ return ljs();
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ },
+ new QuasiRemoteJdbcServiceInternals(),
+ new Callable<RequestInspection>() {
+ public RequestInspection call() throws Exception {
+ assert null != QuasiRemoteJdbcServiceFactory.requestInspection;
+ return QuasiRemoteJdbcServiceFactory.requestInspection;
+ }
+ } });
// TODO write the ConnectionInternals implementation
connections.add(
- new Object[] {
- "PROTOBUF",
- new Callable<Connection>() {
- public Connection call() {
- try {
- return lpbs();
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
- },
- new QuasiRemoteProtobufJdbcServiceInternals(),
- new Callable<RequestInspection>() {
- public RequestInspection call() throws Exception {
- assert null != QuasiRemotePBJdbcServiceFactory.requestInspection;
- return QuasiRemotePBJdbcServiceFactory.requestInspection;
- }
- } });
+ new Object[] {
+ "PROTOBUF",
+ new Callable<Connection>() {
+ public Connection call() {
+ try {
+ return lpbs();
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ },
+ new QuasiRemoteProtobufJdbcServiceInternals(),
+ new Callable<RequestInspection>() {
+ public RequestInspection call() throws Exception {
+ assert null != QuasiRemotePBJdbcServiceFactory.requestInspection;
+ return QuasiRemotePBJdbcServiceFactory.requestInspection;
+ }
+ } });
return connections;
}
@@ -475,7 +475,7 @@ public class RemoteDriverTest {
}
private void checkExecuteFetch(Connection conn, String sql, boolean isPrepare,
- int fetchCountMatch) throws SQLException {
+ int fetchCountMatch) throws SQLException {
final Statement exeStatement;
final ResultSet results;
getRequestInspection().getRequestLogger().enableAndClear();
@@ -667,9 +667,9 @@ public class RemoteDriverTest {
assertNull(statement.getResultSet());
final String[] messages = {
- "Cannot call executeQuery(String) on prepared or callable statement",
- "Cannot call execute(String) on prepared or callable statement",
- "Cannot call executeUpdate(String) on prepared or callable statement",
+ "Cannot call executeQuery(String) on prepared or callable statement",
+ "Cannot call execute(String) on prepared or callable statement",
+ "Cannot call executeUpdate(String) on prepared or callable statement",
};
for (String sql : new String[]{drop, create, insert, update}) {
for (int i = 0; i <= 2; i++) {
@@ -2022,7 +2022,7 @@ public class RemoteDriverTest {
}
};
- public LoggingLocalJsonService(LocalService localService) {
+ private LoggingLocalJsonService(LocalService localService) {
super(localService);
}
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/SslDriverTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/SslDriverTest.java b/server/src/test/java/org/apache/calcite/avatica/SslDriverTest.java
index e3b89f5..58d9d39 100644
--- a/server/src/test/java/org/apache/calcite/avatica/SslDriverTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/SslDriverTest.java
@@ -100,7 +100,7 @@ public class SslDriverTest {
final LocalService localService = new LocalService(jdbcMeta);
for (Driver.Serialization serialization : new Driver.Serialization[] {
- Driver.Serialization.JSON, Driver.Serialization.PROTOBUF}) {
+ Driver.Serialization.JSON, Driver.Serialization.PROTOBUF}) {
// Build and start the server, using TLS
HttpServer httpServer = new HttpServer.Builder()
.withPort(0)
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/remote/AlternatingRemoteMetaTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/remote/AlternatingRemoteMetaTest.java b/server/src/test/java/org/apache/calcite/avatica/remote/AlternatingRemoteMetaTest.java
index d0c10c6..849e6c5 100644
--- a/server/src/test/java/org/apache/calcite/avatica/remote/AlternatingRemoteMetaTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/remote/AlternatingRemoteMetaTest.java
@@ -224,7 +224,7 @@ public class AlternatingRemoteMetaTest {
}
private static Meta.ExecuteResult prepareAndExecuteInternal(AvaticaConnection conn,
- final AvaticaStatement statement, String sql, int maxRowCount) throws Exception {
+ final AvaticaStatement statement, String sql, int maxRowCount) throws Exception {
Method m =
AvaticaConnection.class.getDeclaredMethod("prepareAndExecuteInternal",
AvaticaStatement.class, String.class, long.class);
@@ -245,7 +245,7 @@ public class AlternatingRemoteMetaTest {
try (AvaticaConnection conn = (AvaticaConnection) DriverManager.getConnection(url)) {
final AvaticaStatement statement = conn.createStatement();
prepareAndExecuteInternal(conn, statement,
- "select * from (values ('a', 1), ('b', 2))", 0);
+ "select * from (values ('a', 1), ('b', 2))", 0);
ResultSet rs = statement.getResultSet();
int count = 0;
while (rs.next()) {
@@ -253,7 +253,7 @@ public class AlternatingRemoteMetaTest {
}
assertEquals("Check maxRowCount=0 and ResultSets is 0 row", count, 0);
assertEquals("Check result set meta is still there",
- rs.getMetaData().getColumnCount(), 2);
+ rs.getMetaData().getColumnCount(), 2);
rs.close();
statement.close();
conn.close();
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/remote/ArrayTypeTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/remote/ArrayTypeTest.java b/server/src/test/java/org/apache/calcite/avatica/remote/ArrayTypeTest.java
index 14fa093..90e72d8 100644
--- a/server/src/test/java/org/apache/calcite/avatica/remote/ArrayTypeTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/remote/ArrayTypeTest.java
@@ -558,6 +558,7 @@ public class ArrayTypeTest {
/**
* A simple interface to validate to objects in support of type test cases
+ * @param <T> the type of element to be validated
*/
private interface Validator<T> {
void validate(T expected, T actual) throws Exception;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java b/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
index 4cfcc1b..107a079 100644
--- a/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
@@ -116,7 +116,7 @@ public class RemoteMetaTest {
}
private static Meta.ExecuteResult prepareAndExecuteInternal(AvaticaConnection conn,
- final AvaticaStatement statement, String sql, int maxRowCount) throws Exception {
+ final AvaticaStatement statement, String sql, int maxRowCount) throws Exception {
Method m =
AvaticaConnection.class.getDeclaredMethod("prepareAndExecuteInternal",
AvaticaStatement.class, String.class, long.class);
@@ -137,7 +137,7 @@ public class RemoteMetaTest {
try (AvaticaConnection conn = (AvaticaConnection) DriverManager.getConnection(url)) {
final AvaticaStatement statement = conn.createStatement();
prepareAndExecuteInternal(conn, statement,
- "select * from (values ('a', 1), ('b', 2))", 0);
+ "select * from (values ('a', 1), ('b', 2))", 0);
ResultSet rs = statement.getResultSet();
int count = 0;
while (rs.next()) {
@@ -145,7 +145,7 @@ public class RemoteMetaTest {
}
assertEquals("Check maxRowCount=0 and ResultSets is 0 row", count, 0);
assertEquals("Check result set meta is still there",
- rs.getMetaData().getColumnCount(), 2);
+ rs.getMetaData().getColumnCount(), 2);
rs.close();
statement.close();
conn.close();
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/server/CustomAuthHttpServerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/server/CustomAuthHttpServerTest.java b/server/src/test/java/org/apache/calcite/avatica/server/CustomAuthHttpServerTest.java
index dbb2f4c..2064669 100644
--- a/server/src/test/java/org/apache/calcite/avatica/server/CustomAuthHttpServerTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/server/CustomAuthHttpServerTest.java
@@ -145,7 +145,7 @@ public class CustomAuthHttpServerTest extends HttpAuthBase {
protected void createServer(AvaticaServerConfiguration config, boolean isBasicAuth)
throws SQLException {
final JdbcMeta jdbcMeta = new JdbcMeta(CONNECTION_SPEC.url,
- CONNECTION_SPEC.username, CONNECTION_SPEC.password);
+ CONNECTION_SPEC.username, CONNECTION_SPEC.password);
LocalService service = new LocalService(jdbcMeta);
ConnectorCustomizer connectorCustomizer = new ConnectorCustomizer();
@@ -194,8 +194,8 @@ public class CustomAuthHttpServerTest extends HttpAuthBase {
LocalService service;
boolean isBasicAuth;
- public BasicAuthHandlerCustomizer(AvaticaServerConfiguration configuration
- , LocalService service, boolean isBasicAuth) {
+ BasicAuthHandlerCustomizer(AvaticaServerConfiguration configuration, LocalService service,
+ boolean isBasicAuth) {
this.configuration = configuration;
this.service = service;
this.isBasicAuth = isBasicAuth;
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/acb675de/server/src/test/java/org/apache/calcite/avatica/test/AvaticaSuite.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/test/AvaticaSuite.java b/server/src/test/java/org/apache/calcite/avatica/test/AvaticaSuite.java
index 4a0c26c..53b6c81 100644
--- a/server/src/test/java/org/apache/calcite/avatica/test/AvaticaSuite.java
+++ b/server/src/test/java/org/apache/calcite/avatica/test/AvaticaSuite.java
@@ -30,7 +30,7 @@ import org.junit.runners.Suite;
AvaticaUtilsTest.class,
ConnectStringParserTest.class,
RemoteDriverTest.class
-})
+ })
public class AvaticaSuite {
}