You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by na...@apache.org on 2016/02/03 23:50:55 UTC
samza git commit: SAMZA-853 : Use Optional class from guava instead
of elasticsearch
Repository: samza
Updated Branches:
refs/heads/master fc303e559 -> 73a939554
SAMZA-853 : Use Optional class from guava instead of elasticsearch
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/73a93955
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/73a93955
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/73a93955
Branch: refs/heads/master
Commit: 73a939554c04a8725549fa8d954632d8ebdb2905
Parents: fc303e5
Author: Vadim Chekan <k....@gmail.com>
Authored: Wed Feb 3 14:48:27 2016 -0800
Committer: Navina <na...@gmail.com>
Committed: Wed Feb 3 14:48:27 2016 -0800
----------------------------------------------------------------------
build.gradle | 1 +
.../src/main/java/org/apache/samza/config/ElasticsearchConfig.java | 2 +-
.../elasticsearch/indexrequest/DefaultIndexRequestFactory.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/73a93955/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0541def..16facbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -199,6 +199,7 @@ project(':samza-elasticsearch') {
compile project(':samza-api')
compile project(":samza-core_$scalaVersion")
compile "org.elasticsearch:elasticsearch:$elasticsearchVersion"
+ compile "com.google.guava:guava:$guavaVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
testCompile "junit:junit:$junitVersion"
testCompile "org.mockito:mockito-all:$mockitoVersion"
http://git-wip-us.apache.org/repos/asf/samza/blob/73a93955/samza-elasticsearch/src/main/java/org/apache/samza/config/ElasticsearchConfig.java
----------------------------------------------------------------------
diff --git a/samza-elasticsearch/src/main/java/org/apache/samza/config/ElasticsearchConfig.java b/samza-elasticsearch/src/main/java/org/apache/samza/config/ElasticsearchConfig.java
index 6091feb..75bf4c7 100644
--- a/samza-elasticsearch/src/main/java/org/apache/samza/config/ElasticsearchConfig.java
+++ b/samza-elasticsearch/src/main/java/org/apache/samza/config/ElasticsearchConfig.java
@@ -20,7 +20,7 @@
package org.apache.samza.config;
import org.apache.samza.SamzaException;
-import org.elasticsearch.common.base.Optional;
+import com.google.common.base.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/samza/blob/73a93955/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactory.java
----------------------------------------------------------------------
diff --git a/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactory.java b/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactory.java
index ddac22f..7f1e884 100644
--- a/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactory.java
+++ b/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactory.java
@@ -23,7 +23,7 @@ import org.apache.samza.SamzaException;
import org.apache.samza.system.OutgoingMessageEnvelope;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.Requests;
-import org.elasticsearch.common.base.Optional;
+import com.google.common.base.Optional;
import org.elasticsearch.index.VersionType;
import java.util.Map;