You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/04/11 16:16:58 UTC

[1/3] camel git commit: CAMEL-11134: fix https4 configuration

Repository: camel
Updated Branches:
  refs/heads/apache-master [created] 9142fcb4c


CAMEL-11134: fix https4 configuration


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/085736d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/085736d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/085736d2

Branch: refs/heads/apache-master
Commit: 085736d21e074a07a2d19f0c3a57633005888d00
Parents: 3bf99cc
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 11 18:05:12 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 11 18:05:12 2017 +0200

----------------------------------------------------------------------
 .../camel/component/http4/HttpEndpoint.java     |  2 +-
 .../main/docs/yaml-snakeyaml-dataformat.adoc    |  2 +-
 .../HttpComponentAutoConfiguration.java         |  2 +-
 .../SnakeYAMLDataFormatConfiguration.java       |  2 +-
 .../SpringBootAutoConfigurationMojo.java        | 20 +++++++++++++++++++-
 5 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/085736d2/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..eb631f8 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 {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/085736d2/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
index bcfa3c6..15b5691 100644
--- a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
+++ b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
@@ -24,7 +24,7 @@ The YAML SnakeYAML dataformat supports 11 options which are listed below.
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |=======================================================================
 | Name | Default | Java Type | Description
-| library | SnakeYAML | YAMLLibrary | Which yaml library to use such. Is by default SnakeYAML
+| library | SnakeYAML | YAMLLibrary | Which yaml library to use. By default it is SnakeYAML
 | unmarshalTypeName |  | String | Class name of the java type to use when unarmshalling
 | constructor |  | String | BaseConstructor to construct incoming documents.
 | representer |  | String | Representer to emit outgoing objects.

http://git-wip-us.apache.org/repos/asf/camel/blob/085736d2/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 4530a87..e675a70 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
@@ -48,7 +48,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,

http://git-wip-us.apache.org/repos/asf/camel/blob/085736d2/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
index 0bd61ab..368e1e4 100644
--- a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
@@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class SnakeYAMLDataFormatConfiguration {
 
     /**
-     * Which yaml library to use such. Is by default SnakeYAML
+     * Which yaml library to use. By default it is SnakeYAML
      */
     private YAMLLibrary library = YAMLLibrary.SnakeYAML;
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/085736d2/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index d7eac27..002f412 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -41,9 +41,11 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import org.apache.camel.maven.packaging.model.ComponentModel;
 import org.apache.camel.maven.packaging.model.ComponentOptionModel;
 import org.apache.camel.maven.packaging.model.DataFormatModel;
@@ -528,7 +530,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
             for (String componentClass : grModels.keySet()) {
                 List<ComponentModel> compModels = grModels.get(componentClass);
                 ComponentModel model = compModels.get(0); // They should be equivalent
-                List<String> aliases = compModels.stream().map(ComponentModel::getScheme).sorted().collect(Collectors.toList());
+                List<String> aliases = compModels.stream().flatMap(mod -> this.getComponentModelSchemes(mod, allModels)).distinct().sorted().collect(Collectors.toList());
 
                 // resolvePropertyPlaceholders is an option which only make sense to use if the component has other options
                 boolean hasOptions = model.getComponentOptions().stream().anyMatch(o -> !o.getName().equals("resolvePropertyPlaceholders"));
@@ -1404,6 +1406,21 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
         writeComponentSpringFactorySource(packageName, name);
     }
 
+    private Stream<String> getComponentModelSchemes(ComponentModel model, List<ComponentModel> allModels) {
+        Set<String> mainSchemes = allModels.stream().map(ComponentModel::getScheme).collect(Collectors.toSet());
+        Set<String> schemes = new TreeSet<>();
+        schemes.add(model.getScheme());
+        if (model.getAlternativeSchemes() != null) {
+            String[] alternativeSchemes = model.getAlternativeSchemes().split(",");
+            for (String s : alternativeSchemes) {
+                if (!StringHelper.isEmpty(s) && !mainSchemes.contains(s)) {
+                    schemes.add(s);
+                }
+            }
+        }
+        return schemes.stream();
+    }
+
     private static String createComponentBody(String shortJavaType, boolean hasOptions) {
         StringBuilder sb = new StringBuilder();
         sb.append(shortJavaType).append(" component = new ").append(shortJavaType).append("();").append("\n");
@@ -1611,6 +1628,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
 
         ComponentModel component = new ComponentModel(true);
         component.setScheme(getSafeValue("scheme", rows));
+        component.setAlternativeSchemes(getSafeValue("alternativeSchemes", rows));
         component.setSyntax(getSafeValue("syntax", rows));
         component.setAlternativeSyntax(getSafeValue("alternativeSyntax", rows));
         component.setTitle(getSafeValue("title", rows));

[2/3] camel git commit: CAMEL-11134: enable ignored tests for https4

Posted by nf...@apache.org.
CAMEL-11134: enable ignored tests for https4


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ce78e0a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ce78e0a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ce78e0a

Branch: refs/heads/apache-master
Commit: 3ce78e0a92ba38234ccaf28b7a570168669e4440
Parents: 085736d
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 11 18:07:35 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 11 18:07:35 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/jetty9/Jetty9SSLTest.java  | 2 --
 .../component/netty4/http/springboot/Netty4HttpSSLTest.java    | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3ce78e0a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
index 6b40ff6..7e80043 100644
--- a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
+++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.component.jetty9.springboot.JettyHttpComponentAutoConfig
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.test.AvailablePortFinder;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +54,6 @@ import static org.junit.Assert.assertEquals;
         "camel.component.jetty.use-global-ssl-context-parameters=true",
         "camel.component.http4.use-global-ssl-context-parameters=true",
 })
-@Ignore("Bug in https4 spring-boot configuration")
 public class Jetty9SSLTest {
 
     private static int port;

http://git-wip-us.apache.org/repos/asf/camel/blob/3ce78e0a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
index d8451b7..68d10fa 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
+++ b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
@@ -16,12 +16,9 @@
  */
 package org.apache.camel.component.netty4.http.springboot;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,9 +50,8 @@ import static org.junit.Assert.assertEquals;
         "camel.ssl.config.trust-managers.key-store.password=changeit",
         "camel.ssl.config.trust-managers.key-store.type=jks",
         "camel.component.netty4-http.use-global-ssl-context-parameters=true",
-        "camel.component.http.use-global-ssl-context-parameters=true"
+        "camel.component.http4.use-global-ssl-context-parameters=true"
 })
-@Ignore("Bug in https4 spring-boot configuration")
 public class Netty4HttpSSLTest {
 
     @Autowired

[3/3] camel git commit: CAMEL-10650: fix documentation on http4 component

Posted by nf...@apache.org.
CAMEL-10650: fix documentation on http4 component


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9142fcb4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9142fcb4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9142fcb4

Branch: refs/heads/apache-master
Commit: 9142fcb4cff088cf8a530c5cd135b0e16efb639a
Parents: 3ce78e0
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 11 18:16:23 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 11 18:16:23 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/http4/HttpComponent.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9142fcb4/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index b465374..7bff7e2 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -85,7 +85,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
         + " Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent."
         + " If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need.")
     protected SSLContextParameters sslContextParameters;
-    @Metadata(label = "security", defaultValue = "false")
+    @Metadata(description = "Enable usage of global SSL context parameters", label = "security", defaultValue = "false")
     private boolean useGlobalSslContextParameters;
     @Metadata(label = "security", description = "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier.")
     protected HostnameVerifier x509HostnameVerifier = new DefaultHostnameVerifier();