[camel] 20/20: service registry: fix findings

[lb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit dd50e732ed94e0805690fc738a17d0079ca241f6
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed May 30 10:12:04 2018 +0200

    service registry: fix findings
---
 .../camel/impl/cloud/ServiceDefinitionHelper.java  | 23 ----------------------
 .../impl/cloud/ServiceRegistrationRoutePolicy.java |  2 +-
 .../camel/impl/cloud/ServiceRegistryTest.java      |  2 +-
 .../src/main/docs/service-component.adoc           | 13 ++++--------
 .../camel/component/service/ServiceEndpoint.java   |  7 +++++--
 5 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceDefinitionHelper.java
deleted file mode 100644
index 6bc252d..0000000
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceDefinitionHelper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.impl.cloud;
-
-public final class ServiceDefinitionHelper {
-
-    private ServiceDefinitionHelper() {
-    }
-}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java
index e0eb073..4b641db 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@ManagedResource(description = "Clustered Route policy using")
+@ManagedResource(description = "Service Registration Route policy")
 public class ServiceRegistrationRoutePolicy extends RoutePolicySupport implements CamelContextAware {
     private static final Logger LOGGER = LoggerFactory.getLogger(ServiceRegistrationRoutePolicy.class);
 
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java b/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
index 914f839..9f7fbb1 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ServiceRegistryTest  extends ContextTestSupport {
+public class ServiceRegistryTest extends ContextTestSupport {
 
     // *********************
     // Set up
diff --git a/components/camel-service/src/main/docs/service-component.adoc b/components/camel-service/src/main/docs/service-component.adoc
index b1dece8..afa4b31 100644
--- a/components/camel-service/src/main/docs/service-component.adoc
+++ b/components/camel-service/src/main/docs/service-component.adoc
@@ -1,20 +1,17 @@
 [[service-component]]
 == Service Component
-== Master Component
-*Available as of Camel version 2.22*
-
 
 *Available as of Camel version 2.22*
 
 
-### Using the master endpoint
+### Using the service endpoint
 
 
 ### URI format
 
 [source]
 ----
-service:endpoint[?options]
+service:serviceName:endpoint[?options]
 ----
 
 
@@ -72,10 +69,8 @@ with the following path and query parameters:
 Camel provide the following ServiceRegistry implementations:
 
 - camel-consul
-
-Camel provide the following ServiceCall implementations:
-
-- camel-consul
+- camel-zookeeper
+- camel-spring-cloud
 
 ### See Also
 
diff --git a/components/camel-service/src/main/java/org/apache/camel/component/service/ServiceEndpoint.java b/components/camel-service/src/main/java/org/apache/camel/component/service/ServiceEndpoint.java
index d16f448..bd6b52e 100644
--- a/components/camel-service/src/main/java/org/apache/camel/component/service/ServiceEndpoint.java
+++ b/components/camel-service/src/main/java/org/apache/camel/component/service/ServiceEndpoint.java
@@ -74,13 +74,16 @@ public class ServiceEndpoint extends DefaultEndpoint implements DelegateEndpoint
         this.serviceDefinition = computeServiceDefinition(component.getCamelContext(), delegateEndpoint);
     }
 
-    @ManagedAttribute(description = "The consumer endpoint to expose as a service", mask = true)
     @Override
     public Endpoint getEndpoint() {
         return this.delegateEndpoint;
     }
 
-    @ManagedAttribute(description = "The service definition", mask = true)
+    @ManagedAttribute(description = "The consumer endpoint to expose as a service", mask = true)
+    public String getDelegateEndpointUri() {
+        return this.delegateEndpoint.getEndpointUri();
+    }
+
     public ServiceDefinition getServiceDefinition() {
         return this.serviceDefinition;
     }

-- 
To stop receiving notification emails like this one, please contact
lburgazzoli@apache.org.