This is an automated email from the ASF dual-hosted git repository.
madhawa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git
The following commit(s) were added to refs/heads/master by this push:
new 8b05230 GORA-430 Address use of deprecated API's
new 2819737 Merge pull request #223 from
podorvanova/address-use-of-deprecated-apis
8b05230 is described below
commit 8b052303a069d63e36c11c6e0c917c17466f3d0b
Author: Maria Podorvanova <podorvanova.ma...@gmail.com>
AuthorDate: Thu Oct 8 15:13:21 2020 +1100
GORA-430 Address use of deprecated API's
---
.../gora/cassandra/store/CassandraClient.java | 48 ++++------------------
.../cassandra/store/CassandraStoreParameters.java | 9 +---
.../org/apache/gora/compiler/GoraCompiler.java | 7 ++--
.../apache/gora/couchdb/store/CouchDBStore.java | 2 +-
.../java/org/apache/gora/goraci/Generator.java | 6 +--
.../main/java/org/apache/gora/goraci/Verify.java | 2 +-
.../gora/goraci/chef/ChefSoftwareProvisioning.java | 15 +++----
.../goraci/rackspace/RackspaceOrchestration.java | 1 -
.../apache/gora/infinispan/SimulationDriver.java | 1 -
.../org/apache/gora/tutorial/log/LogAnalytics.java | 2 +-
10 files changed, 27 insertions(+), 66 deletions(-)
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index aeda495..f0cb738 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -30,7 +30,6 @@ import com.datastax.driver.core.TypeCodec;
import com.datastax.driver.core.policies.ConstantReconnectionPolicy;
import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy;
import com.datastax.driver.core.policies.DefaultRetryPolicy;
-import com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy;
import com.datastax.driver.core.policies.ExponentialReconnectionPolicy;
import com.datastax.driver.core.policies.FallthroughRetryPolicy;
import com.datastax.driver.core.policies.LatencyAwarePolicy;
@@ -276,24 +275,12 @@ public class CassandraClient {
break;
case "DCAwareRoundRobinPolicy": {
String dataCenter =
properties.getProperty(CassandraStoreParameters.DATA_CENTER);
- boolean allowRemoteDCsForLocalConsistencyLevel =
Boolean.parseBoolean(
-
properties.getProperty(CassandraStoreParameters.ALLOW_REMOTE_DCS_FOR_LOCAL_CONSISTENCY_LEVEL));
if (dataCenter != null && !dataCenter.isEmpty()) {
- if (allowRemoteDCsForLocalConsistencyLevel) {
- builder = builder.withLoadBalancingPolicy(
- DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter)
-
.allowRemoteDCsForLocalConsistencyLevel().build());
- } else {
- builder = builder.withLoadBalancingPolicy(
-
DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build());
- }
+ builder = builder.withLoadBalancingPolicy(
+
DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build());
} else {
- if (allowRemoteDCsForLocalConsistencyLevel) {
- builder = builder.withLoadBalancingPolicy(
-
(DCAwareRoundRobinPolicy.builder().allowRemoteDCsForLocalConsistencyLevel().build()));
- } else {
- builder =
builder.withLoadBalancingPolicy((DCAwareRoundRobinPolicy.builder().build()));
- }
+ builder = builder.withLoadBalancingPolicy(
+ (DCAwareRoundRobinPolicy.builder().build()));
}
break;
}
@@ -302,25 +289,12 @@ public class CassandraClient {
break;
case "TokenAwareDCAwareRoundRobinPolicy": {
String dataCenter =
properties.getProperty(CassandraStoreParameters.DATA_CENTER);
- boolean allowRemoteDCsForLocalConsistencyLevel =
Boolean.parseBoolean(
-
properties.getProperty(CassandraStoreParameters.ALLOW_REMOTE_DCS_FOR_LOCAL_CONSISTENCY_LEVEL));
if (dataCenter != null && !dataCenter.isEmpty()) {
- if (allowRemoteDCsForLocalConsistencyLevel) {
- builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy(
- DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter)
-
.allowRemoteDCsForLocalConsistencyLevel().build()));
- } else {
- builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy(
-
DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build()));
- }
+ builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy(
+
DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build()));
} else {
- if (allowRemoteDCsForLocalConsistencyLevel) {
- builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy(
-
DCAwareRoundRobinPolicy.builder().allowRemoteDCsForLocalConsistencyLevel().build()));
- } else {
- builder = builder.withLoadBalancingPolicy(
- new
TokenAwarePolicy(DCAwareRoundRobinPolicy.builder().build()));
- }
+ builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy(
+ DCAwareRoundRobinPolicy.builder().build()));
}
break;
}
@@ -429,18 +403,12 @@ public class CassandraClient {
case "DefaultRetryPolicy":
builder = builder.withRetryPolicy(DefaultRetryPolicy.INSTANCE);
break;
- case "DowngradingConsistencyRetryPolicy":
- builder =
builder.withRetryPolicy(DowngradingConsistencyRetryPolicy.INSTANCE);
- break;
case "FallthroughRetryPolicy":
builder = builder.withRetryPolicy(FallthroughRetryPolicy.INSTANCE);
break;
case "LoggingDefaultRetryPolicy":
builder = builder.withRetryPolicy(new
LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE));
break;
- case "LoggingDowngradingConsistencyRetryPolicy":
- builder = builder.withRetryPolicy(new
LoggingRetryPolicy(DowngradingConsistencyRetryPolicy.INSTANCE));
- break;
case "LoggingFallthroughRetryPolicy":
builder = builder.withRetryPolicy(new
LoggingRetryPolicy(FallthroughRetryPolicy.INSTANCE));
break;
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java
index 7032dab..5d453fe 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java
@@ -154,8 +154,8 @@ public class CassandraStoreParameters {
public static final String EXPONENTIAL_RECONNECTION_POLICY_MAX_DELAY =
"gora.cassandrastore.exponentialReconnectionPolicyMaxDelay";
/**
* Property pointing to set the retry policy.
- * "DefaultRetryPolicy", "DowngradingConsistencyRetryPolicy",
"FallthroughRetryPolicy",
- * "LoggingDefaultRetryPolicy", "LoggingDowngradingConsistencyRetryPolicy",
"LoggingFallthroughRetryPolicy"
+ * "DefaultRetryPolicy", "FallthroughRetryPolicy",
+ * "LoggingDefaultRetryPolicy", "LoggingFallthroughRetryPolicy"
*/
public static final String RETRY_POLICY = "gora.cassandrastore.retryPolicy";
/**
@@ -209,11 +209,6 @@ public class CassandraStoreParameters {
*/
public static final String DATA_CENTER = "gora.cassandrastore.dataCenter";
/**
- * Property pointing to enable/disable remote data centers for local
consistency level.
- * string
- */
- public static final String ALLOW_REMOTE_DCS_FOR_LOCAL_CONSISTENCY_LEVEL =
"gora.cassandrastore.allowRemoteDCsForLocalConsistencyLevel";
- /**
* Property pointing to use Native Cassandra Native Serialization.
* avro/ native
*/
diff --git
a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
index 003301e..acc9c10 100644
--- a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
+++ b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.avro.JsonProperties;
import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
import org.apache.avro.Schema.Type;
@@ -294,18 +295,16 @@ public class GoraCompiler extends SpecificCompiler {
List<Field> newFields = new ArrayList<>();
byte[] defaultDirtyBytesValue = new
byte[getNumberOfBytesNeededForDirtyBits(originalSchema)];
Arrays.fill(defaultDirtyBytesValue, (byte) 0);
- JsonNode defaultDirtyJsonValue = JsonNodeFactory.instance
- .binaryNode(defaultDirtyBytesValue);
Field dirtyBits = new Field(DIRTY_BYTES_FIELD_NAME,
Schema.create(Type.BYTES),
"Bytes used to represent weather or not a field is dirty.",
- defaultDirtyJsonValue);
+ defaultDirtyBytesValue);
newFields.add(dirtyBits);
for (Field originalField : originalFields) {
// recursively add dirty support
Field newField = new Field(originalField.name(),
getSchemaWithDirtySupport(originalField.schema(),queue),
- originalField.doc(), originalField.defaultValue(),
+ originalField.doc(), originalField.defaultVal(),
originalField.order());
newFields.add(newField);
}
diff --git
a/gora-couchdb/src/main/java/org/apache/gora/couchdb/store/CouchDBStore.java
b/gora-couchdb/src/main/java/org/apache/gora/couchdb/store/CouchDBStore.java
index a81a0ab..5207855 100644
--- a/gora-couchdb/src/main/java/org/apache/gora/couchdb/store/CouchDBStore.java
+++ b/gora-couchdb/src/main/java/org/apache/gora/couchdb/store/CouchDBStore.java
@@ -138,7 +138,7 @@ public class CouchDBStore<K, T extends PersistentBase>
extends DataStoreBase<K,
mapping = builder.build();
final ObjectMapperFactory myObjectMapperFactory = new
CouchDBObjectMapperFactory();
-
myObjectMapperFactory.createObjectMapper().addMixInAnnotations(persistentClass,
CouchDbDocument.class);
+ myObjectMapperFactory.createObjectMapper().addMixIn(persistentClass,
CouchDbDocument.class);
db = new StdCouchDbConnector(mapping.getDatabaseName(), dbInstance,
myObjectMapperFactory);
db.createDatabaseIfNotExists();
diff --git a/gora-goraci/src/main/java/org/apache/gora/goraci/Generator.java
b/gora-goraci/src/main/java/org/apache/gora/goraci/Generator.java
index c13f4c9..bb9935c 100644
--- a/gora-goraci/src/main/java/org/apache/gora/goraci/Generator.java
+++ b/gora-goraci/src/main/java/org/apache/gora/goraci/Generator.java
@@ -318,9 +318,9 @@ public class Generator extends Configured implements Tool {
public int run(int numMappers, long numNodes, boolean concurrent) throws
Exception {
LOG.info("Running Generator with numMappers={}, numNodes={}", numMappers,
numNodes);
-
- Job job = new Job(getConf());
-
+
+ Job job = Job.getInstance(getConf());
+
job.setJobName("Link Generator");
job.setNumReduceTasks(0);
job.setJarByClass(getClass());
diff --git a/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
b/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
index b922411..8a68767 100644
--- a/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
+++ b/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
@@ -196,7 +196,7 @@ public class Verify extends Configured implements Tool {
DataStore<Long,CINode> store = DataStoreFactory.getDataStore(Long.class,
CINode.class, new Configuration());
- job = new Job(getConf());
+ job = Job.getInstance(getConf());
if
(!job.getConfiguration().get("io.serializations").contains("org.apache.hadoop.io.serializer.JavaSerialization"))
{
job.getConfiguration().set("io.serializations",
job.getConfiguration().get("io.serializations") +
",org.apache.hadoop.io.serializer.JavaSerialization");
diff --git
a/gora-goraci/src/main/java/org/apache/gora/goraci/chef/ChefSoftwareProvisioning.java
b/gora-goraci/src/main/java/org/apache/gora/goraci/chef/ChefSoftwareProvisioning.java
index 0e548e3..e4562ca 100644
---
a/gora-goraci/src/main/java/org/apache/gora/goraci/chef/ChefSoftwareProvisioning.java
+++
b/gora-goraci/src/main/java/org/apache/gora/goraci/chef/ChefSoftwareProvisioning.java
@@ -31,7 +31,8 @@ import
org.apache.gora.goraci.rackspace.RackspaceOrchestration;
import org.apache.gora.memory.store.MemStore;
import org.apache.gora.store.DataStoreFactory;
import org.jclouds.ContextBuilder;
-import org.jclouds.chef.ChefContext;
+import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefProperties;
import org.jclouds.chef.domain.BootstrapConfig;
import org.jclouds.chef.domain.CookbookVersion;
@@ -106,11 +107,11 @@ public class ChefSoftwareProvisioning {
chefConfig.put(ChefProperties.CHEF_VALIDATOR_CREDENTIAL,
validatorCredential);
// Create the connection to the Chef server
- ChefContext chefContext = ContextBuilder.newBuilder("chef")
+ ChefApi chefApi = ContextBuilder.newBuilder(new ChefApiMetadata())
.endpoint("https://api.opscode.com/organizations/"; + organization)
.credentials(client, credential)
.overrides(chefConfig)
- .buildView(ChefContext.class);
+ .buildApi(ChefApi.class);
// Create the connection to the compute provider. Note that ssh will be
used to bootstrap chef
ComputeServiceContext computeContext =
ContextBuilder.newBuilder(rsContinent)
@@ -129,7 +130,7 @@ public class ChefSoftwareProvisioning {
// Check to see if the recipe you want exists
List<String> runlist = null;
Iterable< ? extends CookbookVersion> cookbookVersions =
- chefContext.getChefService().listCookbookVersions();
+ chefApi.chefService().listCookbookVersions();
if (any(cookbookVersions,
CookbookVersionPredicates.containsRecipe(recipe))) {
runlist = new RunListBuilder().addRecipe(recipe).build();
}
@@ -141,10 +142,10 @@ public class ChefSoftwareProvisioning {
// Update the chef service with the run list you wish to apply to all
nodes in the group
// and also provide the json configuration used to customize the desired
values
BootstrapConfig config =
BootstrapConfig.builder().runList(runlist).attributes(attributes).build();
- chefContext.getChefService().updateBootstrapConfigForGroup(group, config);
+ chefApi.chefService().updateBootstrapConfigForGroup(group, config);
// Build the script that will bootstrap the node
- Statement bootstrap =
chefContext.getChefService().createBootstrapScriptForGroup(group);
+ Statement bootstrap =
chefApi.chefService().createBootstrapScriptForGroup(group);
TemplateBuilder templateBuilder =
computeContext.getComputeService().templateBuilder();
templateBuilder.options(runScript(bootstrap));
@@ -161,7 +162,7 @@ public class ChefSoftwareProvisioning {
}
// Release resources
- chefContext.close();
+ chefApi.close();
computeContext.close();
}
diff --git
a/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java
b/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java
index f02e061..f66a58e 100644
---
a/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java
+++
b/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.apache.gora.memory.store.MemStore;
import org.apache.gora.store.DataStoreFactory;
import org.jclouds.ContextBuilder;
-import org.jclouds.chef.ChefContext;
import org.jclouds.chef.config.ChefProperties;
import org.jclouds.chef.domain.BootstrapConfig;
import org.jclouds.chef.domain.CookbookVersion;
diff --git
a/gora-infinispan/src/test/java/org/apache/gora/infinispan/SimulationDriver.java
b/gora-infinispan/src/test/java/org/apache/gora/infinispan/SimulationDriver.java
index 4bde737..c3f44ad 100644
---
a/gora-infinispan/src/test/java/org/apache/gora/infinispan/SimulationDriver.java
+++
b/gora-infinispan/src/test/java/org/apache/gora/infinispan/SimulationDriver.java
@@ -106,7 +106,6 @@ public class SimulationDriver extends
MultipleCacheManagersTest {
// Create appropriate caches at each node.
ConfigurationBuilder builder =
hotRodCacheConfiguration(getDefaultClusteredCacheConfig(CacheMode.DIST_SYNC,
false));
builder.indexing()
- .enable()
.index(Index.LOCAL)
.addProperty("default.directory_provider", "ram")
.addProperty("hibernate.search.default.exclusive_index_use","true")
diff --git
a/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
b/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
index 5747346..e89aa20 100644
--- a/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
+++ b/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
@@ -137,7 +137,7 @@ public class LogAnalytics extends Configured implements
Tool {
*/
public Job createJob(DataStore<Long, Pageview> inStore,
DataStore<String, MetricDatum> outStore, int numReducer) throws
IOException {
- Job job = new Job(getConf());
+ Job job = Job.getInstance(getConf());
job.setJobName("Log Analytics");
log.info("Creating Hadoop Job: {}", job.getJobName());
job.setNumReduceTasks(numReducer);
