Fix code review comments
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/ce78ef52 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/ce78ef52 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/ce78ef52 Branch: refs/heads/master Commit: ce78ef520c44a075dd24d02f41edd4cccf47bc4b Parents: 683d902 Author: madhawa-gunasekara <[email protected]> Authored: Thu Aug 24 00:33:27 2017 +0530 Committer: madhawa-gunasekara <[email protected]> Committed: Thu Aug 24 00:33:27 2017 +0530 ---------------------------------------------------------------------- gora-cassandra-cql/pom.xml | 14 -------------- .../src/examples/avro/cassandraKey.json | 2 +- .../src/examples/avro/cassandraRecord.json | 2 +- .../nativeSerialization/ComplexTypes.java | 1 - .../gora/cassandra/bean/CassandraKey.java | 1 - .../gora/cassandra/bean/ClusterKeyField.java | 1 - .../org/apache/gora/cassandra/bean/Field.java | 1 - .../apache/gora/cassandra/bean/KeySpace.java | 1 - .../gora/cassandra/bean/PartitionKeyField.java | 1 - .../compiler/GoraCassandraNativeCompiler.java | 1 - .../gora/cassandra/query/CassandraQuery.java | 1 - .../cassandra/query/CassandraResultSet.java | 1 - .../serializers/AvroCassandraUtils.java | 1 - .../cassandra/serializers/AvroSerializer.java | 1 - .../serializers/CassandraSerializer.java | 1 - .../cassandra/serializers/NativeSerializer.java | 1 - .../gora/cassandra/store/CassandraClient.java | 1 - .../gora/cassandra/store/CassandraMapping.java | 1 - .../store/CassandraMappingBuilder.java | 1 - .../gora/cassandra/store/CassandraStore.java | 1 - .../store/CassandraStoreParameters.java | 1 - .../src/test/conf/gora.properties | 20 ++++++++++++++++++-- 22 files changed, 20 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/pom.xml ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/pom.xml b/gora-cassandra-cql/pom.xml index 2e05e43..2160def 100644 --- a/gora-cassandra-cql/pom.xml +++ b/gora-cassandra-cql/pom.xml @@ -127,33 +127,28 @@ <groupId>org.apache.gora</groupId> <artifactId>gora-core</artifactId> </dependency> - <dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-core</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> - <!-- Cassandra Driver Dependencies --> <dependency> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-core</artifactId> <version>${cassandra-driver.version}</version> </dependency> - <dependency> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-mapping</artifactId> <version>${cassandra-driver.version}</version> </dependency> - <dependency> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-extras</artifactId> <version>${cassandra-driver.version}</version> </dependency> - <!-- Cassandra Dependencies --> <dependency> <groupId>org.apache.cassandra</groupId> @@ -178,29 +173,24 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-hbase</artifactId> </dependency> - <!-- Misc Dependencies --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> </dependency> - <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> </dependency> - <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </dependency> - <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> @@ -216,18 +206,14 @@ </exclusion> </exclusions> </dependency> - <!-- Testing Dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> </dependency> - </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/examples/avro/cassandraKey.json ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/examples/avro/cassandraKey.json b/gora-cassandra-cql/src/examples/avro/cassandraKey.json index f4c4a76..141282e 100644 --- a/gora-cassandra-cql/src/examples/avro/cassandraKey.json +++ b/gora-cassandra-cql/src/examples/avro/cassandraKey.json @@ -2,7 +2,7 @@ "type": "record", "name": "CassandraKey", "default": null, - "namespace": "org.apache.gora.cassandra.example.generated.avroSerialization", + "namespace": "org.apache.gora.cassandra.example.generated.AvroSerialization", "doc": "This Object is created to used as Cassandra Key to test cassandra data store, Cassandra Key can be used to define partition keys, clustering keys.", "fields": [ { http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/examples/avro/cassandraRecord.json ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/examples/avro/cassandraRecord.json b/gora-cassandra-cql/src/examples/avro/cassandraRecord.json index 48ce275..9bd8d21 100644 --- a/gora-cassandra-cql/src/examples/avro/cassandraRecord.json +++ b/gora-cassandra-cql/src/examples/avro/cassandraRecord.json @@ -2,7 +2,7 @@ "type": "record", "name": "CassandraRecord", "default": null, - "namespace": "org.apache.gora.cassandra.example.generated.avroSerialization", + "namespace": "org.apache.gora.cassandra.example.generated.AvroSerialization", "doc": "This object created to used as Persistent Object to test cassandra data store", "fields": [ { http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java b/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java index 1a6a674..b831c97 100644 --- a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java +++ b/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.example.generated.nativeSerialization; import com.datastax.driver.mapping.annotations.Column; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java index b50d97f..d3f3b1d 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.bean; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java index e1c88e3..7e23c75 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.bean; /** http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java index 237601d..b5015a1 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.bean; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java index 898b370..8a7ca5f 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.bean; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java index 3aa4e36..be91d40 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.bean; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java index fd34a48..cd0a5d2 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.compiler; import org.apache.commons.io.FilenameUtils; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java index 45f9b77..e24822d 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.query; import org.apache.gora.filter.Filter; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java index f176350..4e44d0d 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.query; import org.apache.gora.persistency.Persistent; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java index 9a070e4..9c33bf6 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.serializers; import org.apache.avro.Schema; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java index e064c6e..204ae52 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.serializers; import com.datastax.driver.core.AbstractGettableData; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java index 6a20a35..208428e 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.serializers; import com.datastax.driver.core.ConsistencyLevel; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java index 74dbf6a..bf28ee0 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.serializers; import com.datastax.driver.core.ConsistencyLevel; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java index 4e1d8bd..f672884 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.store; import com.datastax.driver.core.Cluster; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java index 911e782..7d5ac05 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.store; import org.apache.gora.cassandra.bean.CassandraKey; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java index f1fe8d4..a5ada56 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.store; import org.apache.gora.cassandra.bean.CassandraKey; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java index 799cd95..129c49f 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.store; import org.apache.gora.cassandra.query.CassandraQuery; http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java index c98ae93..7032dab 100644 --- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java +++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.gora.cassandra.store; /** http://git-wip-us.apache.org/repos/asf/gora/blob/ce78ef52/gora-cassandra-cql/src/test/conf/gora.properties ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/test/conf/gora.properties b/gora-cassandra-cql/src/test/conf/gora.properties index e9a1b48..0cd1479 100644 --- a/gora-cassandra-cql/src/test/conf/gora.properties +++ b/gora-cassandra-cql/src/test/conf/gora.properties @@ -17,5 +17,21 @@ gora.datastore.default=org.apache.gora.cassandra.CassandraStore gora.cassandrastore.cluster=Gora Cassandra Test Cluster gora.cassandrastore.host=localhost:9160 -# property is annotated in CassandraClient#checkKeyspace() -# options are ANY, ONE, TWO, THREE, LOCAL_QUORUM, EACH_QUORUM, QUORUM and ALL. \ No newline at end of file + +#To set compression to use for the transport."LZ4", "SNAPPY", "NONE" +#gora.cassandrastore.compression + +#To set username to connect to the server. +#gora.cassandrastore.username + +#To set password to connect to the server. +#gora.cassandrastore.password + +#To set cassandra CQL Protocol version. +#gora.cassandrastore.protocolVersion + +#To set read consistencyLevel "ALL", "ANY", "EACH_QUORUM", "LOCAL_ONE", "LOCAL_QUORUM", "LOCAL_SERIAL", "ONE", "QUORUM", "SERIAL", "THREE", "TWO". +#gora.cassandrastore.read.consistencyLevel + +#To set write consistencyLevel "ALL", "ANY", "EACH_QUORUM", "LOCAL_ONE", "LOCAL_QUORUM", "LOCAL_SERIAL", "ONE", "QUORUM", "SERIAL", "THREE", "TWO". +#gora.cassandrastore.write.consistencyLevel \ No newline at end of file
