You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/09/15 21:14:56 UTC

[1/3] camel git commit: Fix facebook tests to support newly created tokens

Repository: camel
Updated Branches:
  refs/heads/master ea53dce2d -> cf5a33334


Fix facebook tests to support newly created tokens

With new facebook application tokens some API methods are deprecated and
cause the tests to fail. These deprecation errors need to be ignored
in the tests


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36b7d018
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36b7d018
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36b7d018

Branch: refs/heads/master
Commit: 36b7d018d1023e8f34ba76d7d8189edb22e9ecb0
Parents: 8f38e02
Author: Manuel Holzleitner <ma...@gmail.com>
Authored: Tue Sep 15 14:06:11 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Sep 15 21:08:57 2015 +0200

----------------------------------------------------------------------
 .../facebook/FacebookComponentConsumerTest.java | 50 +++++++++---
 .../facebook/FacebookComponentProducerTest.java | 80 +++++++++++++++++---
 2 files changed, 110 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/36b7d018/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index 2bb84db..1e78bc2 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -18,19 +18,20 @@ package org.apache.camel.component.facebook;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import facebook4j.FacebookException;
 import facebook4j.api.SearchMethods;
+import org.apache.camel.*;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultPollingConsumerPollStrategy;
+import org.apache.camel.impl.ScheduledPollConsumer;
 import org.junit.Test;
 
 public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
+    public static final String APACHE_FOUNDATION_PAGE_ID = "6538157161";
 
     private final Set<String> searchNames = new HashSet<String>();
     private List<String> excludedNames;
@@ -44,7 +45,7 @@ public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
             }
         }
 
-        excludedNames = Arrays.asList("places", "users", "search");
+        excludedNames = Arrays.asList("places", "users", "search", "pages", "searchPosts");
     }
 
     @Test
@@ -75,17 +76,44 @@ public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
     }
 
     @Test
-    public void testGetPosts() throws Exception {
-        final MockEndpoint mock = getMockEndpoint("mock:testGetPosts");
+    public void testPage() throws Exception {
+        final MockEndpoint mock = getMockEndpoint("mock:testPage");
         mock.expectedMinimumMessageCount(1);
         mock.assertIsSatisfied();
     }
 
     @Override
+    protected void doPostSetup() throws Exception {
+        ignoreDeprecatedApiError();
+    }
+
+    private void ignoreDeprecatedApiError() {
+        for (final Route route : context().getRoutes()) {
+            ((ScheduledPollConsumer)route.getConsumer()).setPollStrategy(new DefaultPollingConsumerPollStrategy() {
+                @Override
+                public boolean rollback(Consumer consumer, Endpoint endpoint, int retryCounter, Exception e) throws Exception {
+                    if (e.getCause() instanceof FacebookException) {
+                        FacebookException facebookException = (FacebookException) e.getCause();
+                        if (facebookException.getErrorCode() == 11 || facebookException.getErrorCode() == 12 || facebookException.getErrorCode() == 1) {
+                            context().stopRoute(route.getId());
+                            String method = ((FacebookEndpoint) route.getEndpoint()).getMethod();
+                            MockEndpoint mock = getMockEndpoint("mock:consumeQueryResult" + method);
+                            mock.expectedMinimumMessageCount(0);
+                            MockEndpoint mock2 = getMockEndpoint("mock:consumeResult" + method);
+                            mock2.expectedMinimumMessageCount(0);
+                            log.warn("Ignoring failed Facebook deprecated API call", facebookException);
+                        }
+                    }
+                    return super.rollback(consumer, endpoint, retryCounter, e);
+                }
+            });
+        }
+    }
+
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-
                 // start with a 30 day window for the first delayed poll
                 String since = "RAW(" + new SimpleDateFormat(FacebookConstants.FACEBOOK_DATE_FORMAT).format(
                     new Date(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(30, TimeUnit.DAYS))) + ")";
@@ -110,8 +138,8 @@ public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
                 // test unix timestamp support
                 long unixSince =  TimeUnit.SECONDS.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
                     - TimeUnit.SECONDS.convert(30, TimeUnit.DAYS);
-                from("facebook://posts?reading.limit=10&reading.since=" + unixSince + "&" + getOauthParams())
-                        .to("mock:testGetPosts");
+                from("facebook://page?pageId=" + APACHE_FOUNDATION_PAGE_ID + "&reading.limit=10&reading.since=" + unixSince + "&" + getOauthParams())
+                        .to("mock:testPage");
 
                 // TODO add tests for the rest of the supported methods
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/36b7d018/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
index 613d814..753f699 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
@@ -17,14 +17,23 @@
 package org.apache.camel.component.facebook;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import org.apache.camel.Exchange;
+import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.DefaultErrorHandlerBuilder;
+import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.facebook.data.FacebookMethodsType;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.model.OnExceptionDefinition;
+import org.apache.camel.processor.ErrorHandler;
+import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.spi.RouteContext;
 import org.junit.Test;
 
 public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
@@ -40,15 +49,29 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
             if (clazzName.endsWith("Methods") && !clazzName.equals("GameMethods")) {
                 for (Method method : clazz.getDeclaredMethods()) {
                     // find all the no-arg methods
-                    if (method.getParameterTypes().length == 0) {
-                        noArgNames.add(getShortName(method.getName()));
+                    if (method.getParameterTypes().length == 0 && FacebookMethodsType.findMethod(method.getName()) != null) {
+                        String shortName = getShortName(method.getName());
+                        List<String> generalExcludes = Arrays.asList("home", "tabs", "updates", "blocked", "pageSettings", "pageAdmins",
+                            "milestones", "offers", "pokes", "promotablePosts", "outbox", "inbox", "notifications");
+                        if (!generalExcludes.contains(shortName)) {
+                            noArgNames.add(shortName);
+                        }
                     }
                 }
             }
         }
 
-        idExcludes = Arrays.asList("me", "home", "searchCheckins");
-        readingExcludes = Arrays.asList("pictureURL", "permissions");
+        idExcludes = new ArrayList<String>();
+        idExcludes.addAll(Arrays.asList("me", "home", "searchCheckins", "taggableFriends"));
+        readingExcludes = new ArrayList<String>();
+        readingExcludes.addAll(Arrays.asList("pictureURL", "permissions", "taggableFriends", "sSLPictureURL"));
+
+        for (FacebookMethodsType types : FacebookMethodsType.values()) {
+            if(types.getArgNames().contains("pageId")) {
+                idExcludes.add(getShortName(types.getName()));
+                readingExcludes.add(getShortName(types.getName()));
+            }
+        }
     }
 
     @Test
@@ -78,6 +101,13 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
                 mock.expectedMinimumMessageCount(1);
                 template().sendBody("direct://testIdReading" + name, null);
             }
+
+            // with user id and reading
+            if (!(idExcludes.contains(name) || readingExcludes.contains(name))) {
+                mock = getMockEndpoint("mock:resultIdReadingHeader" + name);
+                mock.expectedMinimumMessageCount(1);
+                template().sendBody("direct://testIdReadingHeader" + name, null);
+            }
         }
 
         assertMockEndpointsSatisfied();
@@ -94,19 +124,23 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-
+                // Deprecated exceptions are ignored in the tests since this depends on the
+                // configuration and/or creation date of the Facebook application.
+                onException(FacebookException.class).setHandledPolicy(new IgnoreDeprecatedExceptions());
                 //---------------
                 // producer tests
                 //---------------
                 // generate test routes for all methods with no args
                 for (String name : noArgNames) {
                     from("direct://test" + name)
+                        .setHeader("mock", constant("mock:result" + name))
                         .to("facebook://" + name + "?" + getOauthParams())
                         .to("mock:result" + name);
 
                     // with user id
                     if (!idExcludes.contains(name)) {
                         from("direct://testId" + name)
+                            .setHeader("mock", constant("mock:resultId" + name))
                             .to("facebook://" + name + "?userId=me&" + getOauthParams())
                             .to("mock:resultId" + name);
                     }
@@ -114,6 +148,7 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
                     // reading options
                     if (!readingExcludes.contains(name)) {
                         from("direct://testReading" + name)
+                            .setHeader("mock", constant("mock:resultReading" + name))
                             .to("facebook://" + name + "?reading.limit=10&reading.locale=en,US&" + getOauthParams())
                             .to("mock:resultReading" + name);
                     }
@@ -121,9 +156,19 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
                     // with id and reading options
                     if (!(idExcludes.contains(name) || readingExcludes.contains(name))) {
                         from("direct://testIdReading" + name)
+                            .setHeader("mock", constant("mock:resultIdReading" + name))
                             .to("facebook://" + name + "?userId=me&reading.limit=10&reading.locale=en,US&" + getOauthParams())
                             .to("mock:resultIdReading" + name);
                     }
+
+                    // with id and reading options
+                    if (!(idExcludes.contains(name) || readingExcludes.contains(name))) {
+                        from("direct://testIdReadingHeader" + name)
+                            .setHeader("mock", constant("mock:resultIdReadingHeader" + name))
+                            .setHeader("CamelFacebook.reading.limit", constant("10"))
+                            .to("facebook://" + name + "?userId=me&reading.locale=en,US&" + getOauthParams())
+                            .to("mock:resultIdReadingHeader" + name);
+                    }
                 }
 
                 from("direct://testJsonStoreEnabled")
@@ -135,4 +180,21 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
         };
     }
 
+    private class IgnoreDeprecatedExceptions implements Predicate {
+        @Override
+        public boolean matches(Exchange exchange) {
+            RuntimeCamelException camelException = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, RuntimeCamelException.class);
+            if (camelException != null
+                && camelException.getCause() != null
+                && camelException.getCause() instanceof FacebookException) {
+                FacebookException facebookException = (FacebookException) camelException.getCause();
+                if (facebookException.getErrorCode() == 11 || facebookException.getErrorCode() == 12) {
+                    getMockEndpoint(exchange.getIn().getHeader("mock", String.class)).expectedMinimumMessageCount(0);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }


[2/3] camel git commit: [CAMEL-9140] Add missing configuration properties in camel-facebook

Posted by ac...@apache.org.
[CAMEL-9140] Add missing configuration properties in camel-facebook


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f38e02b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f38e02b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f38e02b

Branch: refs/heads/master
Commit: 8f38e02ba8e465462a64e3ba52a69499b28759b8
Parents: ea53dce
Author: Manuel Holzleitner <ma...@gmail.com>
Authored: Tue Sep 15 14:05:17 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Sep 15 21:08:57 2015 +0200

----------------------------------------------------------------------
 .../config/FacebookEndpointConfiguration.java   | 83 ++++++++++++++++++++
 .../facebook/data/FacebookMethodsType.java      | 14 ++--
 .../facebook/data/FacebookMethodsTypeTest.java  |  2 +-
 3 files changed, 91 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8f38e02b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
index a8375af..261ea8b 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
@@ -159,6 +159,22 @@ public class FacebookEndpointConfiguration extends FacebookConfiguration {
     private String userLocale;
     @UriParam
     private String videoId;
+    @UriParam
+    private Integer pictureId;
+    @UriParam
+    private Integer pictureId2;
+    @UriParam
+    private PictureSize pictureSize;
+    @UriParam
+    private String pageId;
+    @UriParam
+    private String tabId;
+    @UriParam
+    private Boolean isHidden;
+    @UriParam
+    private String offerId;
+    @UriParam
+    private String milestoneId;
 
     public URL getAchievementURL() {
         return achievementURL;
@@ -822,4 +838,71 @@ public class FacebookEndpointConfiguration extends FacebookConfiguration {
         this.videoId = videoId;
     }
 
+    public Boolean getIncludeRead() {
+        return includeRead;
+    }
+
+    public Integer getPictureId() {
+        return pictureId;
+    }
+
+    public void setPictureId(Integer pictureId) {
+        this.pictureId = pictureId;
+    }
+
+    public Integer getPictureId2() {
+        return pictureId2;
+    }
+
+    public void setPictureId2(Integer pictureId2) {
+        this.pictureId2 = pictureId2;
+    }
+
+    public PictureSize getPictureSize() {
+        return pictureSize;
+    }
+
+    public void setPictureSize(PictureSize pictureSize) {
+        this.pictureSize = pictureSize;
+    }
+
+    public String getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
+    }
+
+    public String getTabId() {
+        return tabId;
+    }
+
+    public void setTabId(String tabId) {
+        this.tabId = tabId;
+    }
+
+    public Boolean isHidden() {
+        return isHidden;
+    }
+
+    public void setIsHidden(Boolean isHidden) {
+        this.isHidden = isHidden;
+    }
+
+    public String getOfferId() {
+        return offerId;
+    }
+
+    public void setOfferId(String offerId) {
+        this.offerId = offerId;
+    }
+
+    public String getMilestoneId() {
+        return milestoneId;
+    }
+
+    public void setMilestoneId(String milestoneId) {
+        this.milestoneId = milestoneId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8f38e02b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
index f46bed6..b5f3dd5 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
@@ -201,9 +201,9 @@ public enum FacebookMethodsType {
     GETGAMES_WITH_ID(ResponseList.class, "getGames", String.class, "userId"),
     GETGAMES_WITH_ID_OPTIONS(ResponseList.class, "getGames", String.class, "userId", Reading.class, FacebookConstants.READING_PPROPERTY),
     GETINTERESTS(ResponseList.class, "getInterests"),
-    GETINTERESTS_WITH_OPTIONS(ResponseList.class, "getInterests", Reading.class, FacebookConstants.READING_PPROPERTY),
     GETINTERESTS_WITH_ID(ResponseList.class, "getInterests", String.class, "userId"),
-    GETINTERESTS_WITH_ID_OPTIONS(ResponseList.class, "getInterests", String.class, "userId", Reading.class, FacebookConstants.READING_PPROPERTY),
+    GETINTERESTS_WITH_OPTIONS(ResponseList.class, "getInterests", Reading.class, FacebookConstants.READING_PPROPERTY),
+    GETINTERESTS_WITH_ID_OPTIONS(ResponseList.class, "getInterests",  String.class, "userId", Reading.class, FacebookConstants.READING_PPROPERTY),
     GETMOVIES(ResponseList.class, "getMovies"),
     GETMOVIES_WITH_OPTIONS(ResponseList.class, "getMovies", Reading.class, FacebookConstants.READING_PPROPERTY),
     GETMOVIES_WITH_ID(ResponseList.class, "getMovies", String.class, "userId"),
@@ -481,11 +481,11 @@ public enum FacebookMethodsType {
     GETME(User.class,  "getMe"),
     GETME_WITH_OPTIONS(User.class,  "getMe", Reading.class, FacebookConstants.READING_PPROPERTY),
     GETPICTUREURL(URL.class,  "getPictureURL"),
-    GETPICTUREURL_WITH_DIM(URL.class,  "getPictureURL", int.class, "pictureid", int.class, "pictureid2"),
+    GETPICTUREURL_WITH_DIM(URL.class,  "getPictureURL", int.class, "pictureId", int.class, "pictureId2"),
     GETPICTUREURL_WITH_PICTURESIZE(URL.class,  "getPictureURL", PictureSize.class, "size"),
     GETPICTUREURL_WITH_ID(URL.class,  "getPictureURL", String.class, "userId"),
     GETPICTUREURL_WITH_ID_PICTURESIZE(URL.class,  "getPictureURL", String.class, "userId", PictureSize.class, "size"),
-    GETPICTUREURL_WITH_ID_AND_DIM(URL.class,  "getPictureURL", String.class, "userId", int.class, "pictureid", int.class, "pictureid2"),
+    GETPICTUREURL_WITH_ID_AND_DIM(URL.class,  "getPictureURL", String.class, "userId", int.class, "pictureId", int.class, "pictureId2"),
     GETSSLPICTUREURL(URL.class,  "getSSLPictureURL"),
     GETSSLPICTUREURL_WITH_PICTURESIZE(URL.class,  "getSSLPictureURL", PictureSize.class, "size"),
     GETSSLPICTUREURL_WITH_ID(URL.class,  "getSSLPictureURL", String.class, "userId"),
@@ -530,8 +530,8 @@ public enum FacebookMethodsType {
     SEARCHPOSTS(ResponseList.class, "searchPosts", String.class, "query"),
     SEARCHPOSTS_WITH_OPTIONS(ResponseList.class, "searchPosts", String.class, "query", Reading.class, FacebookConstants.READING_PPROPERTY),
     SEARCHUSERS(ResponseList.class, "searchUsers", String.class, "query"),
-    SEARCHUSERS_WITH_OPTIONS(ResponseList.class, "searchUsers", String.class, "query", Reading.class, FacebookConstants.READING_PPROPERTY),    
-    
+    SEARCHUSERS_WITH_OPTIONS(ResponseList.class, "searchUsers", String.class, "query", Reading.class, FacebookConstants.READING_PPROPERTY),
+
     // FROM UPDATE to 2.2.2 API
     BLOCK_USERLIST(Map.class, "block", List.class, "list"),
     BLOCK_USERLIST_WITH_PAGEID(Map.class, "block", String.class, "pageId", List.class, "list"),
@@ -552,7 +552,7 @@ public enum FacebookMethodsType {
     GET_PAGE_PICTURE_URL_WITH_PAGEID(URL.class, "getPagePictureURL", String.class, "pageId"),
     GET_PAGE_PICTURE_URL_WITH_PAGEID_AND_SIZE(URL.class, "getPagePictureURL", String.class, "pageId", PictureSize.class, "pictureSize"),
     UPDATE_PAGE_BASIC_ATTRIBUTES(Boolean.class, "updatePageBasicAttributes", PageUpdate.class, "pageUpdate"),
-    UPDATE_PAGE_BASIC_ATTRIBUTES_WITH_PAGEID(boolean.class, "updatePageBasicAttributes", String.class, "pageId", PageUpdate.class, "pageUpdate"),   
+    UPDATE_PAGE_BASIC_ATTRIBUTES_WITH_PAGEID(boolean.class, "updatePageBasicAttributes", String.class, "pageId", PageUpdate.class, "pageUpdate"),
     UPDATE_PAGE_PROFILE_PHOTO(boolean.class, "updatePageProfilePhoto", Media.class, "source"),
     UPDATE_PAGE_PROFILE_PHOTO_WITH_PAGEID(boolean.class, "updatePageProfilePhoto", String.class, "pageId", Media.class, "source"),
     UPDATE_PAGE_PROFILE_PHOTO_WITH_PAGEID_AND_URL(boolean.class, "updatePageProfilePhoto", String.class, "pageId", URL.class, "picture"),

http://git-wip-us.apache.org/repos/asf/camel/blob/8f38e02b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java
index 8c3c523..608d5b4 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeTest.java
@@ -39,7 +39,7 @@ public class FacebookMethodsTypeTest {
                 // check all methods of this *Methods interface
                 for (Method method : clazz.getDeclaredMethods()) {
                     final FacebookMethodsType methodsType = FacebookMethodsType.findMethod(method.getName(), method.getParameterTypes());
-                    assertNotNull(methodsType);
+                    assertNotNull("Expected method mapping not found:" + method.getName(), methodsType);
                     assertEquals("Methods are not equal", method, methodsType.getMethod());
                 }
             }


[3/3] camel git commit: Fixed CS

Posted by ac...@apache.org.
Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cf5a3333
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cf5a3333
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cf5a3333

Branch: refs/heads/master
Commit: cf5a33334180e2749dcf9f8e2a8ff438d62d90dc
Parents: 36b7d01
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Sep 15 21:13:58 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Sep 15 21:13:58 2015 +0200

----------------------------------------------------------------------
 .../facebook/FacebookComponentConsumerTest.java          | 11 +++++++++--
 .../facebook/FacebookComponentProducerTest.java          |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cf5a3333/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index 1e78bc2..fc3dbdc 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -18,12 +18,19 @@ package org.apache.camel.component.facebook;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import facebook4j.FacebookException;
 import facebook4j.api.SearchMethods;
-import org.apache.camel.*;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Route;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultPollingConsumerPollStrategy;

http://git-wip-us.apache.org/repos/asf/camel/blob/cf5a3333/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
index 753f699..6d5c0e5 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java
@@ -67,7 +67,7 @@ public class FacebookComponentProducerTest extends CamelFacebookTestSupport {
         readingExcludes.addAll(Arrays.asList("pictureURL", "permissions", "taggableFriends", "sSLPictureURL"));
 
         for (FacebookMethodsType types : FacebookMethodsType.values()) {
-            if(types.getArgNames().contains("pageId")) {
+            if (types.getArgNames().contains("pageId")) {
                 idExcludes.add(getShortName(types.getName()));
                 readingExcludes.add(getShortName(types.getName()));
             }