diff --git a/cassandra-hadoop-util/pom.xml b/cassandra-hadoop-util/pom.xml index 68eca0658c..f3dd1a767a 100644 --- a/cassandra-hadoop-util/pom.xml +++ b/cassandra-hadoop-util/pom.xml @@ -18,32 +18,14 @@ - org.apache.hadoop - hadoop-client + org.janusgraph + janusgraph-shaded-datastax-java-driver + ${project.version} - com.datastax.cassandra - cassandra-driver-core - 3.11.3 - - - com.github.jnr - jnr-ffi - - - com.github.jnr - jnr-posix - - - io.dropwizard.metrics - metrics-core - - - io.netty - netty-handler - - + org.apache.hadoop + hadoop-client diff --git a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlClientHelper.java b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlClientHelper.java index 7579565952..545d4a08f3 100644 --- a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlClientHelper.java +++ b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlClientHelper.java @@ -18,10 +18,10 @@ package org.apache.cassandra.hadoop.cql3; -import com.datastax.driver.core.Host; -import com.datastax.driver.core.Metadata; -import com.datastax.driver.core.Token; -import com.datastax.driver.core.TokenRange; +import org.janusgraph.shaded.datastax.driver.core.Host; +import org.janusgraph.shaded.datastax.driver.core.Metadata; +import org.janusgraph.shaded.datastax.driver.core.Token; +import org.janusgraph.shaded.datastax.driver.core.TokenRange; import java.util.ArrayList; import java.util.Collections; diff --git a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java index 9cc3c88819..e50debaee2 100644 --- a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java +++ b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java @@ -20,18 +20,18 @@ * */ -import com.datastax.driver.core.AuthProvider; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.HostDistance; -import com.datastax.driver.core.PlainTextAuthProvider; -import com.datastax.driver.core.PoolingOptions; -import com.datastax.driver.core.ProtocolOptions; -import com.datastax.driver.core.ProtocolVersion; -import com.datastax.driver.core.QueryOptions; -import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions; -import com.datastax.driver.core.SSLOptions; -import com.datastax.driver.core.SocketOptions; -import com.datastax.driver.core.policies.LoadBalancingPolicy; +import org.janusgraph.shaded.datastax.driver.core.AuthProvider; +import org.janusgraph.shaded.datastax.driver.core.Cluster; +import org.janusgraph.shaded.datastax.driver.core.HostDistance; +import org.janusgraph.shaded.datastax.driver.core.PlainTextAuthProvider; +import org.janusgraph.shaded.datastax.driver.core.PoolingOptions; +import org.janusgraph.shaded.datastax.driver.core.ProtocolOptions; +import org.janusgraph.shaded.datastax.driver.core.ProtocolVersion; +import org.janusgraph.shaded.datastax.driver.core.QueryOptions; +import org.janusgraph.shaded.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions; +import org.janusgraph.shaded.datastax.driver.core.SSLOptions; +import org.janusgraph.shaded.datastax.driver.core.SocketOptions; +import org.janusgraph.shaded.datastax.driver.core.policies.LoadBalancingPolicy; import com.google.common.base.Optional; import org.apache.cassandra.hadoop.ConfigHelper; import org.apache.commons.lang3.StringUtils; @@ -280,7 +280,7 @@ private static QueryOptions getReadQueryOptions(Configuration conf) Optional fetchSize = getInputPageRowSize(conf); QueryOptions queryOptions = new QueryOptions(); if (CL != null && !CL.isEmpty()) - queryOptions.setConsistencyLevel(com.datastax.driver.core.ConsistencyLevel.valueOf(CL)); + queryOptions.setConsistencyLevel(org.janusgraph.shaded.datastax.driver.core.ConsistencyLevel.valueOf(CL)); if (fetchSize.isPresent()) queryOptions.setFetchSize(fetchSize.get()); diff --git a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java index 4d39236a2b..5a93d63ad6 100644 --- a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java +++ b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java @@ -17,16 +17,16 @@ */ package org.apache.cassandra.hadoop.cql3; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Host; -import com.datastax.driver.core.Metadata; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.SimpleStatement; -import com.datastax.driver.core.Statement; -import com.datastax.driver.core.TokenRange; -import com.datastax.driver.core.exceptions.InvalidQueryException; +import org.janusgraph.shaded.datastax.driver.core.Cluster; +import org.janusgraph.shaded.datastax.driver.core.Host; +import org.janusgraph.shaded.datastax.driver.core.Metadata; +import org.janusgraph.shaded.datastax.driver.core.ResultSet; +import org.janusgraph.shaded.datastax.driver.core.Row; +import org.janusgraph.shaded.datastax.driver.core.Session; +import org.janusgraph.shaded.datastax.driver.core.SimpleStatement; +import org.janusgraph.shaded.datastax.driver.core.Statement; +import org.janusgraph.shaded.datastax.driver.core.TokenRange; +import org.janusgraph.shaded.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; diff --git a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index 23f6be74da..24eb092e30 100644 --- a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java +++ b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java @@ -17,19 +17,19 @@ */ package org.apache.cassandra.hadoop.cql3; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.ColumnDefinitions; -import com.datastax.driver.core.ColumnMetadata; -import com.datastax.driver.core.LocalDate; -import com.datastax.driver.core.Metadata; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.TableMetadata; -import com.datastax.driver.core.Token; -import com.datastax.driver.core.TupleValue; -import com.datastax.driver.core.TypeCodec; -import com.datastax.driver.core.UDTValue; +import org.janusgraph.shaded.datastax.driver.core.Cluster; +import org.janusgraph.shaded.datastax.driver.core.ColumnDefinitions; +import org.janusgraph.shaded.datastax.driver.core.ColumnMetadata; +import org.janusgraph.shaded.datastax.driver.core.LocalDate; +import org.janusgraph.shaded.datastax.driver.core.Metadata; +import org.janusgraph.shaded.datastax.driver.core.ResultSet; +import org.janusgraph.shaded.datastax.driver.core.Row; +import org.janusgraph.shaded.datastax.driver.core.Session; +import org.janusgraph.shaded.datastax.driver.core.TableMetadata; +import org.janusgraph.shaded.datastax.driver.core.Token; +import org.janusgraph.shaded.datastax.driver.core.TupleValue; +import org.janusgraph.shaded.datastax.driver.core.TypeCodec; +import org.janusgraph.shaded.datastax.driver.core.UDTValue; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; diff --git a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/LimitedLocalNodeFirstLocalBalancingPolicy.java b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/LimitedLocalNodeFirstLocalBalancingPolicy.java index 73ee59d0c5..d72a50d4c8 100644 --- a/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/LimitedLocalNodeFirstLocalBalancingPolicy.java +++ b/cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/LimitedLocalNodeFirstLocalBalancingPolicy.java @@ -17,11 +17,11 @@ */ package org.apache.cassandra.hadoop.cql3; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Host; -import com.datastax.driver.core.HostDistance; -import com.datastax.driver.core.Statement; -import com.datastax.driver.core.policies.LoadBalancingPolicy; +import org.janusgraph.shaded.datastax.driver.core.Cluster; +import org.janusgraph.shaded.datastax.driver.core.Host; +import org.janusgraph.shaded.datastax.driver.core.HostDistance; +import org.janusgraph.shaded.datastax.driver.core.Statement; +import org.janusgraph.shaded.datastax.driver.core.policies.LoadBalancingPolicy; import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; diff --git a/docs/configs/janusgraph-cfg.md b/docs/configs/janusgraph-cfg.md index a567bb3159..70645042a9 100644 --- a/docs/configs/janusgraph-cfg.md +++ b/docs/configs/janusgraph-cfg.md @@ -504,7 +504,7 @@ Configuration options for CQL request tracker and builtin request logger | Name | Description | Datatype | Default Value | Mutability | | ---- | ---- | ---- | ---- | ---- | -| storage.cql.request-tracker.class | It is either a predefined DataStax driver value for a builtin request tracker or a full qualified class name which implements `com.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. If no any value provided, the default DataStax request tracker is used, which is `NoopRequestTracker` which doesn't do anything. If `RequestLogger` value is provided, the DataStax [RequestLogger](https://docs.datastax.com/en/developer/java-driver/4.9/manual/core/request_tracker/#request-logger) is used. | String | (no default value) | LOCAL | +| storage.cql.request-tracker.class | It is either a predefined DataStax driver value for a builtin request tracker or a full qualified class name which implements `org.janusgraph.shaded.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. If no any value provided, the default DataStax request tracker is used, which is `NoopRequestTracker` which doesn't do anything. If `RequestLogger` value is provided, the DataStax [RequestLogger](https://docs.datastax.com/en/developer/java-driver/4.9/manual/core/request_tracker/#request-logger) is used. | String | (no default value) | LOCAL | | storage.cql.request-tracker.logs-error-enabled | Whether to log failed requests.Can be used when `root.storage.cql.request-tracker.class` is set to `RequestLogger`. | Boolean | (no default value) | LOCAL | | storage.cql.request-tracker.logs-max-query-length | The maximum length of the query string in the log message. Can be used when `root.storage.cql.request-tracker.class` is set to `RequestLogger`. | Integer | (no default value) | LOCAL | | storage.cql.request-tracker.logs-max-value-length | The maximum length for bound values in the log message. Can be used when `root.storage.cql.request-tracker.class` is set to `RequestLogger`. | Integer | (no default value) | LOCAL | diff --git a/janusgraph-cql/pom.xml b/janusgraph-cql/pom.xml index 9182444923..5e8586bfa8 100644 --- a/janusgraph-cql/pom.xml +++ b/janusgraph-cql/pom.xml @@ -74,58 +74,9 @@ - com.datastax.oss - java-driver-core - ${cassandra-driver.version} - - - org.json - json - - - com.esri.geometry - esri-geometry-api - - - org.apache.tinkerpop - gremlin-core - - - org.apache.tinkerpop - tinkergraph-gremlin - - - io.netty - netty-handler - - - org.ow2.asm - asm-commons - - - - - com.datastax.oss - java-driver-query-builder - ${cassandra-driver.version} - - - org.json - json - - - org.apache.tinkerpop - gremlin-core - - - org.apache.tinkerpop - tinkergraph-gremlin - - - io.netty - netty-handler - - + org.janusgraph + janusgraph-shaded-datastax-java-driver + ${project.version} io.vavr diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLColValGetter.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLColValGetter.java index e7b3d519e8..f1d141b9fc 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLColValGetter.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLColValGetter.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.cql.Row; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Row; import io.vavr.Tuple3; import org.janusgraph.diskstorage.EntryMetaData; import org.janusgraph.diskstorage.StaticBuffer; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLConfigOptions.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLConfigOptions.java index caf54c2ce7..761c48e637 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLConfigOptions.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLConfigOptions.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.config.DefaultDriverOption; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DefaultDriverOption; import org.janusgraph.diskstorage.configuration.ConfigElement; import org.janusgraph.diskstorage.configuration.ConfigNamespace; import org.janusgraph.diskstorage.configuration.ConfigOption; @@ -518,7 +518,7 @@ public interface CQLConfigOptions { "class", "It is either a predefined DataStax driver value for a builtin request tracker " + "or a full qualified class name which implements " + - "`com.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. " + + "`org.janusgraph.shaded.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. " + "If no any value provided, the default DataStax request tracker is used, which is `NoopRequestTracker` " + "which doesn't do anything. If `RequestLogger` value is provided, the DataStax [RequestLogger]" + "(https://docs.datastax.com/en/developer/java-driver/4.9/manual/core/request_tracker/#request-logger) " + diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStore.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStore.java index 0cfdb54526..0263cb04c4 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStore.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStore.java @@ -14,26 +14,26 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.AllNodesFailedException; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.BatchableStatement; -import com.datastax.oss.driver.api.core.cql.BoundStatement; -import com.datastax.oss.driver.api.core.cql.BoundStatementBuilder; -import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Row; -import com.datastax.oss.driver.api.core.metadata.TokenMap; -import com.datastax.oss.driver.api.core.servererrors.QueryValidationException; -import com.datastax.oss.driver.api.core.servererrors.ServerError; -import com.datastax.oss.driver.api.core.type.DataTypes; -import com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection; -import com.datastax.oss.driver.api.querybuilder.insert.Insert; -import com.datastax.oss.driver.api.querybuilder.relation.Relation; -import com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions; -import com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy; -import com.datastax.oss.driver.api.querybuilder.select.Select; -import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; +import org.janusgraph.shaded.datastax.oss.driver.api.core.AllNodesFailedException; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchableStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BoundStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BoundStatementBuilder; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.ExecutionInfo; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.PreparedStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.ResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Row; +import org.janusgraph.shaded.datastax.oss.driver.api.core.metadata.TokenMap; +import org.janusgraph.shaded.datastax.oss.driver.api.core.servererrors.QueryValidationException; +import org.janusgraph.shaded.datastax.oss.driver.api.core.servererrors.ServerError; +import org.janusgraph.shaded.datastax.oss.driver.api.core.type.DataTypes; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.delete.DeleteSelection; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.insert.Insert; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.relation.Relation; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.select.Select; +import org.janusgraph.shaded.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import io.vavr.Tuple; import io.vavr.Tuple3; import io.vavr.collection.Array; @@ -72,15 +72,15 @@ import java.util.concurrent.ExecutorService; import java.util.function.Function; -import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker; -import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom; -import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto; -import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createTable; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.leveledCompactionStrategy; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.sizeTieredCompactionStrategy; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.timeWindowCompactionStrategy; -import static com.datastax.oss.driver.api.querybuilder.select.Selector.column; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.createTable; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.leveledCompactionStrategy; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.sizeTieredCompactionStrategy; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.timeWindowCompactionStrategy; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.select.Selector.column; import static io.vavr.API.$; import static io.vavr.API.Case; import static io.vavr.API.Match; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIterator.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIterator.java index ced1edfe2f..5cbe59766f 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIterator.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIterator.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.cql.Row; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Row; import com.google.common.collect.AbstractIterator; import io.vavr.Tuple; import io.vavr.Tuple3; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLStoreManager.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLStoreManager.java index b635fe549b..a8587c4e3e 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLStoreManager.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLStoreManager.java @@ -14,12 +14,12 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.CqlIdentifier; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; -import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; -import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlIdentifier; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; +import org.janusgraph.shaded.datastax.oss.driver.api.core.metadata.schema.TableMetadata; +import org.janusgraph.shaded.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; import io.vavr.Tuple; import io.vavr.collection.Array; import io.vavr.collection.HashMap; @@ -58,9 +58,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; -import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.truncate; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createKeyspace; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropKeyspace; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.QueryBuilder.truncate; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.createKeyspace; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropKeyspace; import static io.vavr.API.$; import static io.vavr.API.Case; import static io.vavr.API.Match; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLTransaction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLTransaction.java index 349bf72b72..5a95ab5644 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLTransaction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLTransaction.java @@ -14,8 +14,8 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.ConsistencyLevel; -import com.datastax.oss.driver.api.core.DefaultConsistencyLevel; +import org.janusgraph.shaded.datastax.oss.driver.api.core.ConsistencyLevel; +import org.janusgraph.shaded.datastax.oss.driver.api.core.DefaultConsistencyLevel; import com.google.common.base.Preconditions; import org.janusgraph.diskstorage.BaseTransactionConfig; import org.janusgraph.diskstorage.common.AbstractStoreTransaction; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLMutateManyFunctionBuilder.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLMutateManyFunctionBuilder.java index f7278c8d7d..d044030988 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLMutateManyFunctionBuilder.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLMutateManyFunctionBuilder.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql.builder; -import com.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.janusgraph.diskstorage.common.DistributedStoreManager; import org.janusgraph.diskstorage.configuration.Configuration; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLProgrammaticConfigurationLoaderBuilder.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLProgrammaticConfigurationLoaderBuilder.java index 124914e9b5..20be3db00b 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLProgrammaticConfigurationLoaderBuilder.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLProgrammaticConfigurationLoaderBuilder.java @@ -14,11 +14,11 @@ package org.janusgraph.diskstorage.cql.builder; -import com.datastax.oss.driver.api.core.config.DefaultDriverOption; -import com.datastax.oss.driver.api.core.config.DriverConfigLoader; -import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder; -import com.datastax.oss.driver.internal.core.auth.PlainTextAuthProvider; -import com.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DefaultDriverOption; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DriverConfigLoader; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder; +import org.janusgraph.shaded.datastax.oss.driver.internal.core.auth.PlainTextAuthProvider; +import org.janusgraph.shaded.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory; import org.janusgraph.diskstorage.configuration.Configuration; import java.time.Duration; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLSessionBuilder.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLSessionBuilder.java index 7d9018e703..710a590f55 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLSessionBuilder.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLSessionBuilder.java @@ -14,10 +14,10 @@ package org.janusgraph.diskstorage.cql.builder; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.CqlSessionBuilder; -import com.datastax.oss.driver.api.core.config.DriverConfigLoader; -import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSessionBuilder; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DriverConfigLoader; +import org.janusgraph.shaded.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigParseOptions; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLStoreFeaturesBuilder.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLStoreFeaturesBuilder.java index 5f94877b89..e0c5851d74 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLStoreFeaturesBuilder.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/builder/CQLStoreFeaturesBuilder.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql.builder; -import com.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; import org.janusgraph.diskstorage.common.DistributedStoreManager; import org.janusgraph.diskstorage.configuration.Configuration; import org.janusgraph.diskstorage.cql.CQLStoreManager; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/ColumnOperationFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/ColumnOperationFunction.java index c75ce2caab..f9ff96cb51 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/ColumnOperationFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/ColumnOperationFunction.java @@ -14,8 +14,8 @@ package org.janusgraph.diskstorage.cql.function; -import com.datastax.oss.driver.api.core.cql.BatchableStatement; -import com.datastax.oss.driver.api.core.cql.BoundStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchableStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BoundStatement; import io.vavr.collection.Iterator; import org.janusgraph.diskstorage.StaticBuffer; import org.janusgraph.diskstorage.common.DistributedStoreManager; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyLoggedFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyLoggedFunction.java index e7b4ed7689..4293cd0ab4 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyLoggedFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyLoggedFunction.java @@ -14,9 +14,9 @@ package org.janusgraph.diskstorage.cql.function.mutate; -import com.datastax.oss.driver.api.core.cql.BatchStatement; -import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder; -import com.datastax.oss.driver.api.core.cql.DefaultBatchType; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchStatementBuilder; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.DefaultBatchType; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.StaticBuffer; import org.janusgraph.diskstorage.common.DistributedStoreManager; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyUnloggedFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyUnloggedFunction.java index 7a7a49c16d..f23358e5b0 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyUnloggedFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/AbstractCQLMutateManyUnloggedFunction.java @@ -14,12 +14,12 @@ package org.janusgraph.diskstorage.cql.function.mutate; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.BatchStatement; -import com.datastax.oss.driver.api.core.cql.BatchableStatement; -import com.datastax.oss.driver.api.core.cql.BoundStatement; -import com.datastax.oss.driver.api.core.cql.DefaultBatchType; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchableStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BoundStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.DefaultBatchType; import io.vavr.collection.Iterator; import io.vavr.collection.Seq; import org.janusgraph.diskstorage.BackendException; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyLoggedFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyLoggedFunction.java index cf8c5e9144..5be4428560 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyLoggedFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyLoggedFunction.java @@ -14,9 +14,9 @@ package org.janusgraph.diskstorage.cql.function.mutate; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.BatchStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchStatement; import io.vavr.concurrent.Future; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.common.DistributedStoreManager; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyUnloggedFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyUnloggedFunction.java index 04957d85ff..698df8d620 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyUnloggedFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLExecutorServiceMutateManyUnloggedFunction.java @@ -14,8 +14,8 @@ package org.janusgraph.diskstorage.cql.function.mutate; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; import io.vavr.collection.Iterator; import io.vavr.collection.Seq; import io.vavr.concurrent.Future; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyLoggedFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyLoggedFunction.java index 2f04a93f3f..da8e759122 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyLoggedFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyLoggedFunction.java @@ -14,8 +14,8 @@ package org.janusgraph.diskstorage.cql.function.mutate; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.BatchStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.BatchStatement; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.common.DistributedStoreManager; import org.janusgraph.diskstorage.cql.CQLKeyColumnValueStore; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyUnloggedFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyUnloggedFunction.java index 22244d26a8..5d529f2522 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyUnloggedFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/mutate/CQLSimpleMutateManyUnloggedFunction.java @@ -14,8 +14,8 @@ package org.janusgraph.diskstorage.cql.function.mutate; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; import org.janusgraph.diskstorage.StaticBuffer; import org.janusgraph.diskstorage.common.DistributedStoreManager; import org.janusgraph.diskstorage.cql.CQLKeyColumnValueStore; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/AbstractCQLSliceFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/AbstractCQLSliceFunction.java index a112e00c23..0eef9cba7d 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/AbstractCQLSliceFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/AbstractCQLSliceFunction.java @@ -14,11 +14,11 @@ package org.janusgraph.diskstorage.cql.function.slice; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import com.datastax.oss.driver.api.core.cql.Row; -import com.datastax.oss.driver.internal.core.cql.ResultSets; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.PreparedStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Row; +import org.janusgraph.shaded.datastax.oss.driver.internal.core.cql.ResultSets; import io.vavr.Tuple3; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.EntryList; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLExecutorServiceSliceFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLExecutorServiceSliceFunction.java index e3c7548d18..5c7f29f046 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLExecutorServiceSliceFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLExecutorServiceSliceFunction.java @@ -14,9 +14,9 @@ package org.janusgraph.diskstorage.cql.function.slice; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.PreparedStatement; import io.vavr.concurrent.Future; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.EntryList; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLSimpleSliceFunction.java b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLSimpleSliceFunction.java index 08eacd1772..cfcfe13dc0 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLSimpleSliceFunction.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/function/slice/CQLSimpleSliceFunction.java @@ -14,9 +14,9 @@ package org.janusgraph.diskstorage.cql.function.slice; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.AsyncResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.PreparedStatement; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.EntryList; import org.janusgraph.diskstorage.PermanentBackendException; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/hadoop/CqlHadoopStoreManager.java b/janusgraph-cql/src/main/java/org/janusgraph/hadoop/CqlHadoopStoreManager.java index 061ecbbe04..6350f19100 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/hadoop/CqlHadoopStoreManager.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/hadoop/CqlHadoopStoreManager.java @@ -14,7 +14,7 @@ package org.janusgraph.hadoop; -import com.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputFormat; import org.janusgraph.hadoop.formats.cql.CqlBinaryInputFormat; diff --git a/janusgraph-cql/src/main/java/org/janusgraph/hadoop/formats/cql/CqlBinaryRecordReader.java b/janusgraph-cql/src/main/java/org/janusgraph/hadoop/formats/cql/CqlBinaryRecordReader.java index 23b1d64ab8..9a887ac14a 100644 --- a/janusgraph-cql/src/main/java/org/janusgraph/hadoop/formats/cql/CqlBinaryRecordReader.java +++ b/janusgraph-cql/src/main/java/org/janusgraph/hadoop/formats/cql/CqlBinaryRecordReader.java @@ -14,7 +14,7 @@ package org.janusgraph.hadoop.formats.cql; -import com.datastax.driver.core.Row; +import org.janusgraph.shaded.datastax.driver.core.Row; import org.apache.cassandra.hadoop.cql3.CqlRecordReader; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.RecordReader; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLConfigTest.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLConfigTest.java index 3b9cd4cf00..cb4eddba27 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLConfigTest.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLConfigTest.java @@ -13,11 +13,11 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.config.DefaultDriverOption; -import com.datastax.oss.driver.api.core.config.DriverConfigLoader; -import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; -import com.datastax.oss.driver.internal.core.tracker.RequestLogger; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DefaultDriverOption; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DriverConfigLoader; +import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DriverExecutionProfile; +import org.janusgraph.shaded.datastax.oss.driver.internal.core.tracker.RequestLogger; import org.apache.commons.io.FileUtils; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStoreTest.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStoreTest.java index 2deb0431f4..738d2b16d8 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStoreTest.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLKeyColumnValueStoreTest.java @@ -14,12 +14,12 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.type.DataTypes; -import com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions; +import org.janusgraph.shaded.datastax.oss.driver.api.core.type.DataTypes; +import org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions; import org.janusgraph.diskstorage.configuration.Configuration; import org.junit.Test; -import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createTable; +import static org.janusgraph.shaded.datastax.oss.driver.api.querybuilder.SchemaBuilder.createTable; import static org.janusgraph.diskstorage.cql.CQLConfigOptions.COMPACTION_OPTIONS; import static org.janusgraph.diskstorage.cql.CQLConfigOptions.COMPACTION_STRATEGY; import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.buildGraphConfiguration; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLMultiWriteStoreTest.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLMultiWriteStoreTest.java index 92b4d1ab8c..e66bafb6f7 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLMultiWriteStoreTest.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLMultiWriteStoreTest.java @@ -17,7 +17,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; -import com.datastax.oss.driver.internal.core.session.DefaultSession; +import org.janusgraph.shaded.datastax.oss.driver.internal.core.session.DefaultSession; import org.apache.commons.lang.UnhandledException; import org.janusgraph.JanusGraphCassandraContainer; import org.janusgraph.diskstorage.BackendException; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIteratorTest.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIteratorTest.java index 5d63a43ec2..cc93b5d766 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIteratorTest.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLResultSetKeyIteratorTest.java @@ -14,8 +14,8 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Row; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.ResultSet; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Row; import io.vavr.Function1; import io.vavr.Tuple; import io.vavr.Tuple2; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLStoreTest.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLStoreTest.java index 358ad838bf..6275505908 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLStoreTest.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLStoreTest.java @@ -14,11 +14,11 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.cql.Statement; -import com.datastax.oss.driver.api.core.metadata.Metadata; -import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; -import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Statement; +import org.janusgraph.shaded.datastax.oss.driver.api.core.metadata.Metadata; +import org.janusgraph.shaded.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; +import org.janusgraph.shaded.datastax.oss.driver.api.core.metadata.schema.TableMetadata; import org.janusgraph.JanusGraphCassandraContainer; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.KeyColumnValueStoreTest; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLSessionBuilder.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLSessionBuilder.java index e94826d9e0..092a5f9d76 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLSessionBuilder.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLSessionBuilder.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; import org.janusgraph.diskstorage.PermanentBackendException; import org.janusgraph.diskstorage.configuration.Configuration; import org.janusgraph.diskstorage.cql.builder.CQLProgrammaticConfigurationLoaderBuilder; diff --git a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLStoreManager.java b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLStoreManager.java index 7eedbdbf62..7732bdc31d 100644 --- a/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLStoreManager.java +++ b/janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CachingCQLStoreManager.java @@ -14,7 +14,7 @@ package org.janusgraph.diskstorage.cql; -import com.datastax.oss.driver.api.core.CqlSession; +import org.janusgraph.shaded.datastax.oss.driver.api.core.CqlSession; import org.janusgraph.diskstorage.BackendException; import org.janusgraph.diskstorage.configuration.Configuration; diff --git a/janusgraph-scylla/pom.xml b/janusgraph-scylla/pom.xml index 3c2ea6c7ef..a7782a34dd 100644 --- a/janusgraph-scylla/pom.xml +++ b/janusgraph-scylla/pom.xml @@ -57,16 +57,18 @@ ${project.version} - com.datastax.oss - java-driver-core - - - com.datastax.oss - java-driver-query-builder + org.janusgraph + janusgraph-shaded-datastax-java-driver + + org.janusgraph + janusgraph-shaded-scylladb-java-driver + ${project.version} + + org.janusgraph janusgraph-hadoop @@ -84,61 +86,6 @@ - - com.scylladb - java-driver-core - ${scylla-driver.version} - - - org.json - json - - - com.esri.geometry - esri-geometry-api - - - org.apache.tinkerpop - gremlin-core - - - org.apache.tinkerpop - tinkergraph-gremlin - - - io.netty - netty-handler - - - org.ow2.asm - asm-commons - - - - - com.scylladb - java-driver-query-builder - ${scylla-driver.version} - - - org.json - json - - - org.apache.tinkerpop - gremlin-core - - - org.apache.tinkerpop - tinkergraph-gremlin - - - io.netty - netty-handler - - - - org.janusgraph scylla-hadoop-util @@ -156,12 +103,8 @@ test-jar - com.datastax.oss - java-driver-core - - - com.datastax.oss - java-driver-query-builder + org.janusgraph + janusgraph-shaded-datastax-java-driver diff --git a/janusgraph-shaded/datastax-java-driver/pom.xml b/janusgraph-shaded/datastax-java-driver/pom.xml new file mode 100644 index 0000000000..3cf130b506 --- /dev/null +++ b/janusgraph-shaded/datastax-java-driver/pom.xml @@ -0,0 +1,122 @@ + + + 4.0.0 + + org.janusgraph + janusgraph-shaded + 1.0.0-SNAPSHOT + + janusgraph-shaded-datastax-java-driver + janusgraph-shaded-datastax-java-driver + https://janusgraph.org + + UTF-8 + + + + com.datastax.oss + java-driver-core + ${cassandra-driver.version} + + + com.github.jnr + jnr-ffi + + + com.github.jnr + jnr-posix + + + io.dropwizard.metrics + metrics-core + + + io.netty + netty-handler + + + + + com.datastax.oss + java-driver-query-builder + ${cassandra-driver.version} + + + + com.datastax.cassandra + cassandra-driver-core + 3.11.3 + + + com.github.jnr + jnr-ffi + + + com.github.jnr + jnr-posix + + + io.dropwizard.metrics + metrics-core + + + io.netty + netty-handler + + + + + + ${basedir}/target + ${project.artifactId}-${project.version} + + + maven-shade-plugin + + + shade-datastax-java-driver + package + + shade + + + false + + + com.datastax.oss:* + com.datastax.cassandra:* + + + + + com.datastax.dse + org.janusgraph.shaded.datastax.dse + + + com.datastax.oss + org.janusgraph.shaded.datastax.oss + + + + com.datastax.driver + org.janusgraph.shaded.datastax.driver + + + + + + * + + META-INF/services/** + + + + false + false + + + + + + + diff --git a/janusgraph-shaded/pom.xml b/janusgraph-shaded/pom.xml new file mode 100644 index 0000000000..0c05e14e1e --- /dev/null +++ b/janusgraph-shaded/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + org.janusgraph + janusgraph + 1.0.0-SNAPSHOT + + janusgraph-shaded + JanusGraph-shaded: shaded libraries used by JanusGraph + https://janusgraph.org + pom + + UTF-8 + + + datastax-java-driver + scylladb-java-driver + + diff --git a/janusgraph-shaded/scylladb-java-driver/pom.xml b/janusgraph-shaded/scylladb-java-driver/pom.xml new file mode 100644 index 0000000000..ea16f0665c --- /dev/null +++ b/janusgraph-shaded/scylladb-java-driver/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + org.janusgraph + janusgraph-shaded + 1.0.0-SNAPSHOT + + janusgraph-shaded-scylladb-java-driver + janusGraph-shaded-scylladb-java-driver + https://janusgraph.org + + UTF-8 + + + + com.scylladb + java-driver-core + ${scylla-driver.version} + + + com.github.jnr + jnr-ffi + + + com.github.jnr + jnr-posix + + + io.dropwizard.metrics + metrics-core + + + io.netty + netty-handler + + + + + com.scylladb + java-driver-query-builder + ${scylla-driver.version} + + + + com.scylladb + scylla-driver-core + 3.11.2.4 + + + com.github.jnr + jnr-ffi + + + com.github.jnr + jnr-posix + + + io.dropwizard.metrics + metrics-core + + + io.netty + netty-handler + + + + + + ${basedir}/target + ${project.artifactId}-${project.version} + + + maven-shade-plugin + + + shade-scylladb-java-driver + package + + shade + + + false + + + com.scylladb:* + + + + + com.datastax.driver + org.janusgraph.shaded.scylladb.driver + + + com.datastax.dse + org.janusgraph.shaded.scylladb.dse + + + com.datastax.oss + org.janusgraph.shaded.scylladb.oss + + + + + + * + + META-INF/services/** + + + + false + false + + + + + + + diff --git a/pom.xml b/pom.xml index 023690f227..1cf1169908 100644 --- a/pom.xml +++ b/pom.xml @@ -130,6 +130,7 @@ janusgraph-berkeleyje cassandra-hadoop-util scylla-hadoop-util + janusgraph-shaded janusgraph-cql janusgraph-hadoop janusgraph-hbase @@ -502,6 +503,11 @@ jacoco-maven-plugin 0.8.9 + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + diff --git a/scylla-hadoop-util/pom.xml b/scylla-hadoop-util/pom.xml index a6044f0588..9b0af2e873 100644 --- a/scylla-hadoop-util/pom.xml +++ b/scylla-hadoop-util/pom.xml @@ -23,34 +23,16 @@ ${project.version} - com.datastax.cassandra - cassandra-driver-core + org.janusgraph + janusgraph-shaded-datastax-java-driver - com.scylladb - scylla-driver-core - 3.11.2.4 - - - com.github.jnr - jnr-ffi - - - com.github.jnr - jnr-posix - - - io.dropwizard.metrics - metrics-core - - - io.netty - netty-handler - - + org.janusgraph + janusgraph-shaded-scylladb-java-driver + ${project.version}