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 2019/01/10 07:21:46 UTC
[camel] branch master updated (4e2613b -> c2bf297)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4e2613b Remove last remnants of the deleted XMLBeans component.
new c5df0a5 CAMEL-13045 - Camel-Slack: The verifier must be able to validate webhook and token at the same time
new c2bf297 CAMEL-13045 - Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/slack/SlackComponentVerifierExtension.java | 6 ++++--
.../main/java/org/apache/camel/component/slack/SlackEndpoint.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
[camel] 01/02: CAMEL-13045 - Camel-Slack: The verifier must be able
to validate webhook and token at the same time
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5df0a51c1b60fe7092000818ac83d318ef30594
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 10 08:17:19 2019 +0100
CAMEL-13045 - Camel-Slack: The verifier must be able to validate webhook and token at the same time
---
.../camel/component/slack/SlackComponentVerifierExtension.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
index b8c10fc..1960b8d 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
@@ -34,6 +34,7 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.json.simple.JSONObject;
+import org.json.simple.JsonObject;
import org.json.simple.Jsoner;
import static org.apache.camel.component.slack.utils.SlackUtils.readResponse;
@@ -106,7 +107,7 @@ public class SlackComponentVerifierExtension extends DefaultComponentVerifierExt
} catch (Exception e) {
builder.error(ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, "Invalid webhookUrl").parameterKey("webhookUrl").build());
}
- } else if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) {
+ } if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) {
String token = (String)parameters.get("token");
try {
@@ -123,7 +124,7 @@ public class SlackComponentVerifierExtension extends DefaultComponentVerifierExt
if (response.getStatusLine().getStatusCode() < 200 || response.getStatusLine().getStatusCode() > 299) {
builder.error(ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, "Invalid token").parameterKey("token").build());
}
- JSONObject obj = (JSONObject) Jsoner.deserialize(jsonString);
+ JsonObject obj = (JsonObject) Jsoner.deserialize(jsonString);
if (obj.get("ok") != null && obj.get("ok").equals(false)) {
builder.error(ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, "Invalid token").parameterKey("token").build());
}
[camel] 02/02: CAMEL-13045 - Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2bf2977191227a5e3af36acf2ddedebb50390ff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 10 08:19:41 2019 +0100
CAMEL-13045 - Fixed CS
---
.../apache/camel/component/slack/SlackComponentVerifierExtension.java | 3 ++-
.../src/main/java/org/apache/camel/component/slack/SlackEndpoint.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
index 1960b8d..3770449 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
@@ -107,7 +107,8 @@ public class SlackComponentVerifierExtension extends DefaultComponentVerifierExt
} catch (Exception e) {
builder.error(ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, "Invalid webhookUrl").parameterKey("webhookUrl").build());
}
- } if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) {
+ }
+ if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) {
String token = (String)parameters.get("token");
try {
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
index 8bec47f..901fbd8 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
@@ -24,11 +24,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.slack.helper.SlackMessage;
-import org.apache.camel.support.ScheduledPollEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.support.ScheduledPollEndpoint;
import org.apache.camel.util.ObjectHelper;
import org.json.simple.JSONObject;