Fix code formatting
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/683d902d Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/683d902d Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/683d902d Branch: refs/heads/master Commit: 683d902dc66c21b2353292880a00e0e149e548d4 Parents: 1fba416 Author: madhawa <madhaw...@gmail.com> Authored: Sun Aug 20 20:50:49 2017 +0530 Committer: madhawa <madhaw...@gmail.com> Committed: Sun Aug 20 22:13:01 2017 +0530 ---------------------------------------------------------------------- .../serializers/CassandraSerializer.java | 2 +- .../store/CassandraMappingBuilder.java | 36 ++++++++++++-------- .../store/CassandraStoreParameters.java | 2 +- .../test/conf/avro/gora-cassandra-mapping.xml | 2 +- .../conf/avroUDT/gora-cassandra-mapping.xml | 2 +- .../gora-cassandra-mapping.xml | 2 +- .../conf/nativeUDT/gora-cassandra-mapping.xml | 2 +- 7 files changed, 28 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/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 5f15743..6a20a35 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 @@ -80,7 +80,7 @@ public abstract class CassandraSerializer<K, T extends Persistent> { * @return Serializer */ public static <K, T extends Persistent> CassandraSerializer getSerializer(CassandraClient cc, String type, final DataStore<K, T> dataStore, CassandraMapping mapping) { - CassandraStore.SerializerType serType = type.isEmpty() ? CassandraStore.SerializerType.NATIVE : CassandraStore.SerializerType.valueOf(type.toUpperCase(Locale.ENGLISH)); + CassandraStore.SerializerType serType = type == null || type.isEmpty() ? CassandraStore.SerializerType.NATIVE : CassandraStore.SerializerType.valueOf(type.toUpperCase(Locale.ENGLISH)); CassandraSerializer serializer; switch (serType) { case AVRO: http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/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 fa988d9..f1fe8d4 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 @@ -59,7 +59,10 @@ public class CassandraMappingBuilder<K, T extends Persistent> { } private static int getReplicationFactor(Element element) { - String value = element.getAttributeValue("replication_factor"); + if (element == null) { + return 1; + } + String value = element.getAttributeValue("replicationFactor"); if (value == null) { return 1; } else { @@ -213,19 +216,24 @@ public class CassandraMappingBuilder<K, T extends Persistent> { } } Element placementStrategy = keyspaceElement.getChild("placementStrategy"); - switch (KeySpace.PlacementStrategy.valueOf(placementStrategy.getAttributeValue("name"))) { - case SimpleStrategy: - keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.SimpleStrategy); - keyspace.setReplicationFactor(getReplicationFactor(placementStrategy)); - break; - case NetworkTopologyStrategy: - List<Element> dataCenters = placementStrategy.getChildren("datacenter"); - keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.NetworkTopologyStrategy); - for (Element dataCenter : dataCenters) { - String dataCenterName = dataCenter.getAttributeValue("name"); - keyspace.addDataCenter(dataCenterName, getReplicationFactor(dataCenter)); - } - break; + if (placementStrategy != null) { + switch (KeySpace.PlacementStrategy.valueOf(placementStrategy.getAttributeValue("name"))) { + case SimpleStrategy: + keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.SimpleStrategy); + keyspace.setReplicationFactor(getReplicationFactor(placementStrategy)); + break; + case NetworkTopologyStrategy: + List<Element> dataCenters = placementStrategy.getChildren("datacenter"); + keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.NetworkTopologyStrategy); + for (Element dataCenter : dataCenters) { + String dataCenterName = dataCenter.getAttributeValue("name"); + keyspace.addDataCenter(dataCenterName, getReplicationFactor(dataCenter)); + } + break; + } + } else { + keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.SimpleStrategy); + keyspace.setReplicationFactor(1); } cassandraMapping.setKeySpace(keyspace); } http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/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 05c63ab..c98ae93 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 @@ -216,7 +216,7 @@ public class CassandraStoreParameters { public static final String ALLOW_REMOTE_DCS_FOR_LOCAL_CONSISTENCY_LEVEL = "gora.cassandrastore.allowRemoteDCsForLocalConsistencyLevel"; /** * Property pointing to use Native Cassandra Native Serialization. - * boolean + * avro/ native */ public static final String CASSANDRA_SERIALIZATION_TYPE = "gora.cassandrastore.cassandraSerializationType"; /** http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml b/gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml index 105adc1..9eb71b2 100644 --- a/gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml +++ b/gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml @@ -20,7 +20,7 @@ <gora-otd> <keyspace name="avroKeySpace" durableWrite="false"> - <placementStrategy name="SimpleStrategy" replication_factor="1"/> + <placementStrategy name="SimpleStrategy" replicationFactor="1"/> </keyspace> <class name="org.apache.gora.examples.generated.WebPage" keyClass="java.lang.String" table="WebPage" http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml b/gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml index 9dc3c0b..3c71182 100644 --- a/gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml +++ b/gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml @@ -20,7 +20,7 @@ <gora-otd> <keyspace name="avroKeySpace" durableWrite="false"> - <placementStrategy name="SimpleStrategy" replication_factor="1"/> + <placementStrategy name="SimpleStrategy" replicationFactor="1"/> </keyspace> <class name="org.apache.gora.examples.generated.WebPage" keyClass="java.lang.String" table="WebPage" http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml b/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml index 00ffb19..f9438c4 100644 --- a/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml +++ b/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml @@ -19,7 +19,7 @@ <gora-otd> <keyspace name="nativeTestKeySpace" durableWrite="false"> - <placementStrategy name="SimpleStrategy" replication_factor="1"/> + <placementStrategy name="SimpleStrategy" replicationFactor="1"/> </keyspace> <class name="org.apache.gora.cassandra.example.generated.nativeSerialization.User" keyClass="java.util.UUID" http://git-wip-us.apache.org/repos/asf/gora/blob/683d902d/gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml ---------------------------------------------------------------------- diff --git a/gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml b/gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml index ec81c2b..12399b4 100644 --- a/gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml +++ b/gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml @@ -19,7 +19,7 @@ <gora-otd> <keyspace name="nativeTestKeySpace" durableWrite="false"> - <placementStrategy name="SimpleStrategy" replication_factor="1"/> + <placementStrategy name="SimpleStrategy" replicationFactor="1"/> </keyspace> <class name="org.apache.gora.cassandra.example.generated.nativeSerialization.Document" keyClass="java.lang.String"
