[camel] 02/02: CAMEL-15043: Fixed camel-archetype-component

[davsclaus]

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

commit 3ed5bb9d3dc75e4b8988a036127ed496e8e9cf4c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun May 24 17:55:57 2020 +0200

    CAMEL-15043: Fixed camel-archetype-component
---
 .../archetype-resources/src/main/java/EventBusHelper.java  |  5 +++--
 .../src/main/java/__name__Component.java                   |  4 +---
 .../src/main/java/__name__Consumer.java                    |  3 ---
 .../src/main/java/__name__Endpoint.java                    | 14 +++++++-------
 .../src/main/java/__name__Producer.java                    |  3 ---
 5 files changed, 11 insertions(+), 18 deletions(-)

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 deaecc1..cca8b82 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
@@ -32,10 +32,11 @@ public class EventBusHelper {
 
     final private Set<Consumer> subscribers = ConcurrentHashMap.newKeySet();
 
-    private EventBusHelper(){ }
+    private EventBusHelper() {
+    }
 
     public static EventBusHelper getInstance(){
-        if (INSTANCE == null){
+        if (INSTANCE == null) {
             INSTANCE = new EventBusHelper();
         }
 
diff --git 
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
 
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
index 0b6b832..a8ae72a 100644
--- 
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
+++ 
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
@@ -23,9 +23,7 @@ import org.apache.camel.Endpoint;
 
 import org.apache.camel.support.DefaultComponent;
 
-/**
- * Represents the component that manages {@link ${name}Endpoint}.
- */
+@org.apache.camel.spi.annotations.Component("${scheme}")
 public class ${name}Component extends DefaultComponent {
     
     protected Endpoint createEndpoint(String uri, String remaining, 
Map<String, Object> parameters) throws Exception {
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 9eec305..714d1f3 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
@@ -23,9 +23,6 @@ import org.apache.camel.support.DefaultConsumer;
 
 import java.util.concurrent.ExecutorService;
 
-/**
- * The ${name} consumer.
- */
 public class ${name}Consumer extends DefaultConsumer {
     private final ${name}Endpoint endpoint;
     private final EventBusHelper eventBusHelper;
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 bf8f7f8..15640b5 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
@@ -28,9 +28,11 @@ import org.apache.camel.spi.UriPath;
 import java.util.concurrent.ExecutorService;
 
 /**
- * Represents a ${name} endpoint.
+ * ${name} component which does bla bla.
+ *
+ * TODO: Update one line description above what the component does.
  */
-@UriEndpoint(firstVersion = "${version}", scheme = "${scheme}", title = 
"${name}", syntax="${scheme}:name", 
+@UriEndpoint(firstVersion = "${version}", scheme = "${scheme}", title = 
"${name}", syntax="${scheme}:name",
              consumerClass = ${name}Consumer.class, label = "custom")
 public class ${name}Endpoint extends DefaultEndpoint {
     @UriPath @Metadata(required = true)
@@ -50,11 +52,9 @@ public class ${name}Endpoint extends DefaultEndpoint {
     }
 
     public Consumer createConsumer(Processor processor) throws Exception {
-        return new ${name}Consumer(this, processor);
-    }
-
-    public boolean isSingleton() {
-        return true;
+        Consumer consumer = new ${name}Consumer(this, processor);
+        configureConsumer(consumer);
+        return consumer;
     }
 
     /**
diff --git 
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java
 
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java
index 05c9612..8034f49 100644
--- 
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java
+++ 
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java
@@ -21,9 +21,6 @@ import org.apache.camel.support.DefaultProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * The ${name} producer.
- */
 public class ${name}Producer extends DefaultProducer {
     private static final Logger LOG = 
LoggerFactory.getLogger(${name}Producer.class);
     private ${name}Endpoint endpoint;