[
https://issues.apache.org/jira/browse/STREAMS-584?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16441012#comment-16441012
]
ASF GitHub Bot commented on STREAMS-584:
steveblackmon closed pull request #448: resolves STREAMS-584
URL: https://github.com/apache/streams/pull/448
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index f46a164c2c..3b3cc079d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -364,7 +364,7 @@
1.8.1
0.5.0
0.1.10
-7.0.1
+7.1.0
0.4.10
0.13.1
0.11.1
diff --git
a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/api/Instagram.java
b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/api/Instagram.java
index e153b5fbbe..9f5cd63c2c 100644
---
a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/api/Instagram.java
+++
b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/api/Instagram.java
@@ -83,7 +83,7 @@ private Instagram(InstagramConfiguration configuration)
throws InstantiationExce
.setMaxConnPerRoute(20)
.setMaxConnTotal(100)
.build();
-this.restClient = new RestClientBuilder()
+this.restClient = RestClient.create()
.rootUrl(rootUrl)
.accept(APPLICATION_JSON.getMimeType())
.httpClient(httpclient, true)
@@ -99,7 +99,7 @@ private Instagram(InstagramConfiguration configuration)
throws InstantiationExce
.build())
.retryable(
configuration.getRetryMax().intValue(),
-configuration.getRetrySleepMs(),
+configuration.getRetrySleepMs().intValue(),
new InstagramRetryHandler())
.build();
this.mapper = StreamsJacksonMapper.getInstance();
diff --git
a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/api/Twitter.java
b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/api/Twitter.java
index a34d7f3739..a91b65377a 100644
---
a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/api/Twitter.java
+++
b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/api/Twitter.java
@@ -121,7 +121,7 @@ private Twitter(TwitterConfiguration configuration) throws
InstantiationExceptio
.addInterceptorLast((HttpRequestInterceptor) (httpRequest, httpContext)
-> LOGGER.debug(httpRequest.getRequestLine().getUri()))
.addInterceptorLast((HttpResponseInterceptor) (httpResponse,
httpContext) -> LOGGER.debug(httpResponse.getStatusLine().toString()))
.build();
-this.restClientBuilder = new RestClientBuilder()
+this.restClientBuilder = RestClient.create()
.httpClient(httpclient, true)
.parser(
JsonParser.DEFAULT.builder()
@@ -137,7 +137,7 @@ private Twitter(TwitterConfiguration configuration) throws
InstantiationExceptio
.rootUrl(rootUrl)
.retryable(
configuration.getRetryMax().intValue(),
-configuration.getRetrySleepMs(),
+configuration.getRetrySleepMs().intValue(),
new TwitterRetryHandler());
if( configuration.getDebug() ) {
restClientBuilder = restClientBuilder.debug();
diff --git
a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
index 7bfb8ceed5..99cdfcdac7 100644
---
a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
+++
b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
@@ -49,6 +49,8 @@
private ActivityConverterUtil activityConverterUtil =
ActivityConverterUtil.getInstance();
+ private String deleteJson =
"{\"delete\":{\"status\":{\"id\":12345,\"user_id\":56789}}}";
+ private String followJson =
"{\"follower\":{\"id\":12345},\"followee\":{\"id\":56789}}}";
private String tweetJson = "{\"created_at\":\"Wed Dec 11 22:27:34 +
2013\",\"id\":12345,\"id_str\":\"12345\",\"text\":\"text\",\"source\":\"source\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"user\":{\"id\":91407775,\"id_str\":\"12345\",\"name\":\"name\",\"screen_name\":\"screen_name\",\"location\":\"\",\"url\":
