This is an automated email from the ASF dual-hosted git repository.
wlo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 10b6eb21b [GOBBLIN1893] Upgrade Guava to 21.0.0 (#3757)
10b6eb21b is described below
commit 10b6eb21b72167fa29d7e54d9f79af4fb9b4a445
Author: umustafi <[email protected]>
AuthorDate: Thu Aug 31 16:13:29 2023 -0700
[GOBBLIN1893] Upgrade Guava to 21.0.0 (#3757)
* Upgrade guava version from 20 to 21
* Fix build errors from deprecated method
* Upgrade curator from 2.10.0 to 2.12.0
---------
Co-authored-by: Urmi Mustafi <[email protected]>
---
bin/gobblin-compaction.sh | 2 +-
conf/aws/application.conf | 2 +-
.../org/apache/gobblin/aws/GobblinAWSConfigurationKeys.java | 2 +-
.../src/test/resources/GobblinAWSClusterLauncherTest.conf | 2 +-
.../gobblin/data/management/copy/replication/CopyRoute.java | 4 ++--
.../data/management/copy/replication/DataFlowTopology.java | 6 +++---
.../management/copy/replication/HadoopFsReplicaConfig.java | 4 ++--
.../management/copy/replication/ReplicaHadoopFsEndPoint.java | 4 ++--
.../data/management/copy/replication/ReplicationMetaData.java | 4 ++--
.../management/copy/replication/SourceHadoopFsEndPoint.java | 4 ++--
.../replication/WatermarkMetadataGenerationCommitStep.java | 4 ++--
.../java/org/apache/gobblin/hive/spec/SimpleHiveSpec.java | 4 ++--
.../java/org/apache/gobblin/hive/spec/SimpleHiveSpecTest.java | 4 ++--
.../src/main/java/org/apache/gobblin/runtime/JobContext.java | 4 ++--
.../org/apache/gobblin/runtime/api/JobCatalogListener.java | 11 +++++------
.../org/apache/gobblin/runtime/api/JobExecutionState.java | 4 ++--
.../apache/gobblin/runtime/api/JobExecutionStateListener.java | 9 ++++-----
.../org/apache/gobblin/runtime/api/JobLifecycleListener.java | 4 ++--
.../apache/gobblin/runtime/api/JobSpecSchedulerListener.java | 9 ++++-----
.../org/apache/gobblin/runtime/api/SpecCatalogListener.java | 9 ++++-----
gradle/scripts/dependencyDefinitions.gradle | 10 +++++-----
21 files changed, 51 insertions(+), 55 deletions(-)
diff --git a/bin/gobblin-compaction.sh b/bin/gobblin-compaction.sh
index 1924f385a..39d3d7cf3 100755
--- a/bin/gobblin-compaction.sh
+++ b/bin/gobblin-compaction.sh
@@ -131,7 +131,7 @@ else
$FWDIR_LIB/gobblin-api-$GOBBLIN_VERSION.jar
$FWDIR_LIB/gobblin-compaction-$GOBBLIN_VERSION.jar
$FWDIR_LIB/gobblin-utility-$GOBBLIN_VERSION.jar
- $FWDIR_LIB/guava-20.0.jar
+ $FWDIR_LIB/guava-21.0.jar
)
LIBJARS=$(join , "${LIBJARS[@]}")
diff --git a/conf/aws/application.conf b/conf/aws/application.conf
index ccbf3ba86..c37895051 100644
--- a/conf/aws/application.conf
+++ b/conf/aws/application.conf
@@ -159,7 +159,7 @@
gobblin.aws.master.s3.jars.uri="https://s3-us-west-2.amazonaws.com/gobblin-libs/
## All Gobblin Jars and Configuration on S3
gobblin.aws.master.s3.conf.files="application.conf,log4j.properties,quartz.properties"
gobblin.aws.master.s3.jars.uri="https://s3-us-west-2.amazonaws.com/gobblin-libs/latest-jars/";
-gobblin.aws.master.s3.jars.files="ST4-4.0.4.jar,activation-1.1.1.jar,annotations-2.0.1.jar,ant-1.9.1.jar,ant-launcher-1.9.1.jar,antlr-runtime-3.5.2.jar,aopalliance-1.0.jar,apache-log4j-extras-1.2.17.jar,asm-3.1.jar,asm-commons-3.1.jar,asm-tree-3.1.jar,avro-1.7.7.jar,avro-ipc-1.7.7-tests.jar,avro-ipc-1.7.7.jar,avro-mapred-1.7.7-hadoop2.jar,aws-java-sdk-applicationautoscaling-1.11.8.jar,aws-java-sdk-autoscaling-1.11.8.jar,aws-java-sdk-core-1.11.8.jar,aws-java-sdk-ec2-1.11.8.jar,aws-java-sd
[...]
+gobblin.aws.master.s3.jars.files="ST4-4.0.4.jar,activation-1.1.1.jar,annotations-2.0.1.jar,ant-1.9.1.jar,ant-launcher-1.9.1.jar,antlr-runtime-3.5.2.jar,aopalliance-1.0.jar,apache-log4j-extras-1.2.17.jar,asm-3.1.jar,asm-commons-3.1.jar,asm-tree-3.1.jar,avro-1.7.7.jar,avro-ipc-1.7.7-tests.jar,avro-ipc-1.7.7.jar,avro-mapred-1.7.7-hadoop2.jar,aws-java-sdk-applicationautoscaling-1.11.8.jar,aws-java-sdk-autoscaling-1.11.8.jar,aws-java-sdk-core-1.11.8.jar,aws-java-sdk-ec2-1.11.8.jar,aws-java-sd
[...]
gobblin.aws.worker.s3.conf.uri=${gobblin.aws.master.s3.conf.uri}
gobblin.aws.worker.s3.conf.files=${gobblin.aws.master.s3.conf.files}
diff --git
a/gobblin-aws/src/main/java/org/apache/gobblin/aws/GobblinAWSConfigurationKeys.java
b/gobblin-aws/src/main/java/org/apache/gobblin/aws/GobblinAWSConfigurationKeys.java
index c44d15c41..bd9bae2c8 100644
---
a/gobblin-aws/src/main/java/org/apache/gobblin/aws/GobblinAWSConfigurationKeys.java
+++
b/gobblin-aws/src/main/java/org/apache/gobblin/aws/GobblinAWSConfigurationKeys.java
@@ -129,7 +129,7 @@ public class GobblinAWSConfigurationKeys {
// of an occurrence of this bug in the JDK and how resolving it reduced the
size of the JDK by 1 megabyte.
public static final String DEFAULT_MASTER_S3_JARS_FILES;
static {
- DEFAULT_MASTER_S3_JARS_FILES =
"ST4-4.0.4.jar,activation-1.1.1.jar,annotations-2.0.1.jar,ant-1.9.1.jar,ant-launcher-1.9.1.jar,antlr-runtime-3.5.2.jar,aopalliance-1.0.jar,apache-log4j-extras-1.2.17.jar,asm-3.1.jar,asm-commons-3.1.jar,asm-tree-3.1.jar,avro-1.7.7.jar,avro-ipc-1.7.7-tests.jar,avro-ipc-1.7.7.jar,avro-mapred-1.7.7-hadoop2.jar,aws-java-sdk-applicationautoscaling-1.11.8.jar,aws-java-sdk-autoscaling-1.11.8.jar,aws-java-sdk-core-1.11.8.jar,aws-java-sdk-ec2-1.11.8.jar,aws-java-
[...]
+ DEFAULT_MASTER_S3_JARS_FILES =
"ST4-4.0.4.jar,activation-1.1.1.jar,annotations-2.0.1.jar,ant-1.9.1.jar,ant-launcher-1.9.1.jar,antlr-runtime-3.5.2.jar,aopalliance-1.0.jar,apache-log4j-extras-1.2.17.jar,asm-3.1.jar,asm-commons-3.1.jar,asm-tree-3.1.jar,avro-1.7.7.jar,avro-ipc-1.7.7-tests.jar,avro-ipc-1.7.7.jar,avro-mapred-1.7.7-hadoop2.jar,aws-java-sdk-applicationautoscaling-1.11.8.jar,aws-java-sdk-autoscaling-1.11.8.jar,aws-java-sdk-core-1.11.8.jar,aws-java-sdk-ec2-1.11.8.jar,aws-java-
[...]
}
// Gobblin AWS worker configuration properties.
diff --git a/gobblin-aws/src/test/resources/GobblinAWSClusterLauncherTest.conf
b/gobblin-aws/src/test/resources/GobblinAWSClusterLauncherTest.conf
index 444109b31..3bcbf009d 100644
--- a/gobblin-aws/src/test/resources/GobblinAWSClusterLauncherTest.conf
+++ b/gobblin-aws/src/test/resources/GobblinAWSClusterLauncherTest.conf
@@ -152,7 +152,7 @@
gobblin.aws.master.s3.jars.uri="https://s3-us-west-2.amazonaws.com/gobblin-libs/
## All Gobblin Jars and Configuration on S3
gobblin.aws.master.s3.conf.files="application.conf,log4j-aws.properties,quartz.properties"
gobblin.aws.master.s3.jars.uri="https://s3-us-west-2.amazonaws.com/gobblin-libs/latest-jars/";
-gobblin.aws.master.s3.jars.files="ST4-4.0.4.jar,activation-1.1.1.jar,annotations-2.0.1.jar,ant-1.9.1.jar,ant-launcher-1.9.1.jar,antlr-runtime-3.5.2.jar,aopalliance-1.0.jar,apache-log4j-extras-1.2.17.jar,asm-3.1.jar,asm-commons-3.1.jar,asm-tree-3.1.jar,avro-1.7.7.jar,avro-ipc-1.7.7-tests.jar,avro-ipc-1.7.7.jar,avro-mapred-1.7.7-hadoop2.jar,aws-java-sdk-applicationautoscaling-1.11.8.jar,aws-java-sdk-autoscaling-1.11.8.jar,aws-java-sdk-core-1.11.8.jar,aws-java-sdk-ec2-1.11.8.jar,aws-java-sd
[...]
+gobblin.aws.master.s3.jars.files="ST4-4.0.4.jar,activation-1.1.1.jar,annotations-2.0.1.jar,ant-1.9.1.jar,ant-launcher-1.9.1.jar,antlr-runtime-3.5.2.jar,aopalliance-1.0.jar,apache-log4j-extras-1.2.17.jar,asm-3.1.jar,asm-commons-3.1.jar,asm-tree-3.1.jar,avro-1.7.7.jar,avro-ipc-1.7.7-tests.jar,avro-ipc-1.7.7.jar,avro-mapred-1.7.7-hadoop2.jar,aws-java-sdk-applicationautoscaling-1.11.8.jar,aws-java-sdk-autoscaling-1.11.8.jar,aws-java-sdk-core-1.11.8.jar,aws-java-sdk-ec2-1.11.8.jar,aws-java-sd
[...]
gobblin.aws.worker.s3.conf.uri=${gobblin.aws.master.s3.conf.uri}
gobblin.aws.worker.s3.conf.files=${gobblin.aws.master.s3.conf.files}
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/CopyRoute.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/CopyRoute.java
index 9f2f107b1..0b09bdf2b 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/CopyRoute.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/CopyRoute.java
@@ -17,7 +17,7 @@
package org.apache.gobblin.data.management.copy.replication;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -31,7 +31,7 @@ public class CopyRoute {
@Override
public String toString() {
- return Objects.toStringHelper(this.getClass()).add("copyFrom",
this.getCopyFrom()).add("copyTo", this.getCopyTo())
+ return MoreObjects.toStringHelper(this.getClass()).add("copyFrom",
this.getCopyFrom()).add("copyTo", this.getCopyTo())
.toString();
}
}
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/DataFlowTopology.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/DataFlowTopology.java
index fc900449c..30b382127 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/DataFlowTopology.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/DataFlowTopology.java
@@ -22,7 +22,7 @@ import java.util.List;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import lombok.Data;
@@ -64,7 +64,7 @@ public class DataFlowTopology {
}
};
- return Objects.toStringHelper(this.getClass())
+ return MoreObjects.toStringHelper(this.getClass())
.add("dataFlows:",
Joiner.on(",").join(Lists.transform(this.dataFlowPaths, func))).toString();
}
@@ -83,7 +83,7 @@ public class DataFlowTopology {
}
};
- return Objects.toStringHelper(this.getClass())
+ return MoreObjects.toStringHelper(this.getClass())
.add("copyPairs:",
Joiner.on(",").join(Lists.transform(this.copyRoutes, func))).toString();
}
}
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/HadoopFsReplicaConfig.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/HadoopFsReplicaConfig.java
index 57535f90d..9324589af 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/HadoopFsReplicaConfig.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/HadoopFsReplicaConfig.java
@@ -22,7 +22,7 @@ import java.net.URISyntaxException;
import org.apache.hadoop.fs.Path;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.typesafe.config.Config;
@@ -70,7 +70,7 @@ public class HadoopFsReplicaConfig {
@Override
public String toString() {
- return Objects.toStringHelper(this.getClass()).add("colo",
this.colo).add("name", this.clustername)
+ return MoreObjects.toStringHelper(this.getClass()).add("colo",
this.colo).add("name", this.clustername)
.add("FilesystemURI", this.fsURI).add("rootPath",
this.path).toString();
}
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicaHadoopFsEndPoint.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicaHadoopFsEndPoint.java
index 024b23926..41e46647f 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicaHadoopFsEndPoint.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicaHadoopFsEndPoint.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import com.google.common.base.Charsets;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.io.CharStreams;
@@ -144,7 +144,7 @@ public class ReplicaHadoopFsEndPoint extends
HadoopFsEndPoint {
@Override
public String toString() {
- return Objects.toStringHelper(this.getClass())
+ return MoreObjects.toStringHelper(this.getClass())
.add("is source", this.isSource())
.add("end point name", this.getEndPointName())
.add("hadoopfs config", this.rc)
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicationMetaData.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicationMetaData.java
index 5fe63aab4..3f4c317f9 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicationMetaData.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/ReplicationMetaData.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigValue;
@@ -60,6 +60,6 @@ public class ReplicationMetaData {
public String toString() {
Joiner.MapJoiner mapJoiner = Joiner.on(',').withKeyValueSeparator("=");
- return Objects.toStringHelper(this.getClass()).add("metadata",
mapJoiner.join(this.values.get())).toString();
+ return MoreObjects.toStringHelper(this.getClass()).add("metadata",
mapJoiner.join(this.values.get())).toString();
}
}
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/SourceHadoopFsEndPoint.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/SourceHadoopFsEndPoint.java
index 2137d7754..d74a434e1 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/SourceHadoopFsEndPoint.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/SourceHadoopFsEndPoint.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.typesafe.config.Config;
@@ -119,7 +119,7 @@ public class SourceHadoopFsEndPoint extends
HadoopFsEndPoint {
@Override
public String toString() {
- return Objects.toStringHelper(this.getClass())
+ return MoreObjects.toStringHelper(this.getClass())
.add("is source", this.isSource())
.add("end point name", this.getEndPointName())
.add("hadoopfs config", this.rc)
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/WatermarkMetadataGenerationCommitStep.java
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/WatermarkMetadataGenerationCommitStep.java
index 0d6b259af..38370f0de 100644
---
a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/WatermarkMetadataGenerationCommitStep.java
+++
b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/replication/WatermarkMetadataGenerationCommitStep.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import com.google.common.base.Charsets;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import org.apache.gobblin.commit.CommitStep;
import org.apache.gobblin.source.extractor.Watermark;
@@ -57,7 +57,7 @@ public class WatermarkMetadataGenerationCommitStep implements
CommitStep {
@Override
public String toString(){
- return Objects.toStringHelper(this.getClass())
+ return MoreObjects.toStringHelper(this.getClass())
.add("metafile",new Path(this.targetDirPath,
ReplicaHadoopFsEndPoint.WATERMARK_FILE))
.add("file system uri", this.fsUriString)
.add("watermark class", this.watermark.getClass().getCanonicalName())
diff --git
a/gobblin-hive-registration/src/main/java/org/apache/gobblin/hive/spec/SimpleHiveSpec.java
b/gobblin-hive-registration/src/main/java/org/apache/gobblin/hive/spec/SimpleHiveSpec.java
index a455d7e74..e78f65c58 100644
---
a/gobblin-hive-registration/src/main/java/org/apache/gobblin/hive/spec/SimpleHiveSpec.java
+++
b/gobblin-hive-registration/src/main/java/org/apache/gobblin/hive/spec/SimpleHiveSpec.java
@@ -17,9 +17,9 @@
package org.apache.gobblin.hive.spec;
+import com.google.common.base.MoreObjects;
import org.apache.hadoop.fs.Path;
-import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
@@ -71,7 +71,7 @@ public class SimpleHiveSpec
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("path",
this.path.toString())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("path",
this.path.toString())
.add("db", this.table.getDbName()).add("table",
this.table.getTableName())
.add("partition", this.partition.orNull()).toString();
}
diff --git
a/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/spec/SimpleHiveSpecTest.java
b/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/spec/SimpleHiveSpecTest.java
index ceffe9d48..decb6a5bf 100644
---
a/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/spec/SimpleHiveSpecTest.java
+++
b/gobblin-hive-registration/src/test/java/org/apache/gobblin/hive/spec/SimpleHiveSpecTest.java
@@ -17,7 +17,7 @@
package org.apache.gobblin.hive.spec;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import org.apache.gobblin.hive.HiveTable;
import org.apache.gobblin.hive.spec.activity.DropPartitionActivity;
@@ -59,7 +59,7 @@ public class SimpleHiveSpecTest {
Assert.assertEquals(0, simpleHiveSpec.getPredicates().size());
Assert.assertEquals(Optional.absent(), simpleHiveSpec.getPartition());
- String actualString =
Objects.toStringHelper(simpleHiveSpec).omitNullValues().add("path", pathString)
+ String actualString =
MoreObjects.toStringHelper(simpleHiveSpec).omitNullValues().add("path",
pathString)
.add("db", dbName).add("table", tableName)
.add("partition", Optional.absent().orNull()).toString();
Assert.assertEquals(actualString, simpleHiveSpec.toString());
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/JobContext.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/JobContext.java
index dd90a44cc..5c6eb3eae 100644
--- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/JobContext.java
+++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/JobContext.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -551,7 +551,7 @@ public class JobContext implements Closeable {
@Override
public String toString() {
- return
Objects.toStringHelper(JobContext.class.getSimpleName()).add("jobName",
getJobName())
+ return
MoreObjects.toStringHelper(JobContext.class.getSimpleName()).add("jobName",
getJobName())
.add("jobId", getJobId()).add("jobState", getJobState()).toString();
}
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalogListener.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalogListener.java
index 7ef97e62f..b1d25807b 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalogListener.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalogListener.java
@@ -16,10 +16,9 @@
*/
package org.apache.gobblin.runtime.api;
+import com.google.common.base.MoreObjects;
import java.net.URI;
-import com.google.common.base.Objects;
-
import org.apache.gobblin.annotation.Alpha;
import org.apache.gobblin.util.callbacks.Callback;
@@ -49,7 +48,7 @@ public interface JobCatalogListener {
public static class AddJobCallback extends Callback<JobCatalogListener,
Void> {
private final JobSpec _addedJob;
public AddJobCallback(JobSpec addedJob) {
- super(Objects.toStringHelper("onAddJob").add("addedJob",
addedJob).toString());
+ super(MoreObjects.toStringHelper("onAddJob").add("addedJob",
addedJob).toString());
_addedJob = addedJob;
}
@@ -65,7 +64,7 @@ public interface JobCatalogListener {
private final String _deletedJobVersion;
public DeleteJobCallback(URI deletedJobURI, String deletedJobVersion) {
- super(Objects.toStringHelper("onDeleteJob")
+ super(MoreObjects.toStringHelper("onDeleteJob")
.add("deletedJobURI", deletedJobURI)
.add("deletedJobVersion", deletedJobVersion)
.toString());
@@ -83,7 +82,7 @@ public interface JobCatalogListener {
private final URI _cancelledJobURI;
public CancelJobCallback(URI cancelledJobURI) {
- super(Objects.toStringHelper("onCancelJob").add("cancelJob",
cancelledJobURI).toString());
+ super(MoreObjects.toStringHelper("onCancelJob").add("cancelJob",
cancelledJobURI).toString());
_cancelledJobURI = cancelledJobURI;
}
@@ -97,7 +96,7 @@ public interface JobCatalogListener {
public static class UpdateJobCallback extends Callback<JobCatalogListener,
Void> {
private final JobSpec _updatedJob;
public UpdateJobCallback(JobSpec updatedJob) {
- super(Objects.toStringHelper("onUpdateJob")
+ super(MoreObjects.toStringHelper("onUpdateJob")
.add("updatedJob", updatedJob).toString());
_updatedJob = updatedJob;
}
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionState.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionState.java
index 03f2d4e9d..f85e4473b 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionState.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionState.java
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
@@ -108,7 +108,7 @@ public class JobExecutionState implements
JobExecutionStatus {
@Override public String toString() {
this.changeLock.lock();
try {
- return Objects.toStringHelper(JobExecutionState.class.getSimpleName())
+ return
MoreObjects.toStringHelper(JobExecutionState.class.getSimpleName())
.add("jobExecution", this.jobExecution)
.add("runningState", this.runningState)
.add("stage", this.stage)
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionStateListener.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionStateListener.java
index 5147db006..364c7c70a 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionStateListener.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobExecutionStateListener.java
@@ -16,8 +16,7 @@
*/
package org.apache.gobblin.runtime.api;
-import com.google.common.base.Objects;
-
+import com.google.common.base.MoreObjects;
import org.apache.gobblin.runtime.JobState;
import org.apache.gobblin.runtime.JobState.RunningState;
import org.apache.gobblin.util.callbacks.Callback;
@@ -41,7 +40,7 @@ public interface JobExecutionStateListener {
public StatusChangeCallback(final JobExecutionState state,
final RunningState previousStatus,
final RunningState newStatus) {
- super(Objects.toStringHelper("onStatusChange")
+ super(MoreObjects.toStringHelper("onStatusChange")
.add("state", state)
.add("previousStatus", previousStatus)
.add("newStatus", newStatus)
@@ -67,7 +66,7 @@ public interface JobExecutionStateListener {
public StageTransitionCallback(final JobExecutionState state, final String
previousStage,
final String newStage) {
- super(Objects.toStringHelper("onStageTransition")
+ super(MoreObjects.toStringHelper("onStageTransition")
.add("state", state)
.add("previousStage", previousStage)
.add("newStage", newStage)
@@ -94,7 +93,7 @@ public interface JobExecutionStateListener {
public MetadataChangeCallback(final JobExecutionState state, final String
key,
final Object oldValue, final Object
newValue) {
- super(Objects.toStringHelper("onMetadataChange")
+ super(MoreObjects.toStringHelper("onMetadataChange")
.add("state", state)
.add("key", key)
.add("oldValue", oldValue)
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobLifecycleListener.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobLifecycleListener.java
index 0ff70db7a..4d7090a8c 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobLifecycleListener.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobLifecycleListener.java
@@ -16,7 +16,7 @@
*/
package org.apache.gobblin.runtime.api;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import org.apache.gobblin.annotation.Alpha;
@@ -36,7 +36,7 @@ public interface JobLifecycleListener
private final JobExecutionDriver _jobDriver;
public JobLaunchCallback(JobExecutionDriver jobDriver) {
- super(Objects.toStringHelper("onJobLaunch").add("jobDriver",
jobDriver).toString());
+ super(MoreObjects.toStringHelper("onJobLaunch").add("jobDriver",
jobDriver).toString());
Preconditions.checkNotNull(jobDriver);
_jobDriver = jobDriver;
}
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobSpecSchedulerListener.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobSpecSchedulerListener.java
index 719adf6a1..6a9f80208 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobSpecSchedulerListener.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobSpecSchedulerListener.java
@@ -16,8 +16,7 @@
*/
package org.apache.gobblin.runtime.api;
-import com.google.common.base.Objects;
-
+import com.google.common.base.MoreObjects;
import org.apache.gobblin.util.callbacks.Callback;
/**
@@ -37,7 +36,7 @@ public interface JobSpecSchedulerListener {
private final JobSpecSchedule _jobSchedule;
public JobScheduledCallback(JobSpecSchedule jobSchedule) {
- super(Objects.toStringHelper("onJobScheduled").add("jobSchedule",
jobSchedule).toString());
+ super(MoreObjects.toStringHelper("onJobScheduled").add("jobSchedule",
jobSchedule).toString());
_jobSchedule = jobSchedule;
}
@@ -51,7 +50,7 @@ public interface JobSpecSchedulerListener {
private final JobSpecSchedule _jobSchedule;
public JobUnscheduledCallback(JobSpecSchedule jobSchedule) {
- super(Objects.toStringHelper("onJobUnscheduled").add("jobSchedule",
jobSchedule).toString());
+ super(MoreObjects.toStringHelper("onJobUnscheduled").add("jobSchedule",
jobSchedule).toString());
_jobSchedule = jobSchedule;
}
@@ -65,7 +64,7 @@ public interface JobSpecSchedulerListener {
private final JobSpec _jobSpec;
public JobTriggeredCallback(JobSpec jobSpec) {
- super(Objects.toStringHelper("onJobTriggered").add("jobSpec",
jobSpec).toString());
+ super(MoreObjects.toStringHelper("onJobTriggered").add("jobSpec",
jobSpec).toString());
_jobSpec = jobSpec;
}
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalogListener.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalogListener.java
index 6bf61a1e6..e79223ab7 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalogListener.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalogListener.java
@@ -17,11 +17,10 @@
package org.apache.gobblin.runtime.api;
+import com.google.common.base.MoreObjects;
import java.net.URI;
import java.util.Properties;
-import com.google.common.base.Objects;
-
import org.apache.gobblin.runtime.spec_catalog.AddSpecResponse;
import org.apache.gobblin.util.callbacks.Callback;
@@ -44,7 +43,7 @@ public interface SpecCatalogListener {
public static class AddSpecCallback extends Callback<SpecCatalogListener,
AddSpecResponse> {
private final Spec _addedSpec;
public AddSpecCallback(Spec addedSpec) {
- super(Objects.toStringHelper("onAddSpec").add("addedSpec",
addedSpec).toString());
+ super(MoreObjects.toStringHelper("onAddSpec").add("addedSpec",
addedSpec).toString());
_addedSpec = addedSpec;
}
@@ -61,7 +60,7 @@ public interface SpecCatalogListener {
private final Properties _headers;
public DeleteSpecCallback(URI deletedSpecURI, String deletedSpecVersion,
Properties headers) {
- super(Objects.toStringHelper("onDeleteSpec")
+ super(MoreObjects.toStringHelper("onDeleteSpec")
.add("deletedSpecURI", deletedSpecURI)
.add("deletedSpecVersion", deletedSpecVersion)
.toString());
@@ -79,7 +78,7 @@ public interface SpecCatalogListener {
public static class UpdateSpecCallback extends Callback<SpecCatalogListener,
Void> {
private final Spec _updatedSpec;
public UpdateSpecCallback(Spec updatedSpec) {
- super(Objects.toStringHelper("onUpdateSpec")
+ super(MoreObjects.toStringHelper("onUpdateSpec")
.add("updatedSpec", updatedSpec).toString());
_updatedSpec = updatedSpec;
}
diff --git a/gradle/scripts/dependencyDefinitions.gradle
b/gradle/scripts/dependencyDefinitions.gradle
index d7814e43f..095aed605 100644
--- a/gradle/scripts/dependencyDefinitions.gradle
+++ b/gradle/scripts/dependencyDefinitions.gradle
@@ -51,7 +51,7 @@ ext.externalDependency = [
"datanucleusRdbms": "org.datanucleus:datanucleus-rdbms:3.2.9",
"errorProne": "com.google.errorprone:error_prone_annotations:2.0.15",
"eventhub": "com.microsoft.azure:azure-eventhubs:0.9.0",
- "guava": "com.google.guava:guava:20.0",
+ "guava": "com.google.guava:guava:21.0",
"groovy": "org.codehaus.groovy:groovy:2.4.8",
"gson": "com.google.code.gson:gson:2.6.2",
"gsonJavatimeSerialisers":
"com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.1",
@@ -146,10 +146,10 @@ ext.externalDependency = [
"calciteCore": "org.apache.calcite:calcite-core:1.16.0",
"calciteAvatica": "org.apache.calcite:calcite-avatica:1.13.0",
"jhyde": "net.hydromatic:aggdesigner-algorithm:6.0",
- "curatorFramework": "org.apache.curator:curator-framework:2.10.0",
- "curatorRecipes": "org.apache.curator:curator-recipes:2.10.0",
- "curatorClient": "org.apache.curator:curator-client:2.10.0",
- "curatorTest": "org.apache.curator:curator-test:2.10.0",
+ "curatorFramework": "org.apache.curator:curator-framework:2.12.0",
+ "curatorRecipes": "org.apache.curator:curator-recipes:2.12.0",
+ "curatorClient": "org.apache.curator:curator-client:2.12.0",
+ "curatorTest": "org.apache.curator:curator-test:2.12.0",
"hamcrest": "org.hamcrest:hamcrest-all:1.3",
"joptSimple": "net.sf.jopt-simple:jopt-simple:4.9",
"protobuf": "com.google.protobuf:protobuf-java:3.6.1",
