diff --git a/.gitignore b/.gitignore index c6616c76..067dea92 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,8 @@ buildNumber.properties .mvn/wrapper/maven-wrapper.jar .project .classpath -src/main/resources/config/config.properties +jdbc-driver/src/main/resources/config/config.properties +.flattened-pom.xml *.iml pom.xml.bak diff --git a/jdbc-grpc/pom.xml b/jdbc-grpc/pom.xml new file mode 100644 index 00000000..2e7701c8 --- /dev/null +++ b/jdbc-grpc/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + com.salesforce.datacloud + jdbc-parent + ${revision} + + + jdbc-grpc + + + ${java.version} + ${java.version} + UTF-8 + + + + + com.salesforce.datacloud + jdbc-proto + ${project.version} + + + io.grpc + grpc-netty + + + io.grpc + grpc-protobuf + + + io.grpc + grpc-stub + + + javax.annotation + javax.annotation-api + + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + grpc-java + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} + false + ${project.parent.basedir}/jdbc-proto/src/main/proto + + + + + compile + compile-custom + + + + + + + diff --git a/jdbc-proto/pom.xml b/jdbc-proto/pom.xml new file mode 100644 index 00000000..1a4d31da --- /dev/null +++ b/jdbc-proto/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + com.salesforce.datacloud + jdbc-parent + ${revision} + + + jdbc-proto + + diff --git a/src/main/proto/error_details.proto b/jdbc-proto/src/main/proto/error_details.proto similarity index 100% rename from src/main/proto/error_details.proto rename to jdbc-proto/src/main/proto/error_details.proto diff --git a/src/main/proto/hyper_service.proto b/jdbc-proto/src/main/proto/hyper_service.proto similarity index 100% rename from src/main/proto/hyper_service.proto rename to jdbc-proto/src/main/proto/hyper_service.proto diff --git a/jdbc-slim/pom.xml b/jdbc-slim/pom.xml new file mode 100644 index 00000000..6730bca0 --- /dev/null +++ b/jdbc-slim/pom.xml @@ -0,0 +1,218 @@ + + + 4.0.0 + + com.salesforce.datacloud + jdbc-parent + ${revision} + + jdbc-slim + + + ${java.version} + ${java.version} + UTF-8 + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.google.guava + guava + ${guava.version} + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + javax.annotation + javax.annotation-api + 1.3.2 + + + net.jodah + failsafe + 2.4.4 + + + org.apache.arrow + arrow-vector + ${arrow.version} + + + org.apache.calcite.avatica + avatica + ${avatica.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + com.salesforce.datacloud + jdbc-grpc + ${project.version} + provided + + + org.projectlombok + lombok + ${lombok.version} + provided + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + runtime + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + runtime + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + runtime + + + com.squareup.okhttp3 + mockwebserver + ${okhttp.version} + test + + + org.assertj + assertj-core + ${assertj.version} + test + + + org.grpcmock + grpcmock-junit5 + ${grpcmock-junit5.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit-bom.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-bom.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit-bom.version} + test + + + org.junit.platform + junit-platform-launcher + 1.11.4 + test + + + org.mockito + mockito-inline + ${mockito-bom.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockito-bom.version} + test + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + + + + + true + src/main/resources + + + true + src/test/resources + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + + resources + + process-resources + + ${project.build.directory}/classes + + + src/main/resources + + version.properties + + true + + + + + + + + org.projectlombok + lombok-maven-plugin + 1.18.20.0 + + + delombok + + delombok + + + false + jdbc-driver/src/main/java + ${project.build.directory}/delombok + + + + + + + + diff --git a/src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudToken.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudToken.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudToken.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudToken.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/OAuthToken.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/OAuthToken.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/OAuthToken.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/OAuthToken.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpers.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpers.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpers.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpers.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/TokenCache.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/TokenCache.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/TokenCache.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/TokenCache.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/TokenProcessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/TokenProcessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/TokenProcessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/TokenProcessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/errors/AuthorizationException.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/errors/AuthorizationException.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/errors/AuthorizationException.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/errors/AuthorizationException.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/model/AuthenticationResponseWithError.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/model/AuthenticationResponseWithError.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/model/AuthenticationResponseWithError.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/model/AuthenticationResponseWithError.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/model/DataCloudTokenResponse.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/model/DataCloudTokenResponse.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/model/DataCloudTokenResponse.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/model/DataCloudTokenResponse.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/auth/model/OAuthTokenResponse.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/model/OAuthTokenResponse.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/auth/model/OAuthTokenResponse.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/model/OAuthTokenResponse.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/config/DriverVersion.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/DriverVersion.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/config/DriverVersion.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/DriverVersion.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/config/KeywordResources.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/KeywordResources.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/config/KeywordResources.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/KeywordResources.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/config/QueryResources.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/QueryResources.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/config/QueryResources.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/QueryResources.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/config/ResourceReader.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/ResourceReader.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/config/ResourceReader.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/config/ResourceReader.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettings.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettings.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettings.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettings.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnection.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnection.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnection.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnection.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionString.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionString.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionString.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionString.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadata.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadata.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadata.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadata.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatement.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatement.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatement.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatement.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudResultSet.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudResultSet.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudResultSet.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudResultSet.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudStatement.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudStatement.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudStatement.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudStatement.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannel.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannel.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannel.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannel.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientExecutor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientExecutor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientExecutor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientExecutor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataCursor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataCursor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/MetadataCursor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataCursor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataResultSet.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataResultSet.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/MetadataResultSet.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/MetadataResultSet.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/ParameterManager.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ParameterManager.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/ParameterManager.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/ParameterManager.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadata.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadata.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadata.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadata.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtil.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtil.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtil.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtil.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadata.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadata.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadata.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadata.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/StreamingResultSet.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/StreamingResultSet.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/StreamingResultSet.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/StreamingResultSet.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorFactory.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorFactory.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorFactory.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorFactory.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseListVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseListVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseListVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseListVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArray.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArray.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArray.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArray.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorGetter.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorGetter.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorGetter.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorGetter.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/LargeListVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/LargeListVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/LargeListVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/LargeListVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/NumericGetter.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/NumericGetter.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/NumericGetter.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/NumericGetter.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorGetter.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorGetter.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorGetter.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorGetter.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorGetter.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorGetter.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorGetter.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorGetter.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListener.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListener.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListener.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListener.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPoller.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPoller.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPoller.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPoller.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListener.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListener.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListener.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListener.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPoller.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPoller.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPoller.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPoller.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListener.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListener.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListener.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListener.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusPoller.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusPoller.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusPoller.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusPoller.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListener.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListener.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListener.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListener.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/model/DataspaceResponse.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/model/DataspaceResponse.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/model/DataspaceResponse.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/model/DataspaceResponse.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/core/model/ParameterBinding.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/model/ParameterBinding.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/core/model/ParameterBinding.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/model/ParameterBinding.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/exception/DataCloudJDBCException.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/exception/DataCloudJDBCException.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/exception/DataCloudJDBCException.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/exception/DataCloudJDBCException.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandler.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandler.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandler.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandler.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/http/ClientBuilder.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/http/ClientBuilder.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/http/ClientBuilder.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/http/ClientBuilder.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/http/FormCommand.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/http/FormCommand.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/http/FormCommand.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/http/FormCommand.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperWorkloadHeaderInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperWorkloadHeaderInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperWorkloadHeaderInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/HyperWorkloadHeaderInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/MetadataUtilities.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/MetadataUtilities.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/MetadataUtilities.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/MetadataUtilities.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/SingleHeaderMutatingClientInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/SingleHeaderMutatingClientInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/SingleHeaderMutatingClientInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/SingleHeaderMutatingClientInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptor.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptor.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptor.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptor.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/internal/EncodingUtils.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/internal/EncodingUtils.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/internal/EncodingUtils.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/internal/EncodingUtils.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffers.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffers.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffers.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffers.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/internal/Tracer.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/internal/Tracer.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/internal/Tracer.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/internal/Tracer.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/ArrowUtils.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ArrowUtils.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/ArrowUtils.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ArrowUtils.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/Constants.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Constants.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/Constants.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Constants.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIterator.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIterator.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIterator.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIterator.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/DateTimeUtils.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/DateTimeUtils.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/DateTimeUtils.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/DateTimeUtils.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/Messages.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Messages.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/Messages.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Messages.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/MetadataCacheUtil.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/MetadataCacheUtil.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/MetadataCacheUtil.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/MetadataCacheUtil.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensions.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensions.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensions.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensions.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/Require.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Require.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/Require.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Require.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/Result.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Result.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/Result.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Result.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/SqlErrorCodes.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/SqlErrorCodes.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/SqlErrorCodes.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/SqlErrorCodes.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/StreamUtilities.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/StreamUtilities.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/StreamUtilities.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/StreamUtilities.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/StringCompatibility.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/StringCompatibility.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/StringCompatibility.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/StringCompatibility.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingFunction.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingFunction.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingFunction.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingFunction.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingSupplier.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingSupplier.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingSupplier.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/ThrowingSupplier.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/VectorPopulator.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/VectorPopulator.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/VectorPopulator.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/VectorPopulator.java diff --git a/src/main/java/com/salesforce/datacloud/jdbc/util/internal/SFDefaultSocketFactoryWrapper.java b/jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/internal/SFDefaultSocketFactoryWrapper.java similarity index 100% rename from src/main/java/com/salesforce/datacloud/jdbc/util/internal/SFDefaultSocketFactoryWrapper.java rename to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/internal/SFDefaultSocketFactoryWrapper.java diff --git a/src/main/resources/META-INF/services/java.sql.Driver b/jdbc-slim/src/main/resources/META-INF/services/java.sql.Driver similarity index 100% rename from src/main/resources/META-INF/services/java.sql.Driver rename to jdbc-slim/src/main/resources/META-INF/services/java.sql.Driver diff --git a/src/main/resources/keywords/hyper_sql_lexer_keywords.txt b/jdbc-slim/src/main/resources/keywords/hyper_sql_lexer_keywords.txt similarity index 100% rename from src/main/resources/keywords/hyper_sql_lexer_keywords.txt rename to jdbc-slim/src/main/resources/keywords/hyper_sql_lexer_keywords.txt diff --git a/src/main/resources/simplelogger.properties b/jdbc-slim/src/main/resources/simplelogger.properties similarity index 100% rename from src/main/resources/simplelogger.properties rename to jdbc-slim/src/main/resources/simplelogger.properties diff --git a/src/main/resources/sql/get_columns_query.sql b/jdbc-slim/src/main/resources/sql/get_columns_query.sql similarity index 100% rename from src/main/resources/sql/get_columns_query.sql rename to jdbc-slim/src/main/resources/sql/get_columns_query.sql diff --git a/src/main/resources/sql/get_schemas_query.sql b/jdbc-slim/src/main/resources/sql/get_schemas_query.sql similarity index 100% rename from src/main/resources/sql/get_schemas_query.sql rename to jdbc-slim/src/main/resources/sql/get_schemas_query.sql diff --git a/src/main/resources/sql/get_tables_query.sql b/jdbc-slim/src/main/resources/sql/get_tables_query.sql similarity index 100% rename from src/main/resources/sql/get_tables_query.sql rename to jdbc-slim/src/main/resources/sql/get_tables_query.sql diff --git a/jdbc-slim/src/main/resources/version.properties b/jdbc-slim/src/main/resources/version.properties new file mode 100644 index 00000000..1b7bfbcb --- /dev/null +++ b/jdbc-slim/src/main/resources/version.properties @@ -0,0 +1 @@ +version=${revision} \ No newline at end of file diff --git a/src/test/java/com/salesforce/datacloud/jdbc/DataCloudDatasourceTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/DataCloudDatasourceTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/DataCloudDatasourceTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/DataCloudDatasourceTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriverTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriverTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriverTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriverTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/OrgIntegrationTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/OrgIntegrationTest.java similarity index 98% rename from src/test/java/com/salesforce/datacloud/jdbc/OrgIntegrationTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/OrgIntegrationTest.java index ce8418a6..53125510 100644 --- a/src/test/java/com/salesforce/datacloud/jdbc/OrgIntegrationTest.java +++ b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/OrgIntegrationTest.java @@ -18,7 +18,6 @@ import static com.salesforce.datacloud.jdbc.core.DataCloudConnectionString.CONNECTION_PROTOCOL; import static com.salesforce.datacloud.jdbc.core.StreamingResultSetTest.query; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import com.google.common.collect.ImmutableSet; @@ -49,7 +48,7 @@ import lombok.Value; import lombok.extern.slf4j.Slf4j; import lombok.val; -import lombok.var; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; @@ -166,7 +165,7 @@ public void exerciseQueryMode( assertThat(rs.isReady()).isTrue(); assertThat(rs).isInstanceOf(StreamingResultSet.class); - var expected = 0; + int expected = 0; while (rs.next()) { expected++; } @@ -315,12 +314,12 @@ void testArrowFieldConversion() { queries.put(Types.INTEGER, "SELECT 82 as \"Integer_column\""); try (val connection = getConnection(); val statement = connection.createStatement()) { - for (var entry : queries.entrySet()) { - val resultSet = statement.executeQuery(entry.getValue().toString()); + for (val entry : queries.entrySet()) { + val resultSet = statement.executeQuery(entry.getValue()); val metadata = resultSet.getMetaData(); log.info("columntypename: {}", metadata.getColumnTypeName(1)); - log.info("columntype: {}", Integer.toString(metadata.getColumnType(1))); - assertEquals( + log.info("columntype: {}", metadata.getColumnType(1)); + Assertions.assertEquals( Integer.toString(metadata.getColumnType(1)), entry.getKey().toString()); } @@ -355,7 +354,7 @@ void testMainQuery() { ResultSet resultSet = statement.executeAdaptiveQuery(query); log.info("Query executed in {}ms", System.currentTimeMillis() - startTime); - var expected = 0; + int expected = 0; while (resultSet.next()) { expected++; } diff --git a/src/test/java/com/salesforce/datacloud/jdbc/ResponseEnum.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/ResponseEnum.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/ResponseEnum.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/ResponseEnum.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettingsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettingsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettingsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettingsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategyTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategyTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategyTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategyTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenProcessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/DataCloudTokenTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/OAuthTokenTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/OAuthTokenTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/OAuthTokenTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/OAuthTokenTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpersTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpersTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpersTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/PrivateKeyHelpersTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/PropertiesUtils.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/PropertiesUtils.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/PropertiesUtils.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/PropertiesUtils.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/auth/TokenCacheImplTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/TokenCacheImplTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/auth/TokenCacheImplTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/auth/TokenCacheImplTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/config/QueryResourcesTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/config/QueryResourcesTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/config/QueryResourcesTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/config/QueryResourcesTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/config/ResourceReaderTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/config/ResourceReaderTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/config/ResourceReaderTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/config/ResourceReaderTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/ArrowStreamReaderCursorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/AsyncStreamingResultSetTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/AsyncStreamingResultSetTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/AsyncStreamingResultSetTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/AsyncStreamingResultSetTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettingsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettingsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettingsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/ConnectionQuerySettingsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionMocker.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionMocker.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionMocker.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionMocker.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionStringTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionStringTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionStringTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionStringTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudConnectionTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadataTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadataTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadataTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadataTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementHyperTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementHyperTest.java similarity index 96% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementHyperTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementHyperTest.java index d98cfe60..c693903a 100644 --- a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementHyperTest.java +++ b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementHyperTest.java @@ -21,6 +21,7 @@ import java.sql.Connection; import java.sql.Date; import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.Time; import java.sql.Timestamp; import java.time.LocalDate; @@ -31,7 +32,6 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import lombok.val; -import lombok.var; import org.junit.jupiter.api.Test; @Slf4j @@ -48,7 +48,7 @@ public void testPreparedStatementDateRange() { val sqlDate = Date.valueOf(date); preparedStatement.setDate(1, sqlDate); - try (var resultSet = preparedStatement.executeQuery()) { + try (ResultSet resultSet = preparedStatement.executeQuery()) { while (resultSet.next()) { assertThat(resultSet.getDate("a")) .isEqualTo(sqlDate) @@ -86,7 +86,7 @@ public void testPreparedStatementDateWithCalendarRange() { val expected = Date.valueOf(convertedDateTime.toLocalDateTime().toLocalDate()); - try (var resultSet = preparedStatement.executeQuery()) { + try (ResultSet resultSet = preparedStatement.executeQuery()) { while (resultSet.next()) { val actual = resultSet.getDate("a"); assertThat(actual) @@ -178,7 +178,7 @@ public void testPreparedStatementTimestampRange() { val sqlTimestamp = Timestamp.valueOf(dateTime); preparedStatement.setTimestamp(1, sqlTimestamp); - try (var resultSet = preparedStatement.executeQuery()) { + try (ResultSet resultSet = preparedStatement.executeQuery()) { while (resultSet.next()) { val actual = resultSet.getTimestamp("a", utcCalendar); assertThat(actual) @@ -218,7 +218,7 @@ public void testPreparedStatementTimestampWithCalendarRange() { val convertedDateTime = zonedDateTime.withZoneSameInstant(utcTimeZone.toZoneId()); val expected = Timestamp.valueOf(convertedDateTime.toLocalDateTime()); - try (var resultSet = preparedStatement.executeQuery()) { + try (ResultSet resultSet = preparedStatement.executeQuery()) { while (resultSet.next()) { val actual = resultSet.getTimestamp("a", utcCalendar); assertThat(actual) diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatementTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudStatementTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudStatementTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudStatementTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudStatementTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/DefaultParameterManagerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DefaultParameterManagerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/DefaultParameterManagerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/DefaultParameterManagerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannelTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannelTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannelTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannelTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/HyperConnectionSettingsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperConnectionSettingsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/HyperConnectionSettingsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperConnectionSettingsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientRetryTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientRetryTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientRetryTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientRetryTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcTestBase.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcTestBase.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcTestBase.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/HyperGrpcTestBase.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/JDBCLimitsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/JDBCLimitsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/JDBCLimitsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/JDBCLimitsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadataTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadataTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadataTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryDBMetadataTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCAccessorFactoryTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCAccessorFactoryTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCAccessorFactoryTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCAccessorFactoryTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCCursorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCDataCursorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCDataCursorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCDataCursorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryJDBCDataCursorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtilTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtilTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtilTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryMetadataUtilTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadataTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadataTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadataTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/QueryResultSetMetadataTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/StreamingResultSetTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/StreamingResultSetTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/StreamingResultSetTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/StreamingResultSetTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorAssert.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorAssert.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorAssert.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorAssert.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/QueryJDBCAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/SoftAssertions.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/SoftAssertions.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/SoftAssertions.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/SoftAssertions.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BaseIntVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BinaryVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/BooleanVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArrayTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArrayTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArrayTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DataCloudArrayTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DateVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DecimalVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/DoubleVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/ListVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeStampVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/TimeVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/accessor/impl/VarCharVectorAccessorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListenerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListenerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListenerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListenerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPollerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPollerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPollerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPollerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListenerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListenerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListenerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListenerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPollerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPollerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPollerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPollerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerAssert.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerAssert.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerAssert.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerAssert.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListenerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListenerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListenerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListenerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/core/listener/SyncQueryStatusListenerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandlerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandlerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandlerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/exception/QueryExceptionHandlerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/http/ClientBuilderTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/http/ClientBuilderTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/http/ClientBuilderTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/http/ClientBuilderTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/http/FormCommandTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/http/FormCommandTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/http/FormCommandTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/http/FormCommandTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/http/MetadataCacheInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperServerProcess.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperServerProcess.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperServerProcess.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperServerProcess.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperTestBase.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperTestBase.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperTestBase.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/hyper/HyperTestBase.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/AuthorizationHeaderInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/DataspaceHeaderInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/EmittedHeaderTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/EmittedHeaderTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/EmittedHeaderTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/EmittedHeaderTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/HeaderMutatingClientInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/HyperExternalClientContextHeaderInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/PropertyBasedHeadersTests.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/PropertyBasedHeadersTests.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/PropertyBasedHeadersTests.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/PropertyBasedHeadersTests.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/QueryIdHeaderInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/interceptor/TracingHeadersInterceptorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/internal/EncodingUtilsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/internal/EncodingUtilsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/internal/EncodingUtilsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/internal/EncodingUtilsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffersTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffersTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffersTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/internal/TemporaryBuffersTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/internal/TracerTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/internal/TracerTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/internal/TracerTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/internal/TracerTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/ArrowUtilsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ArrowUtilsTest.java similarity index 99% rename from src/test/java/com/salesforce/datacloud/jdbc/util/ArrowUtilsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ArrowUtilsTest.java index 736a5fe7..6c9b3f02 100644 --- a/src/test/java/com/salesforce/datacloud/jdbc/util/ArrowUtilsTest.java +++ b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ArrowUtilsTest.java @@ -36,7 +36,6 @@ import java.util.Map; import java.util.stream.Stream; import lombok.val; -import lombok.var; import org.apache.arrow.vector.types.DateUnit; import org.apache.arrow.vector.types.FloatingPointPrecision; import org.apache.arrow.vector.types.IntervalUnit; @@ -128,7 +127,7 @@ void testConvertArrowFieldsToColumnMetaDataTypes() { JDBCType.valueOf(Types.ARRAY).getName(), ImmutableList.of(new Field("", FieldType.nullable(new ArrowType.List()), null))); - for (var entry : testCases.entrySet()) { + for (val entry : testCases.entrySet()) { List actual = ArrowUtils.toColumnMetaData(entry.getValue()); softly.assertThat(actual.get(0).type.name).isEqualTo(entry.getKey()); } diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIteratorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIteratorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIteratorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ConsumingPeekingIteratorTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/DateTimeUtilsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/DateTimeUtilsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/DateTimeUtilsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/DateTimeUtilsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/GrpcUtils.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/GrpcUtils.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/GrpcUtils.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/GrpcUtils.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensionsTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensionsTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensionsTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/PropertiesExtensionsTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/RealisticArrowGenerator.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RealisticArrowGenerator.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/RealisticArrowGenerator.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RealisticArrowGenerator.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/RequestRecordingInterceptor.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RequestRecordingInterceptor.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/RequestRecordingInterceptor.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RequestRecordingInterceptor.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/RequireTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RequireTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/RequireTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RequireTest.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/RootAllocatorTestExtension.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RootAllocatorTestExtension.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/RootAllocatorTestExtension.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/RootAllocatorTestExtension.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/TestWasNullConsumer.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/TestWasNullConsumer.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/TestWasNullConsumer.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/TestWasNullConsumer.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/ThrowingBiFunction.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ThrowingBiFunction.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/ThrowingBiFunction.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/ThrowingBiFunction.java diff --git a/src/test/java/com/salesforce/datacloud/jdbc/util/VectorPopulatorTest.java b/jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/VectorPopulatorTest.java similarity index 100% rename from src/test/java/com/salesforce/datacloud/jdbc/util/VectorPopulatorTest.java rename to jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/VectorPopulatorTest.java diff --git a/src/test/resources/hyper.yaml b/jdbc-slim/src/test/resources/hyper.yaml similarity index 100% rename from src/test/resources/hyper.yaml rename to jdbc-slim/src/test/resources/hyper.yaml diff --git a/src/test/resources/simplelogger.properties b/jdbc-slim/src/test/resources/simplelogger.properties similarity index 100% rename from src/test/resources/simplelogger.properties rename to jdbc-slim/src/test/resources/simplelogger.properties diff --git a/jdbc/pom.xml b/jdbc/pom.xml new file mode 100644 index 00000000..1be4703d --- /dev/null +++ b/jdbc/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.salesforce.datacloud + jdbc-parent + ${revision} + + + jdbc + + + ${java.version} + ${java.version} + UTF-8 + + + + + com.salesforce.datacloud + jdbc-grpc + ${project.version} + + + com.salesforce.datacloud + jdbc-slim + ${project.version} + + + diff --git a/pom.xml b/pom.xml index 3a89be82..3786e4c2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,18 @@ 4.0.0 com.salesforce.datacloud - jdbc - 0.23.0-SNAPSHOT - jar + jdbc-parent + + ${revision} + pom Salesforce Data Cloud JDBC Driver Salesforce Data Cloud JDBC Driver + + jdbc-grpc + jdbc + jdbc-proto + jdbc-slim + 17.0.0 3.26.3 @@ -33,6 +40,7 @@ UTF-8 UTF-8 3.25.5 + 0.23.0-SNAPSHOT com.salesforce.datacloud.jdbc.internal.shaded 1.7.32 2.30.0 @@ -67,187 +75,170 @@ pom import + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.google.guava + guava + ${guava.version} + com.google.guava guava-bom ${guava.version} + + com.google.protobuf + protobuf-java + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + javax.annotation + javax.annotation-api + 1.3.2 + + + net.jodah + failsafe + 2.4.4 + + + org.apache.arrow + arrow-vector + ${arrow.version} + + + org.apache.calcite.avatica + avatica + ${avatica.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.projectlombok + lombok + ${lombok.version} + provided + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + runtime + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + runtime + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + runtime + + + com.squareup.okhttp3 + mockwebserver + ${okhttp.version} + test + + + org.assertj + assertj-core + ${assertj.version} + test + + + org.grpcmock + grpcmock-junit5 + ${grpcmock-junit5.version} + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.junit.platform + junit-platform-launcher + test + + + org.mockito + mockito-inline + test + + + org.mockito + mockito-junit-jupiter + test + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.protobuf - protobuf-java - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - io.grpc - grpc-netty - - - io.grpc - grpc-protobuf - - - io.grpc - grpc-stub - - - io.jsonwebtoken - jjwt-api - ${jjwt.version} - - - javax.annotation - javax.annotation-api - 1.3.2 - - - net.jodah - failsafe - 2.4.4 - - - org.apache.arrow - arrow-vector - ${arrow.version} - - - org.apache.calcite.avatica - avatica - ${avatica.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.projectlombok - lombok - ${lombok.version} - provided - - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - runtime - - - io.jsonwebtoken - jjwt-jackson - ${jjwt.version} - runtime - - - org.apache.arrow - arrow-memory-netty - ${arrow.version} - runtime - - - com.squareup.okhttp3 - mockwebserver - ${okhttp.version} - test - - - org.assertj - assertj-core - ${assertj.version} - test - - - org.grpcmock - grpcmock-junit5 - ${grpcmock-junit5.version} - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.junit.platform - junit-platform-launcher - test - - - org.mockito - mockito-inline - test - - - org.mockito - mockito-junit-jupiter - test - - - org.slf4j - slf4j-simple - ${slf4j.version} - test - - - - - true - src/main/resources - - - true - src/test/resources - - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.1 + org.codehaus.mojo + flatten-maven-plugin + 1.6.0 - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} - grpc-java - io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} - false + true + resolveCiFriendliesOnly + flatten + + flatten + + process-resources + + + flatten.clean - compile - compile-custom + clean + clean @@ -255,109 +246,171 @@ org.apache.maven.plugins maven-shade-plugin 3.6.0 - - true - shaded - jdbc-shaded - false - - - org.apache - ${shadeBase}.apache - - - io.netty - ${shadeBase}.io.netty - - - io.grpc - ${shadeBase}.io.grpc - - - com.fasterxml.jackson - ${shadeBase}.com.fasterxml.jackson - - - io.jsonwebtoken - ${shadeBase}.io.jsonwebtoken - - - com.squareup - ${shadeBase}.com.squareup - - - com.google - ${shadeBase}.com.google - - - net.jodah - ${shadeBase}.net.jodah - - - org.projectlombok - ${shadeBase}.org.projectlombok - - - javax.annotation - ${shadeBase}.javax.annotation - - - com.google.protobuf - ${shadeBase}.com.google.protobuf - - - org.slf4j - ${shadeBase}.org.slf4j - - - - - *:* - - META-INF/LICENSE* - META-INF/NOTICE* - META-INF/DEPENDENCIES - META-INF/maven/** - META-INF/services/com.fasterxml.* - META-INF/*.xml - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - .netbeans_automatic_build - git.properties - google-http-client.properties - storage.v1.json - - pipes-fork-server-default-log4j2.xml - dependencies.properties - pipes-fork-server-default-log4j2.xml - - - - org.apache.arrow:arrow-vector - - - codegen/** - - - - org.apache.calcite.avatica:avatica - - org/apache/calcite/avatica/**/Driver.class - - - - - - - - + + default-shade + + shade + + package + + true + + jdbc + false + + + + + + com.salesforce.datacloud + + + + + *:* + + META-INF/LICENSE* + META-INF/NOTICE* + META-INF/DEPENDENCIES + META-INF/maven/** + META-INF/services/com.fasterxml.* + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + .netbeans_automatic_build + git.properties + google-http-client.properties + storage.v1.json + + pipes-fork-server-default-log4j2.xml + dependencies.properties + pipes-fork-server-default-log4j2.xml + + + + org.apache.arrow:arrow-vector + + + codegen/** + + + + org.apache.calcite.avatica:avatica + + org/apache/calcite/avatica/**/Driver.class + + + + + + + + + shade package + + true + shaded + jdbc-shaded + false + + + org.apache + ${shadeBase}.apache + + + io.netty + ${shadeBase}.io.netty + + + io.grpc + ${shadeBase}.io.grpc + + + com.fasterxml.jackson + ${shadeBase}.com.fasterxml.jackson + + + io.jsonwebtoken + ${shadeBase}.io.jsonwebtoken + + + com.squareup + ${shadeBase}.com.squareup + + + com.google + ${shadeBase}.com.google + + + net.jodah + ${shadeBase}.net.jodah + + + org.projectlombok + ${shadeBase}.org.projectlombok + + + javax.annotation + ${shadeBase}.javax.annotation + + + com.google.protobuf + ${shadeBase}.com.google.protobuf + + + org.slf4j + ${shadeBase}.org.slf4j + + + + + *:* + + META-INF/LICENSE* + META-INF/NOTICE* + META-INF/DEPENDENCIES + META-INF/maven/** + META-INF/services/com.fasterxml.* + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + .netbeans_automatic_build + git.properties + google-http-client.properties + storage.v1.json + + pipes-fork-server-default-log4j2.xml + dependencies.properties + pipes-fork-server-default-log4j2.xml + + + + org.apache.arrow:arrow-vector + + + codegen/** + + + + org.apache.calcite.avatica:avatica + + org/apache/calcite/avatica/**/Driver.class + + + + + + + + @@ -390,24 +443,6 @@ - - org.projectlombok - lombok-maven-plugin - 1.18.20.0 - - - delombok - - delombok - - - false - ${project.basedir}/src/main/java - ${project.build.directory}/delombok - - - - org.apache.maven.plugins maven-javadoc-plugin @@ -523,7 +558,7 @@ - ${project.basedir}/license-header.txt + license-header.txt @@ -570,21 +605,12 @@ true - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - ${*} - - - com.github.ekryd.sortpom sortpom-maven-plugin 3.0.1 + pom.xml ${project.build.sourceEncoding} custom_1 4 diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties deleted file mode 100644 index e5683df8..00000000 --- a/src/main/resources/version.properties +++ /dev/null @@ -1 +0,0 @@ -version=${project.version} \ No newline at end of file