diff options
Diffstat (limited to 'src/main/java')
9 files changed, 52 insertions, 44 deletions
diff --git a/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java b/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java index 9a5abee..7295a9a 100644 --- a/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java +++ b/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java @@ -21,7 +21,7 @@ package org.onap.aai.event; import org.apache.camel.Component; -import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.support.DefaultEndpoint; public abstract class AbstractEventBusEndpoint extends DefaultEndpoint { @@ -29,7 +29,7 @@ public abstract class AbstractEventBusEndpoint extends DefaultEndpoint { super(endpointUri, component); } - abstract void close() throws Exception; + abstract void end() throws Exception; abstract int getPollingDelay(); abstract int getPoolSize(); abstract String getEventTopic(); diff --git a/src/main/java/org/onap/aai/event/EventBusComponent.java b/src/main/java/org/onap/aai/event/EventBusComponent.java index 766382b..cbe4605 100644 --- a/src/main/java/org/onap/aai/event/EventBusComponent.java +++ b/src/main/java/org/onap/aai/event/EventBusComponent.java @@ -24,8 +24,10 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.support.DefaultComponent; +import org.apache.camel.spi.annotations.Component; +@Component("event-bus") public class EventBusComponent extends DefaultComponent { public EventBusComponent() { super(); diff --git a/src/main/java/org/onap/aai/event/EventBusConsumer.java b/src/main/java/org/onap/aai/event/EventBusConsumer.java index b189cfd..bc698df 100644 --- a/src/main/java/org/onap/aai/event/EventBusConsumer.java +++ b/src/main/java/org/onap/aai/event/EventBusConsumer.java @@ -25,7 +25,7 @@ import org.onap.aai.event.api.EventConsumer; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; -import org.apache.camel.impl.ScheduledPollConsumer; +import org.apache.camel.support.ScheduledPollConsumer; import org.onap.aai.logging.RouterCoreMsgs; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; @@ -96,14 +96,14 @@ public class EventBusConsumer extends ScheduledPollConsumer { protected void doStop() throws Exception { super.doStop(); if (endpoint != null) { - endpoint.close(); + endpoint.end(); } } @Override protected void doShutdown() throws Exception { super.doShutdown(); if (endpoint != null) { - endpoint.close(); + endpoint.end(); } } diff --git a/src/main/java/org/onap/aai/event/EventBusEndPoint.java b/src/main/java/org/onap/aai/event/EventBusEndPoint.java index 621b30f..5ea6a67 100644 --- a/src/main/java/org/onap/aai/event/EventBusEndPoint.java +++ b/src/main/java/org/onap/aai/event/EventBusEndPoint.java @@ -20,34 +20,40 @@ */ package org.onap.aai.event; +import org.apache.camel.Category; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; 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.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.event.api.EventConsumer; import org.onap.aai.event.api.EventPublisher; @UriEndpoint(scheme = "event-bus", syntax = "event-bus:name", -consumerClass = EventBusConsumer.class, title = "event-bus") +consumerClass = EventBusConsumer.class, title = "event-bus", +firstVersion = "1.0.0", category = {Category.CORE}) public class EventBusEndPoint extends AbstractEventBusEndpoint { - @UriParam(label = "eventTopic") - @Metadata(required = "true") + + @UriPath(description = "client name") + private String name; + @UriParam(label = "eventTopic", description = "event topic") + @Metadata(required = true) private String eventTopic; - @UriParam(label = "poolSize") - @Metadata(required = "true", defaultValue="20") + @UriParam(label = "poolSize", description = "pool size") + @Metadata(required = true, defaultValue="20") private int poolSize = 20; - @UriParam(label = "pollingDelay") - @Metadata(required = "true", defaultValue="30000") + @UriParam(label = "pollingDelay", description = "polling delay") + @Metadata(required = true, defaultValue="30000") private int pollingDelay = 30000; - + EventConsumer consumer; //This would be injected via bean through camel route when passed with # - + EventPublisher publisher; //This would be injected via bean through camel route when passed with # - + private Logger logger = LoggerFactory.getInstance().getLogger(EventBusEndPoint.class); public EventBusEndPoint(String uri, EventBusComponent component) { @@ -69,7 +75,7 @@ public class EventBusEndPoint extends AbstractEventBusEndpoint { return false; } - void close() throws Exception { + void end() throws Exception { if(consumer != null) consumer.close(); if(publisher != null) @@ -94,6 +100,14 @@ public class EventBusEndPoint extends AbstractEventBusEndpoint { return eventTopic; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public void setEventTopic(String eventTopic) { this.eventTopic = eventTopic; } diff --git a/src/main/java/org/onap/aai/event/EventBusProducer.java b/src/main/java/org/onap/aai/event/EventBusProducer.java index dfd1bfe..86118ce 100644 --- a/src/main/java/org/onap/aai/event/EventBusProducer.java +++ b/src/main/java/org/onap/aai/event/EventBusProducer.java @@ -21,7 +21,7 @@ package org.onap.aai.event; import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultProducer; +import org.apache.camel.support.DefaultProducer; import org.onap.aai.event.api.EventPublisher; /** diff --git a/src/main/java/org/onap/aai/rest/RestClientComponent.java b/src/main/java/org/onap/aai/rest/RestClientComponent.java index ec39829..13023fe 100644 --- a/src/main/java/org/onap/aai/rest/RestClientComponent.java +++ b/src/main/java/org/onap/aai/rest/RestClientComponent.java @@ -22,7 +22,8 @@ package org.onap.aai.rest; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.annotations.Component; +import org.apache.camel.support.DefaultComponent; import java.util.Map; @@ -30,14 +31,15 @@ import java.util.Map; /** * Represents the component that manages {@link RestClientEndpoint}. */ -public class RestClientComponent extends UriEndpointComponent { +@Component("ecomp-rest") +public class RestClientComponent extends DefaultComponent { public RestClientComponent() { - super(RestClientEndpoint.class); + super(); } public RestClientComponent(CamelContext context) { - super(context, RestClientEndpoint.class); + super(context); } @Override diff --git a/src/main/java/org/onap/aai/rest/RestClientConsumer.java b/src/main/java/org/onap/aai/rest/RestClientConsumer.java index 0c733a6..41373e2 100644 --- a/src/main/java/org/onap/aai/rest/RestClientConsumer.java +++ b/src/main/java/org/onap/aai/rest/RestClientConsumer.java @@ -21,7 +21,7 @@ package org.onap.aai.rest; import org.apache.camel.Processor; -import org.apache.camel.impl.DefaultConsumer; +import org.apache.camel.support.DefaultConsumer; /** diff --git a/src/main/java/org/onap/aai/rest/RestClientEndpoint.java b/src/main/java/org/onap/aai/rest/RestClientEndpoint.java index 06c9e0b..e39a9ca 100644 --- a/src/main/java/org/onap/aai/rest/RestClientEndpoint.java +++ b/src/main/java/org/onap/aai/rest/RestClientEndpoint.java @@ -20,10 +20,11 @@ */ package org.onap.aai.rest; +import org.apache.camel.Category; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; @@ -32,11 +33,9 @@ import org.apache.camel.spi.UriPath; import java.util.Map; -/** - * Represents a RestClient endpoint. - */ @UriEndpoint(scheme = "ecomp-rest", syntax = "ecomp-rest:op", - consumerClass = RestClientConsumer.class, label = "RestClient2", title = "") + consumerClass = RestClientConsumer.class, label = "RestClient2", title = "ecomp-rest", + firstVersion = "1.0.0", category = {Category.CORE}) public class RestClientEndpoint extends DefaultEndpoint { public static final String CONTEXT_PARAM_CLIENT_CERT = "ecomp-client-cert"; @@ -48,32 +47,24 @@ public class RestClientEndpoint extends DefaultEndpoint { public static final String OUT_HEADER_RESPONSE_CODE = "ecomp-response-code"; public static final String OUT_HEADER_RESPONSE_MSG = "ecomp-response-message"; - @UriPath - @Metadata(required = "true") + @UriPath(description = "op") + @Metadata(required = true) private String op; - - @UriParam + @UriParam(description = "ecomp client cert") private String ecompClientCert; - - @UriParam + @UriParam(description = "ecomp key store") private String ecompKeystore; - - @UriParam + @UriParam(description = "ecomp key store passwd") private String ecompKeystorePassword; - public RestClientEndpoint() {} public RestClientEndpoint(String uri, RestClientComponent component) { super(uri, component); } - public RestClientEndpoint(String endpointUri) { - super(endpointUri); - } - @Override - protected void setProperties(Object bean, Map<String, Object> parameters) throws Exception { + public void setProperties(Object bean, Map<String, Object> parameters) { super.setProperties(bean, parameters); } diff --git a/src/main/java/org/onap/aai/rest/RestClientProducer.java b/src/main/java/org/onap/aai/rest/RestClientProducer.java index 5062018..ccb8b89 100644 --- a/src/main/java/org/onap/aai/rest/RestClientProducer.java +++ b/src/main/java/org/onap/aai/rest/RestClientProducer.java @@ -21,9 +21,8 @@ package org.onap.aai.rest; import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultProducer; +import org.apache.camel.support.DefaultProducer; import org.eclipse.jetty.util.security.Password; -import org.onap.aai.event.EventBusConsumer; import org.onap.aai.restclient.client.Headers; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.restclient.client.RestClient; |