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/11/06 10:24:21 UTC
[camel] branch camel-2.x updated (402b958 -> e42e1ec)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 402b958 Merge pull request #3318 from luigidemasi/CAMEL-14137
new 80cf087 CAMEL-14143 - Slack Component: Consumer does not retrieve user details on message event, thanks to Andy Krohg for the patch
new d1cb35a CAMEL-14143 - Fixed CS
new 483e833 Fixed Camel-Slack Producer Test
new e42e1ec Camel-Slack: Fixed CS
The 4 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:
components/camel-slack/pom.xml | 49 ++++++++++++----------
.../camel/component/slack/SlackEndpoint.java | 4 +-
.../camel/component/slack/helper/SlackMessage.java | 15 ++++++-
.../camel/component/slack/SlackProducerTest.java | 21 +++-------
4 files changed, 49 insertions(+), 40 deletions(-)
[camel] 01/04: CAMEL-14143 - Slack Component: Consumer does not
retrieve user details on message event, thanks to Andy Krohg for the patch
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 80cf087e6f4f1a296db9a9bfdbf8f32cc155ace4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 6 11:03:07 2019 +0100
CAMEL-14143 - Slack Component: Consumer does not retrieve user details on message event, thanks to Andy Krohg for the patch
---
.../java/org/apache/camel/component/slack/SlackEndpoint.java | 4 ++--
.../org/apache/camel/component/slack/helper/SlackMessage.java | 11 ++++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
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 25cb8c2..6c84dc6 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
@@ -189,9 +189,9 @@ public class SlackEndpoint extends ScheduledPollEndpoint {
Exchange exchange = super.createExchange(pattern);
SlackMessage slackMessage = new SlackMessage();
String text = (String)object.get("text");
- String username = (String)object.get("username");
+ String user = (String)object.get("user");
slackMessage.setText(text);
- slackMessage.setUsername(username);
+ slackMessage.setUser(user);
if (ObjectHelper.isNotEmpty((JSONObject)object.get("icons"))) {
JSONObject icons = (JSONObject)object.get("icons");
if (ObjectHelper.isNotEmpty((String)icons.get("emoji"))) {
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java
index 9337702..00598b5 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java
@@ -23,6 +23,7 @@ public class SlackMessage {
private String text;
private String channel;
private String username;
+ private String user;
private String iconUrl;
private String iconEmoji;
private List<Attachment> attachments;
@@ -51,7 +52,15 @@ public class SlackMessage {
this.username = username;
}
- public String getIconUrl() {
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
+ public String getIconUrl() {
return iconUrl;
}
[camel] 03/04: Fixed Camel-Slack Producer Test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 483e833a72cbaf347c1fc32f122310216bf75d3a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 8 16:41:42 2019 +0200
Fixed Camel-Slack Producer Test
---
components/camel-slack/pom.xml | 49 ++++++++++++----------
.../camel/component/slack/SlackProducerTest.java | 21 +++-------
2 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 2f57dcb..ba6b821 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -55,28 +55,33 @@
<artifactId>httpclient</artifactId>
</dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- logging -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-undertow</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
index cfa3ae6..c0cd020 100644
--- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
+++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.direct.DirectEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -31,9 +32,8 @@ public class SlackProducerTest extends CamelTestSupport {
@EndpointInject(uri = "direct:test")
DirectEndpoint test;
-
- @EndpointInject(uri = "direct:error")
- DirectEndpoint error;
+
+ protected static final int UNDERTOW_PORT = AvailablePortFinder.getNextAvailable();
@Test
public void testSlackMessage() throws Exception {
@@ -44,30 +44,21 @@ public class SlackProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @Test
- public void testSlackError() throws Exception {
- errors.expectedMessageCount(1);
-
- template.sendBody(error, "Error from Camel!");
-
- assertMockEndpointsSatisfied();
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
SlackComponent slack = new SlackComponent();
- slack.setWebhookUrl(System.getProperty("SLACK_HOOK", "https://hooks.slack.com/services/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"));
+ slack.setWebhookUrl("http://localhost:" + UNDERTOW_PORT + "/slack/webhook");
context.addComponent("slack", slack);
onException(Exception.class).handled(true).to(errors);
final String slacUser = System.getProperty("SLACK_USER", "CamelTest");
+ from("undertow:http://localhost:" + UNDERTOW_PORT + "/slack/webhook").setBody(constant("{\"ok\": true}"));
+
from(test).to(String.format("slack:#general?iconEmoji=:camel:&username=%s", slacUser));
-
- from(error).to(String.format("slack:#badchannel?iconEmoji=:camel:&username=%s", slack));
}
};
}
[camel] 04/04: Camel-Slack: 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 camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e42e1ec72828e3e6d1844026f4ff1247040ed778
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 6 11:23:41 2019 +0100
Camel-Slack: Fixed CS
---
.../test/java/org/apache/camel/component/slack/SlackProducerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
index c0cd020..8bcabfb 100644
--- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
+++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
@@ -27,13 +27,13 @@ import org.junit.Test;
public class SlackProducerTest extends CamelTestSupport {
+ protected static final int UNDERTOW_PORT = AvailablePortFinder.getNextAvailable();
+
@EndpointInject(uri = "mock:errors")
MockEndpoint errors;
@EndpointInject(uri = "direct:test")
DirectEndpoint test;
-
- protected static final int UNDERTOW_PORT = AvailablePortFinder.getNextAvailable();
@Test
public void testSlackMessage() throws Exception {
[camel] 02/04: CAMEL-14143 - 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 camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d1cb35a4682f5bdcf8b94f3493f5e7ca9ea0bf63
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 6 11:04:44 2019 +0100
CAMEL-14143 - Fixed CS
---
.../camel/component/slack/helper/SlackMessage.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java
index 00598b5..855e7f4 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/helper/SlackMessage.java
@@ -53,14 +53,14 @@ public class SlackMessage {
}
public String getUser() {
- return user;
- }
+ return user;
+ }
- public void setUser(String user) {
- this.user = user;
- }
+ public void setUser(String user) {
+ this.user = user;
+ }
- public String getIconUrl() {
+ public String getIconUrl() {
return iconUrl;
}
@@ -231,18 +231,23 @@ public class SlackMessage {
public String getTitle() {
return title;
}
+
public void setTitle(String title) {
this.title = title;
}
+
public String getValue() {
return value;
}
+
public void setValue(String value) {
this.value = value;
}
+
public Boolean isShortValue() {
return shortValue;
}
+
public void setShortValue(Boolean shortValue) {
this.shortValue = shortValue;
}
@@ -250,4 +255,3 @@ public class SlackMessage {
}
}
-