CAMEL-11575 - Rename http4s into https4 which is the real component name
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7087acb6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7087acb6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7087acb6 Branch: refs/heads/camel-2.19.x Commit: 7087acb67d746ca387888f0e351800e696cb972a Parents: 48317c2 Author: Antoine DESSAIGNE <antoine.dessai...@gmail.com> Authored: Fri Jul 21 22:04:54 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jul 22 09:45:46 2017 +0200 ---------------------------------------------------------------------- .../impl/cloud/DefaultServiceCallExpression.java | 4 ++-- .../apache/camel/component/http4/HttpEndpoint.java | 10 +++++----- .../apache/camel/cloud/http4s-service-expression | 17 ----------------- .../apache/camel/cloud/https4-service-expression | 17 +++++++++++++++++ .../springboot/HttpComponentAutoConfiguration.java | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7087acb6/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java index ff3bd34..ebebd24 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java +++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java @@ -75,7 +75,7 @@ public class DefaultServiceCallExpression extends ServiceCallExpressionSupport { if (port == null) { scheme = "http4"; } else if (port == 443) { - scheme = "http4s"; + scheme = "https4"; } else { scheme = "http4"; } @@ -95,4 +95,4 @@ public class DefaultServiceCallExpression extends ServiceCallExpressionSupport { return answer; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/camel/blob/7087acb6/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java index 0ffaab4..aa79b07 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; /** * For calling out to external HTTP servers using Apache HTTP Client 4.x. */ -@UriEndpoint(firstVersion = "2.3.0", scheme = "http4,http4s", title = "HTTP4,HTTP4S", syntax = "http4:httpUri", +@UriEndpoint(firstVersion = "2.3.0", scheme = "http4,https4", title = "HTTP4,HTTPS4", syntax = "http4:httpUri", producerOnly = true, label = "http", lenientProperties = true) public class HttpEndpoint extends HttpCommonEndpoint { @@ -101,7 +101,7 @@ public class HttpEndpoint extends HttpCommonEndpoint { public HttpEndpoint(String endPointURI, HttpComponent component, URI httpURI, HttpClientConnectionManager clientConnectionManager) throws URISyntaxException { this(endPointURI, component, httpURI, HttpClientBuilder.create(), clientConnectionManager, null); } - + public HttpEndpoint(String endPointURI, HttpComponent component, HttpClientBuilder clientBuilder, HttpClientConnectionManager clientConnectionManager, HttpClientConfigurer clientConfigurer) throws URISyntaxException { this(endPointURI, component, null, clientBuilder, clientConnectionManager, clientConfigurer); @@ -178,7 +178,7 @@ public class HttpEndpoint extends HttpCommonEndpoint { } else { clientBuilder.useSystemProperties(); } - + if (isAuthenticationPreemptive()) { // setup the PreemptiveAuthInterceptor here clientBuilder.addInterceptorFirst(new PreemptiveAuthInterceptor()); @@ -232,7 +232,7 @@ public class HttpEndpoint extends HttpCommonEndpoint { public HttpClientConfigurer getHttpClientConfigurer() { return httpClientConfigurer; } - + /** * Register a custom configuration strategy for new {@link HttpClient} instances * created by producers or consumers such as to configure authentication mechanisms etc @@ -307,7 +307,7 @@ public class HttpEndpoint extends HttpCommonEndpoint { public void setCookieHandler(CookieHandler cookieHandler) { super.setCookieHandler(cookieHandler); - // if we set an explicit cookie handler + // if we set an explicit cookie handler this.cookieStore = new NoopCookieStore(); } http://git-wip-us.apache.org/repos/asf/camel/blob/7087acb6/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/http4s-service-expression ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/http4s-service-expression b/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/http4s-service-expression deleted file mode 100644 index 60bc936..0000000 --- a/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/http4s-service-expression +++ /dev/null @@ -1,17 +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. -# -class=org.apache.camel.component.http4.cloud.Http4ServiceExpressionFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/7087acb6/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/https4-service-expression ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/https4-service-expression b/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/https4-service-expression new file mode 100644 index 0000000..60bc936 --- /dev/null +++ b/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/cloud/https4-service-expression @@ -0,0 +1,17 @@ +# +# 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. +# +class=org.apache.camel.component.http4.cloud.Http4ServiceExpressionFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/7087acb6/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java index 040655f..d24ac47 100644 --- a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java @@ -50,7 +50,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class HttpComponentAutoConfiguration { @Lazy - @Bean(name = "http4-component") + @Bean(name = {"http4-component", "https4-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HttpComponent.class) public HttpComponent configureHttpComponent(CamelContext camelContext,
