camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: Update Components Spring-boot Auto Configuration
Date Fri, 10 Jun 2016 14:37:10 GMT
Repository: camel
Updated Branches:
  refs/heads/master e42ef725c -> 2c7e84c9f


Update Components Spring-boot Auto Configuration


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

Branch: refs/heads/master
Commit: 2c7e84c9f4be7e5de69d59840ed647cad73c7c37
Parents: e42ef72
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Fri Jun 10 16:36:03 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri Jun 10 16:36:03 2016 +0200

----------------------------------------------------------------------
 .../cometd/springboot/CometdComponentAutoConfiguration.java    | 3 ++-
 .../springboot/WebsocketComponentAutoConfiguration.java        | 3 ++-
 .../websocket/springboot/WebsocketComponentConfiguration.java  | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2c7e84c9/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index f6eaf4f..ed11ce3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -42,7 +42,8 @@ public class CometdComponentAutoConfiguration {
         CometdComponent component = new CometdComponent();
         component.setCamelContext(camelContext);
         Map<String, Object> parameters = new HashMap<>();
-        IntrospectionSupport.getProperties(configuration, parameters, null);
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
         IntrospectionSupport.setProperties(camelContext,
                 camelContext.getTypeConverter(), component, parameters);
         return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/2c7e84c9/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 2b5dda8..92a74be 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -43,7 +43,8 @@ public class WebsocketComponentAutoConfiguration {
         WebsocketComponent component = new WebsocketComponent();
         component.setCamelContext(camelContext);
         Map<String, Object> parameters = new HashMap<>();
-        IntrospectionSupport.getProperties(configuration, parameters, null);
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
         IntrospectionSupport.setProperties(camelContext,
                 camelContext.getTypeConverter(), component, parameters);
         return component;

http://git-wip-us.apache.org/repos/asf/camel/blob/2c7e84c9/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
index 76a2821..a40d156 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
@@ -64,7 +64,7 @@ public class WebsocketComponentConfiguration {
      * If this option is true Jetty JMX support will be enabled for this
      * endpoint. See Jetty JMX support for more details.
      */
-    private boolean enableJmx;
+    private Boolean enableJmx = false;
     /**
      * To set a value for minimum number of threads in server thread pool.
      * MaxThreads/minThreads or threadPool fields are required due to switch to
@@ -141,11 +141,11 @@ public class WebsocketComponentConfiguration {
         this.sslKeystore = sslKeystore;
     }
 
-    public boolean isEnableJmx() {
+    public Boolean getEnableJmx() {
         return enableJmx;
     }
 
-    public void setEnableJmx(boolean enableJmx) {
+    public void setEnableJmx(Boolean enableJmx) {
         this.enableJmx = enableJmx;
     }
 


Mime
View raw message