You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by ab...@apache.org on 2018/03/21 08:30:58 UTC
[40/50] incubator-gobblin git commit: [GOBBLIN-417] Pass in the
correct protocol version in the AvroR2JoinConverter
[GOBBLIN-417] Pass in the correct protocol version in the AvroR2JoinConverter
Closes #2295 from
ragepati/ragepati-r2joinconverter-protocolversion
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/4c15fde8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/4c15fde8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/4c15fde8
Branch: refs/heads/0.12.0
Commit: 4c15fde85d8ec46b9948438824ef3bc33b34182b
Parents: 0d89640
Author: Raul Agepati <ra...@users.noreply.github.com>
Authored: Tue Feb 27 12:02:15 2018 -0800
Committer: Hung Tran <hu...@linkedin.com>
Committed: Tue Feb 27 12:02:15 2018 -0800
----------------------------------------------------------------------
.../org/apache/gobblin/converter/AvroR2JoinConverter.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/4c15fde8/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroR2JoinConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroR2JoinConverter.java b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroR2JoinConverter.java
index b1f76ef..b2adcd6 100644
--- a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroR2JoinConverter.java
+++ b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroR2JoinConverter.java
@@ -40,12 +40,15 @@ import org.apache.gobblin.r2.R2Client;
import org.apache.gobblin.r2.R2ResponseStatus;
import org.apache.gobblin.r2.R2RestRequestBuilder;
import org.apache.gobblin.r2.R2RestResponseHandler;
+import org.apache.gobblin.util.ConfigUtils;
import org.apache.gobblin.utils.HttpConstants;
@Slf4j
public class AvroR2JoinConverter extends AvroHttpJoinConverter<RestRequest, RestResponse>{
+ public static final String DEFAULT_PROTOCOL_VERSION = "1.0.0";
+
@Override
protected void fillHttpOutputData(Schema schema, GenericRecord outputRecord, RestRequest restRequest,
ResponseStatus status)
@@ -84,9 +87,10 @@ public class AvroR2JoinConverter extends AvroHttpJoinConverter<RestRequest, Rest
protected AsyncRequestBuilder<GenericRecord, RestRequest> createRequestBuilder(Config config) {
String urlTemplate = config.getString(HttpConstants.URL_TEMPLATE);
String verb = config.getString(HttpConstants.VERB);
- String contentType = config.getString(HttpConstants.CONTENT_TYPE);
+ String protocolVersion = ConfigUtils.getString(config,
+ HttpConstants.PROTOCOL_VERSION, DEFAULT_PROTOCOL_VERSION);
- return new R2RestRequestBuilder(urlTemplate, verb, contentType);
+ return new R2RestRequestBuilder(urlTemplate, verb, protocolVersion);
}
}