This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9fb5c15 polish the camel-facebook codebase a bit
9fb5c15 is described below
commit 9fb5c152d2e298e458a7b5c18bbb1dc2255c28b8
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Sun Aug 18 11:00:57 2019 +0200
polish the camel-facebook codebase a bit
---
.../camel/component/facebook/FacebookConsumer.java | 5 +---
.../camel/component/facebook/FacebookEndpoint.java | 3 +--
.../camel/component/facebook/FacebookProducer.java | 6 ++---
.../component/facebook/data/ReadingBuilder.java | 10 +++----
.../facebook/CamelFacebookTestSupport.java | 18 +++----------
.../FacebookComponentPageIdProducerTest.java | 31 ++++++++--------------
.../config/FacebookEndpointConfigurationTest.java | 4 +--
.../data/FacebookMethodsTypeHelperTest.java | 14 +---------
8 files changed, 27 insertions(+), 64 deletions(-)
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
index 9c54181..03378eb 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
@@ -215,10 +215,7 @@ public class FacebookConsumer extends
ScheduledPollConsumer {
} else {
try {
reading = ReadingBuilder.copy(reading, true);
- } catch (NoSuchFieldException e) {
- throw new IllegalArgumentException(String.format("Error
creating property [%s]: %s",
- READING_PROPERTY, e.getMessage()), e);
- } catch (IllegalAccessException e) {
+ } catch (NoSuchFieldException | IllegalAccessException e) {
throw new IllegalArgumentException(String.format("Error
creating property [%s]: %s",
READING_PROPERTY, e.getMessage()), e);
}
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
index 63909a3..4dfeb47 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
@@ -36,7 +36,6 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
-import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.ObjectHelper;
@@ -201,7 +200,7 @@ public class FacebookEndpoint extends DefaultEndpoint
implements FacebookConstan
/**
* Sets the {@link FacebookEndpointConfiguration} to use
- *
+ *
* @param configuration the {@link FacebookEndpointConfiguration} to use
*/
public void setConfiguration(FacebookEndpointConfiguration configuration) {
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
index 26af40c..b3a2ea5 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java
@@ -105,11 +105,11 @@ public class FacebookProducer extends
DefaultAsyncProducer {
}
// producer returns a single response, even for methods
with List return types
- exchange.getOut().setBody(result);
+ exchange.getMessage().setBody(result);
// copy headers
-
exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+
exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
if (rawJSON != null) {
-
exchange.getOut().setHeader(FacebookConstants.FACEBOOK_PROPERTY_PREFIX +
"rawJSON",
+
exchange.getMessage().setHeader(FacebookConstants.FACEBOOK_PROPERTY_PREFIX +
"rawJSON",
rawJSON);
}
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
index 619200c..f117439 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
@@ -27,7 +27,7 @@ import facebook4j.Reading;
* Builds {@link facebook4j.Reading} instances.
*/
public final class ReadingBuilder {
-
+
private ReadingBuilder() {
// Helper class
}
@@ -37,10 +37,10 @@ public final class ReadingBuilder {
// use private field access to make a copy
Field field = Reading.class.getDeclaredField("parameterMap");
field.setAccessible(true);
- final LinkedHashMap<String, String> source = (LinkedHashMap<String,
String>) field.get(reading);
+ final Map<String, String> source = (Map<String, String>)
field.get(reading);
// create another reading, and add all fields from source
Reading copy = new Reading();
- final LinkedHashMap<String, String> copyMap = new LinkedHashMap<>();
+ final Map<String, String> copyMap = new LinkedHashMap<>();
copyMap.putAll(source);
if (skipSinceUtil) {
copyMap.remove("since");
@@ -117,8 +117,8 @@ public final class ReadingBuilder {
Field field = Reading.class.getDeclaredField("parameterMap");
field.setAccessible(true);
- final LinkedHashMap<String, Object> readingParameters =
(LinkedHashMap<String, Object>) field.get(reading);
- readingParameters.putAll((LinkedHashMap<String, Object>)
field.get(readingUpdate));
+ final Map<String, Object> readingParameters = (Map<String, Object>)
field.get(reading);
+ readingParameters.putAll((Map<String, Object>)
field.get(readingUpdate));
field.setAccessible(false);
setProperties(mergedReading, readingParameters);
diff --git
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java
index 2f1faac..fb36b4e 100644
---
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java
+++
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/CamelFacebookTestSupport.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.facebook;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
@@ -36,21 +35,10 @@ public abstract class CamelFacebookTestSupport extends
CamelTestSupport {
protected void loadProperties(CamelContext context) throws Exception {
URL url = getClass().getResource("/test-options.properties");
- InputStream inStream;
- try {
- inStream = url.openStream();
- } catch (IOException e) {
- e.printStackTrace();
- throw new IllegalAccessError("test-options.properties could not be
found");
- }
+ InputStream inStream = url.openStream();
properties = new Properties();
- try {
- properties.load(inStream);
- } catch (IOException e) {
- e.printStackTrace();
- throw new IllegalAccessError("test-options.properties could not be
found");
- }
+ properties.load(inStream);
Map<String, Object> options = new HashMap<>();
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
@@ -77,7 +65,7 @@ public abstract class CamelFacebookTestSupport extends
CamelTestSupport {
+ (properties.get("oAuthAccessToken") != null
? ("&oAuthAccessToken=" + properties.get("oAuthAccessToken")) :
"");
}
-
+
protected String getAppOauthParams() {
return "oAuthAppId=" + properties.get("oAuthAppId")
+ "&oAuthAppSecret=" + properties.get("oAuthAppSecret");
diff --git
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
index b910747..e9ad554 100644
---
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
+++
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
@@ -28,9 +28,6 @@ public class FacebookComponentPageIdProducerTest extends
CamelFacebookTestSuppor
public static final String APACHE_FOUNDATION_PAGE_ID = "6538157161";
long lastTimestamp = -1;
-
- public FacebookComponentPageIdProducerTest() throws Exception {
- }
@Test
public void testProducers() throws Exception {
@@ -45,27 +42,21 @@ public class FacebookComponentPageIdProducerTest extends
CamelFacebookTestSuppor
public void configure() {
from("timer:period=20000")
.setHeader("CamelFacebook.reading.limit", constant("10"))
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws
Exception {
- if (lastTimestamp > 0) {
-
exchange.getIn().setHeader("CamelFacebook.reading.since", lastTimestamp);
- }
+ .process(exchange -> {
+ if (lastTimestamp > 0) {
+
exchange.getIn().setHeader("CamelFacebook.reading.since", lastTimestamp);
}
})
.to("facebook://getPosts?" + getOauthParams() + "&userId="
+ APACHE_FOUNDATION_PAGE_ID + "&reading.limit=5")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws
Exception {
- ResponseList<Post> body = (ResponseList<Post>)
exchange.getIn().getBody();
- log.info("Number of posts received: {}",
body.size());
- for (Post post : body) {
- log.debug(post.toString());
- }
+ .process(exchange -> {
+ ResponseList<Post> body =
exchange.getIn().getBody(ResponseList.class);
+ log.info("Number of posts received: {}", body.size());
+ for (Post post : body) {
+ log.debug(post.toString());
+ }
- if (!body.isEmpty()) {
- lastTimestamp =
body.get(0).getUpdatedTime().getTime();
- }
+ if (!body.isEmpty()) {
+ lastTimestamp =
body.get(0).getUpdatedTime().getTime();
}
})
.to("mock:page");
diff --git
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java
index 0ad60360..f931347 100644
---
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java
+++
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/config/FacebookEndpointConfigurationTest.java
@@ -29,8 +29,8 @@ public class FacebookEndpointConfigurationTest extends
CamelTestSupport {
public void testConfigurationBeanUriParam() throws Exception {
FacebookComponent component = new FacebookComponent(context);
FacebookEndpoint facebookEndpoint = (FacebookEndpoint)
component.createEndpoint("facebook://getFeed?configuration=#configuration");
- assertTrue("Configuration bean wasn't taken into account!",
"fakeId".equals(facebookEndpoint.getConfiguration().getOAuthAppId()));
- assertTrue("Configuration bean wasn't taken into account!",
"fakeSecret".equals(facebookEndpoint.getConfiguration().getOAuthAppSecret()));
+ assertEquals("Configuration bean wasn't taken into account!",
"fakeId", facebookEndpoint.getConfiguration().getOAuthAppId());
+ assertEquals("Configuration bean wasn't taken into account!",
"fakeSecret", facebookEndpoint.getConfiguration().getOAuthAppSecret());
}
@BindToRegistry("configuration")
diff --git
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
index 82ca36b..cb3af23 100644
---
a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
+++
b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
@@ -39,21 +39,9 @@ import static org.junit.Assert.assertTrue;
*/
public class FacebookMethodsTypeHelperTest {
- private Set<String> names = new HashSet<>();
- private final List<String> getExcludes;
private final List<String> searchIncludes;
public FacebookMethodsTypeHelperTest() {
- // get all method names
- for (Class<?> aClass : Facebook.class.getInterfaces()) {
- if (aClass.getName().endsWith("Methods")) {
- for (Method method : aClass.getDeclaredMethods()) {
- names.add(getShortName(method.getName()));
- }
- }
- }
-
- getExcludes = Arrays.asList("places");
searchIncludes = Arrays.asList("checkins", "events", "groups",
"locations", "places", "posts", "users");
}
@@ -97,7 +85,7 @@ public class FacebookMethodsTypeHelperTest {
final Class<?>[] interfaces = Facebook.class.getInterfaces();
for (Class<?> clazz : interfaces) {
if (clazz.getName().endsWith("Methods")) {
- // check all methods of this *Methods interface
+ // check all methods of this Methods interface
for (Method method : clazz.getDeclaredMethods()) {
// will throw an exception if can't be found
final List<Object> arguments =
FacebookMethodsTypeHelper.getArguments(method.getName());
