diff options
Diffstat (limited to 'src/main/java/org/onap/aai/rest')
4 files changed, 18 insertions, 26 deletions
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; |