You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/03/28 16:45:08 UTC
camel git commit: Fix camel-twitter inconsistent use of error codes
and constants
Repository: camel
Updated Branches:
refs/heads/master 23c460f31 -> ceeab4bd6
Fix camel-twitter inconsistent use of error codes and constants
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ceeab4bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ceeab4bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ceeab4bd
Branch: refs/heads/master
Commit: ceeab4bd6ae4b289883288d85e997988082c63a7
Parents: 23c460f
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Mar 28 18:45:00 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Tue Mar 28 18:45:00 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/ComponentVerifier.java | 1 +
.../camel/component/twitter/TwitterComponentVerifier.java | 7 +++++--
.../camel/component/twitter/CamelComponentVerifierTest.java | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ceeab4bd/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
index 53cb8c7..93f50c7 100644
--- a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
+++ b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
@@ -27,6 +27,7 @@ import org.apache.camel.util.ObjectHelper;
* Defines the interface used to validate component/endpoint parameters.
*/
public interface ComponentVerifier {
+ String CODE_AUTHENTICATION = "authentication";
String CODE_EXCEPTION = "exception";
String CODE_INTERNAL = "internal";
String CODE_MISSING_OPTION = "missing-option";
http://git-wip-us.apache.org/repos/asf/camel/blob/ceeab4bd/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponentVerifier.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponentVerifier.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponentVerifier.java
index 05a5846..27808b8 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponentVerifier.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponentVerifier.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.twitter;
import java.util.Map;
+import org.apache.camel.ComponentVerifier;
import org.apache.camel.impl.verifier.DefaultComponentVerifier;
import org.apache.camel.impl.verifier.ResultBuilder;
import org.apache.camel.impl.verifier.ResultErrorBuilder;
@@ -68,12 +69,14 @@ final class TwitterComponentVerifier extends DefaultComponentVerifier {
} catch (TwitterException e) {
// verifyCredentials throws TwitterException when Twitter service or
// network is unavailable or if supplied credential is wrong
- ResultErrorBuilder errorBuilder = ResultErrorBuilder.withHttpCodeAndText(e.getStatusCode(), e.getErrorMessage())
+ ResultErrorBuilder errorBuilder = ResultErrorBuilder.withCodeAndDescription(ComponentVerifier.CODE_AUTHENTICATION, e.getErrorMessage())
.attribute("twitter.error.code", e.getErrorCode())
.attribute("twitter.status.code", e.getStatusCode())
.attribute("twitter.exception.code", e.getExceptionCode())
.attribute("twitter.exception.message", e.getMessage())
- .attribute("twitter.exception.instance", e);
+ .attribute("twitter.exception.caused-by-network-issue", e.isCausedByNetworkIssue())
+ .attribute(ComponentVerifier.EXCEPTION_CLASS, e.getClass().getName())
+ .attribute(ComponentVerifier.EXCEPTION_INSTANCE, e);
// For a complete list of error codes see:
// https://dev.twitter.com/overview/api/response-codes
http://git-wip-us.apache.org/repos/asf/camel/blob/ceeab4bd/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelComponentVerifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelComponentVerifierTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelComponentVerifierTest.java
index 3666e26..174a2df 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelComponentVerifierTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelComponentVerifierTest.java
@@ -54,7 +54,7 @@ public class CamelComponentVerifierTest extends CamelTwitterTestSupport {
Assert.assertEquals(ComponentVerifier.Result.Status.ERROR, result.getStatus());
Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals("401", result.getErrors().get(0).getCode());
+ Assert.assertEquals(ComponentVerifier.CODE_AUTHENTICATION, result.getErrors().get(0).getCode());
Assert.assertEquals(401, result.getErrors().get(0).getAttributes().get("twitter.status.code"));
Assert.assertEquals(32, result.getErrors().get(0).getAttributes().get("twitter.error.code"));
}
@@ -71,7 +71,7 @@ public class CamelComponentVerifierTest extends CamelTwitterTestSupport {
Assert.assertEquals(ComponentVerifier.Result.Status.ERROR, result.getStatus());
Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals("401", result.getErrors().get(0).getCode());
+ Assert.assertEquals(ComponentVerifier.CODE_AUTHENTICATION, result.getErrors().get(0).getCode());
Assert.assertEquals(401, result.getErrors().get(0).getAttributes().get("twitter.status.code"));
Assert.assertEquals(89, result.getErrors().get(0).getAttributes().get("twitter.error.code"));
Assert.assertEquals(1, result.getErrors().get(0).getParameters().size());