CAMEL-8038: Fixed @UriPath
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a765a162 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a765a162 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a765a162 Branch: refs/heads/master Commit: a765a1628ef27ff3896c452ce65f52cc301b7fbb Parents: 09385f1 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 26 08:57:57 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 26 08:57:57 2014 +0100 ---------------------------------------------------------------------- .../ElasticsearchConfiguration.java | 5 ++- .../elasticsearch/ElasticsearchEndpoint.java | 2 +- .../src/main/resources/log4j.properties | 39 -------------------- .../src/test/resources/log4j.properties | 39 ++++++++++++++++++++ .../component/facebook/FacebookComponent.java | 2 - .../component/facebook/FacebookEndpoint.java | 12 +++--- .../camel/component/gae/auth/GAuthEndpoint.java | 5 ++- .../camel/component/gae/http/GHttpEndpoint.java | 10 +---- .../component/gae/login/GLoginEndpoint.java | 11 +++--- .../camel/component/gae/mail/GMailEndpoint.java | 5 ++- .../component/gae/task/GTaskComponent.java | 1 + .../camel/component/gae/task/GTaskEndpoint.java | 17 +++++++-- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 3 +- ...ponentConfigurationAndDocumentationTest.java | 3 +- .../camel/component/mail/MailEndpoint.java | 2 +- 16 files changed, 85 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java index 0c483bd..22f9264 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; @@ -47,13 +48,13 @@ public class ElasticsearchConfiguration { private static final Integer DEFAULT_PORT = 9300; private URI uri; + @UriPath + private String clusterName; @UriParam private String protocolType; @UriParam private String authority; @UriParam - private String clusterName; - @UriParam private String indexName; @UriParam private String indexType; http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java index d31ed30..83ba384 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Represents an Elasticsearch endpoint. */ -@UriEndpoint(scheme = "elasticsearch") +@UriEndpoint(scheme = "elasticsearch", label = "monitoring") public class ElasticsearchEndpoint extends DefaultEndpoint { private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchEndpoint.class); http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-elasticsearch/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/resources/log4j.properties b/components/camel-elasticsearch/src/main/resources/log4j.properties deleted file mode 100644 index 019ec0e..0000000 --- a/components/camel-elasticsearch/src/main/resources/log4j.properties +++ /dev/null @@ -1,39 +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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests -# -log4j.rootLogger=INFO, file -log4j.logger.org.springframework=WARN - -# uncomment this to turn on debug of camel -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.component.elasticsearch=TRACE - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-elasticsearch-test.log -log4j.appender.file.append=true - http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-elasticsearch/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/test/resources/log4j.properties b/components/camel-elasticsearch/src/test/resources/log4j.properties new file mode 100644 index 0000000..019ec0e --- /dev/null +++ b/components/camel-elasticsearch/src/test/resources/log4j.properties @@ -0,0 +1,39 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +# +# The logging properties used during tests +# +log4j.rootLogger=INFO, file +log4j.logger.org.springframework=WARN + +# uncomment this to turn on debug of camel +#log4j.logger.org.apache.camel=DEBUG +#log4j.logger.org.apache.camel.component.elasticsearch=TRACE + +# CONSOLE appender not used by default +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.file.file=target/camel-elasticsearch-test.log +log4j.appender.file.append=true + http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java index 43e281e..729a410 100644 --- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java +++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookComponent.java @@ -24,7 +24,6 @@ import org.apache.camel.Endpoint; import org.apache.camel.component.facebook.config.FacebookConfiguration; import org.apache.camel.component.facebook.config.FacebookEndpointConfiguration; import org.apache.camel.impl.UriEndpointComponent; -import org.apache.camel.spi.UriParam; import org.apache.camel.util.IntrospectionSupport; /** @@ -32,7 +31,6 @@ import org.apache.camel.util.IntrospectionSupport; */ public class FacebookComponent extends UriEndpointComponent { - @UriParam private FacebookConfiguration configuration; public FacebookComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java index da2b0a7..c5d11e0 100644 --- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java +++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java @@ -33,6 +33,7 @@ import org.apache.camel.component.facebook.data.FacebookPropertiesHelper; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; import org.apache.camel.util.EndpointHelper; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; @@ -46,11 +47,16 @@ import static org.apache.camel.component.facebook.data.FacebookPropertiesHelper. /** * Represents a Facebook endpoint. */ -@UriEndpoint(scheme = "facebook", consumerClass = FacebookConsumer.class) +@UriEndpoint(scheme = "facebook", consumerClass = FacebookConsumer.class, label = "social") public class FacebookEndpoint extends DefaultEndpoint implements FacebookConstants { private static final Logger LOG = LoggerFactory.getLogger(FacebookEndpoint.class); + // Facebook4J method name + @UriPath + private final String methodName; + private FacebookNameStyle nameStyle; + @UriParam private FacebookEndpointConfiguration configuration; @@ -58,10 +64,6 @@ public class FacebookEndpoint extends DefaultEndpoint implements FacebookConstan @UriParam private String inBody; - // Facebook4J method name - private final String methodName; - private FacebookNameStyle nameStyle; - // candidate methods based on method name and endpoint configuration private List<FacebookMethodsType> candidates; http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java index 8513a0e..d0ac301 100644 --- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java +++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java @@ -33,6 +33,7 @@ import org.apache.camel.component.gae.bind.OutboundBinding; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; /** * Represents a <a href="http://camel.apache.org/gauth.html";>GAuth Endpoint</a>. @@ -42,7 +43,7 @@ import org.apache.camel.spi.UriParam; * endpoint URIs are <code>gauth:authorize</code> and <code>gauth:upgrade</code> * , respectively. */ -@UriEndpoint(scheme = "gauth") +@UriEndpoint(scheme = "gauth", label = "cloud") public class GAuthEndpoint extends DefaultEndpoint { public static enum Name { @@ -62,7 +63,7 @@ public class GAuthEndpoint extends DefaultEndpoint { private OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> authorizeBinding; private OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> upgradeBinding; - @UriParam + @UriPath private Name name; @UriParam private String callback; http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java index 98192fa..cc48bd8 100644 --- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java +++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java @@ -21,14 +21,12 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; - import com.google.appengine.api.urlfetch.URLFetchServiceFactory; import org.apache.camel.Exchange; import org.apache.camel.Producer; @@ -41,7 +39,6 @@ import org.apache.camel.component.http.HttpClientConfigurer; import org.apache.camel.component.servlet.ServletComponent; import org.apache.camel.component.servlet.ServletEndpoint; import org.apache.camel.spi.UriEndpoint; -import org.apache.camel.spi.UriParam; import org.apache.camel.util.URISupport; import org.apache.camel.util.UnsafeUriCharactersEncoder; import org.apache.commons.httpclient.HttpConnectionManager; @@ -51,17 +48,12 @@ import org.apache.commons.httpclient.params.HttpClientParams; * Represents a <a href="http://camel.apache.org/ghttp.html";>Google App Engine * HTTP endpoint</a>. */ -@UriEndpoint(scheme = "ghttp") +@UriEndpoint(scheme = "ghttp", label = "cloud") public class GHttpEndpoint extends ServletEndpoint implements OutboundBindingSupport<GHttpEndpoint, HTTPRequest, HTTPResponse> { - @UriParam public static final String GHTTP_SCHEME = "ghttp"; - @UriParam public static final String GHTTPS_SCHEME = "ghttps"; - - @UriParam public static final String HTTP_SCHEME = "http"; - @UriParam public static final String HTTPS_SCHEME = "https"; private URLFetchService urlFetchService; http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java index eef74d9..09f07e4 100644 --- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java +++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java @@ -24,19 +24,20 @@ import org.apache.camel.component.gae.bind.OutboundBinding; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; /** * Represents a <a href="http://camel.apache.org/glogin.html";>GLogin * Endpoint</a>. */ -@UriEndpoint(scheme = "glogin") +@UriEndpoint(scheme = "glogin", label = "cloud") public class GLoginEndpoint extends DefaultEndpoint { private OutboundBinding<GLoginEndpoint, GLoginData, GLoginData> outboundBinding; - @UriParam + @UriPath private String hostName; - @UriParam + @UriPath private String clientName; @UriParam private String userName; @@ -44,9 +45,9 @@ public class GLoginEndpoint extends DefaultEndpoint { private String password; @UriParam private int devPort; - @UriParam + @UriParam(defaultValue = "false") private boolean devAdmin; - @UriParam + @UriParam(defaultValue = "false") private boolean devMode; private GLoginService service; http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java index bf63c83..02b9b32 100644 --- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java +++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java @@ -29,16 +29,17 @@ import org.apache.camel.component.gae.bind.OutboundBindingSupport; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; /** * Represents a <a href="http://camel.apache.org/gmail.html";>Google App Engine Mail endpoint</a>. */ -@UriEndpoint(scheme = "gmail") +@UriEndpoint(scheme = "gmail", label = "cloud,mail") public class GMailEndpoint extends DefaultEndpoint implements OutboundBindingSupport<GMailEndpoint, Message, Void> { private OutboundBinding<GMailEndpoint, Message, Void> outboundBinding; private MailService mailService; - @UriParam + @UriPath private String sender; @UriParam private String subject; http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java index 88ec833..8049806 100644 --- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java +++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java @@ -66,6 +66,7 @@ public class GTaskComponent extends ServletComponent { endpoint.setWorkerRoot(workerRoot); endpoint.setOutboundBinding(outboundBinding); endpoint.setInboundBinding(inboundBinding); + endpoint.setQueueName(remaining); endpoint.setQueue(QueueFactory.getQueue(remaining)); return endpoint; } http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java index c789646..f32678d 100644 --- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java +++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java @@ -36,6 +36,7 @@ import org.apache.camel.component.servlet.ServletComponent; import org.apache.camel.component.servlet.ServletEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; import org.apache.commons.httpclient.HttpConnectionManager; import org.apache.commons.httpclient.params.HttpClientParams; @@ -47,10 +48,12 @@ public class GTaskEndpoint extends ServletEndpoint implements OutboundBindingSup private OutboundBinding<GTaskEndpoint, TaskOptions, Void> outboundBinding; private InboundBinding<GTaskEndpoint, HttpServletRequest, HttpServletResponse> inboundBinding; + @UriPath + private String queueName; + private Queue queue; @UriParam private String workerRoot; - private Queue queue; - + public GTaskEndpoint(String endpointUri, ServletComponent component, URI httpUri, HttpClientParams params, HttpConnectionManager httpConnectionManager, @@ -115,7 +118,15 @@ public class GTaskEndpoint extends ServletEndpoint implements OutboundBindingSup public void setQueue(Queue queue) { this.queue = queue; } - + + public String getQueueName() { + return queueName; + } + + public void setQueueName(String queueName) { + this.queueName = queueName; + } + public Producer createProducer() throws Exception { return new GTaskProducer(this); } http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java index 0c4f37b..80e0b74 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class GHttpComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"GHTTP_SCHEME\": { \"kind\": \"parameter\", \"type\": \"string\"")); - assertTrue(json.contains("\"HTTPS_SCHEME\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"httpUri\": { \"kind\": \"path\", \"type\": \"string\"")); + assertTrue(json.contains("\"bridgeEndpoint\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java index 8f105af..2f1e33b 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java @@ -42,7 +42,8 @@ public class GLoginComponentConfigurationAndDocumentationTest extends CamelTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"clientName\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"hostName\": { \"kind\": \"path\", \"type\": \"string\"")); + assertTrue(json.contains("\"clientName\": { \"kind\": \"path\", \"type\": \"string\"")); assertTrue(json.contains("\"devMode\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java index 6e54f23..f238c38 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java @@ -42,7 +42,8 @@ public class GMailComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"sender\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"sender\": { \"kind\": \"path\", \"type\": \"string\"")); + assertTrue(json.contains("\"subject\": { \"kind\": \"parameter\", \"type\": \"string\"")); assertTrue(json.contains("\"bcc\": { \"kind\": \"parameter\", \"type\": \"string\"")); } http://git-wip-us.apache.org/repos/asf/camel/blob/a765a162/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java index 3b11786..dbda337 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java @@ -36,7 +36,7 @@ import org.apache.camel.spi.UriParam; /** * Endpoint for Camel Mail. */ -@UriEndpoint(scheme = "imap,imaps,pop3,pop3s,smtp,smtps", consumerClass = MailConsumer.class) +@UriEndpoint(scheme = "imap,imaps,pop3,pop3s,smtp,smtps", consumerClass = MailConsumer.class, label = "mail") public class MailEndpoint extends ScheduledPollEndpoint { private MailBinding binding; @UriParam
