[camel] branch master updated: CAMEL-14805: Use doInit for iniitalizing. Fixed tests

[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


The following commit(s) were added to refs/heads/master by this push:
     new a5e71fb  CAMEL-14805: Use doInit for iniitalizing. Fixed tests
a5e71fb is described below

commit a5e71fb78bcbb39d8c80a3d48c120ba246ce9b99
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Mar 30 11:09:16 2020 +0200

    CAMEL-14805: Use doInit for iniitalizing. Fixed tests
---
 .../component/milo/server/MiloServerComponent.java      |  6 +++++-
 .../camel/component/milo/server/MiloServerEndpoint.java | 17 +++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
index e47f5db..240ad00 100644
--- 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
+++ 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
@@ -112,6 +112,10 @@ public class MiloServerComponent extends DefaultComponent {
         this.opcServerConfig = OpcUaServerConfig.copy(serverConfig);
     }
 
+    public CamelNamespace getNamespace() {
+        return namespace;
+    }
+
     @Override
     protected void doStart() throws Exception {
         this.server = new OpcUaServer(buildServerConfig());
@@ -380,7 +384,7 @@ public class MiloServerComponent extends DefaultComponent {
             MiloServerEndpoint endpoint = this.endpoints.get(remaining);
 
             if (endpoint == null) {
-                endpoint = new MiloServerEndpoint(uri, remaining, 
this.namespace, this);
+                endpoint = new MiloServerEndpoint(uri, remaining, this);
                 setProperties(endpoint, parameters);
                 this.endpoints.put(remaining, endpoint);
             }
diff --git 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java
 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java
index 5208500..ddb2777 100644
--- 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java
+++ 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java
@@ -20,7 +20,6 @@ import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.component.milo.server.internal.CamelNamespace;
 import org.apache.camel.component.milo.server.internal.CamelServerItem;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
@@ -37,20 +36,22 @@ public class MiloServerEndpoint extends DefaultEndpoint {
     @Metadata(required = true)
     private String itemId;
 
-    private final CamelNamespace namespace;
-
     private CamelServerItem item;
 
-    public MiloServerEndpoint(final String uri, final String itemId, final 
CamelNamespace namespace, final Component component) {
+    public MiloServerEndpoint(final String uri, final String itemId, final 
Component component) {
         super(uri, component);
         this.itemId = itemId;
-        this.namespace = namespace;
+    }
+
+    @Override
+    public MiloServerComponent getComponent() {
+        return (MiloServerComponent) super.getComponent();
     }
 
     @Override
     protected void doStart() throws Exception {
         super.doStart();
-        this.item = this.namespace.getOrAddItem(this.itemId);
+        this.item = 
this.getComponent().getNamespace().getOrAddItem(this.itemId);
     }
 
     @Override
@@ -76,8 +77,6 @@ public class MiloServerEndpoint extends DefaultEndpoint {
 
     /**
      * ID of the item
-     *
-     * @param itemId the new ID of the item
      */
     public void setItemId(final String itemId) {
         this.itemId = itemId;
@@ -85,8 +84,6 @@ public class MiloServerEndpoint extends DefaultEndpoint {
 
     /**
      * Get the ID of the item
-     *
-     * @return the ID of the item
      */
     public String getItemId() {
         return this.itemId;