You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/04 09:12:59 UTC
[camel] branch master updated: CAMEL-13783: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 a21fe32 CAMEL-13783: Polished
a21fe32 is described below
commit a21fe32e9c391f3e2ed9ea66f145d55ff513caa8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Aug 4 11:07:55 2019 +0200
CAMEL-13783: Polished
---
.../resources-filtered/META-INF/maven/archetype-metadata.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 7 +++++--
.../archetype-resources/src/main/java/EventBusHelper.java | 6 ++++++
.../archetype-resources/src/main/java/__name__Consumer.java | 9 ++-------
.../archetype-resources/src/main/java/__name__Endpoint.java | 3 ++-
.../archetype-resources/src/test/java/__name__ComponentTest.java | 7 ++++---
6 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index 1069be7..62128d9 100644
--- a/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -26,8 +26,8 @@
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
- <requiredProperty key="log4j-version">
- <defaultValue>${log4j-version}</defaultValue>
+ <requiredProperty key="log4j2-version">
+ <defaultValue>${log4j2-version}</defaultValue>
</requiredProperty>
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index 214eb09..3146ceb 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -36,7 +36,7 @@
<!-- Camel BOM -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>camel-bom</artifactId>
<version>${camel-version}</version>
<scope>import</scope>
<type>pom</type>
@@ -61,16 +61,19 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
@@ -129,7 +132,7 @@
</executions>
</plugin>
- <!-- to generate the MANIFEST-FILE of the bundle -->
+ <!-- OSGi support (remove if not using OSGi) -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/EventBusHelper.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/EventBusHelper.java
index 68ea9cd..deaecc1 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/EventBusHelper.java
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/EventBusHelper.java
@@ -20,8 +20,14 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
+/**
+ * Used for demonstrations purpose to simulate some external system event bus/broker, where messages are sent to, and
+ * this component can consume from.
+ */
public class EventBusHelper {
+ // TODO: Delete me when you implementy your custom component
+
private static EventBusHelper INSTANCE;
final private Set<Consumer> subscribers = ConcurrentHashMap.newKeySet();
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java
index 9611c6a..9eec305 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java
@@ -56,10 +56,6 @@ public class ${name}Consumer extends DefaultConsumer {
protected void doStop() throws Exception {
super.doStop();
- if(log.isTraceEnabled()){
- log.trace("Shutting down consumer gracefully");
- }
-
// shutdown the thread pool gracefully
getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(executorService);
}
@@ -72,10 +68,9 @@ public class ${name}Consumer extends DefaultConsumer {
try {
// send message to next processor in the route
getProcessor().process(exchange);
- } catch (Exception ex){
- exchange.setException(new RuntimeCamelException("Message forwarding failed", ex));
+ } catch (Exception e) {
+ exchange.setException(e);
} finally {
- // log exception if an exception occurred and was not handled
if (exchange.getException() != null) {
getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
}
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
index 6aeceb4..bf8f7f8 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
@@ -79,7 +79,8 @@ public class ${name}Endpoint extends DefaultEndpoint {
return option;
}
- public ExecutorService createExecutor(){
+ public ExecutorService createExecutor() {
+ // TODO: Delete me when you implementy your custom component
return getCamelContext().getExecutorServiceManager().newSingleThreadExecutor(this, "${name}Consumer");
}
}
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
index 35e6667..94c0bf9 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
@@ -27,12 +27,12 @@ import java.util.TimerTask;
public class ${name}ComponentTest extends CamelTestSupport {
- final private EventBusHelper eventBusHelper = EventBusHelper.getInstance();
+ private final EventBusHelper eventBusHelper = EventBusHelper.getInstance();
@Test
public void test${name}() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(20);
+ mock.expectedMinimumMessageCount(5);
// Trigger events to subscribers
simulateEventTrigger();
@@ -56,10 +56,11 @@ public class ${name}ComponentTest extends CamelTestSupport {
@Override
public void run() {
final Date now = new Date();
+ // publish events to the event bus
eventBusHelper.publish(now);
}
};
- new Timer().scheduleAtFixedRate(task, 1L, 1000L);
+ new Timer().scheduleAtFixedRate(task, 1000L, 1000L);
}
}