You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/03 14:52:44 UTC
[camel] branch sandbox/camel-3.x updated (9be0d0f -> 5f96268)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 9be0d0f Fix backport of Schematron fix to 3.x
new de087b5 CAMEL-12926: fixed null pointer exceptions accessing swagger url in blueprint projects
new 5eb1d5f CAMEL-12932 - Camel-AHC-WS: Consumer parameters are not set
new 5f96268 CAMEL-12932 - Fixed CS
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 4 +++-
.../src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
[camel] 02/03: CAMEL-12932 - Camel-AHC-WS: Consumer parameters are
not set
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5eb1d5fa37f80c0d56cbfe620f054e3252d016e1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 15 09:46:50 2018 +0100
CAMEL-12932 - Camel-AHC-WS: Consumer parameters are not set
---
.../src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index f453e3d..44e1d0c 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -67,7 +67,9 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- return new WsConsumer(this, processor);
+ WsConsumer consumer = new WsConsumer(this, processor);
+ configureConsumer(consumer);
+ return consumer;
}
WebSocket getWebSocket() throws Exception {
[camel] 03/03: CAMEL-12932 - Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5f96268bf767cbce2533a8800dd2eb08bde92576
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 15 09:53:00 2018 +0100
CAMEL-12932 - Fixed CS
---
.../src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 44e1d0c..4c4d5c1 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -67,9 +67,9 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- WsConsumer consumer = new WsConsumer(this, processor);
- configureConsumer(consumer);
- return consumer;
+ WsConsumer consumer = new WsConsumer(this, processor);
+ configureConsumer(consumer);
+ return consumer;
}
WebSocket getWebSocket() throws Exception {
[camel] 01/03: CAMEL-12926: fixed null pointer exceptions accessing
swagger url in blueprint projects
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit de087b5704e49c20282eb373d21fcce8c29f5db7
Author: Andrea Tarocchi <at...@redhat.com>
AuthorDate: Wed Nov 14 16:12:20 2018 +0100
CAMEL-12926: fixed null pointer exceptions accessing swagger url in blueprint projects
---
.../src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 838356e..2bda5451 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -18,6 +18,7 @@ package org.apache.camel.swagger;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -210,7 +211,7 @@ public class RestSwaggerSupport {
List<RestDefinition> rests = getRestDefinitions(contextId);
if (rests != null) {
- final Map<String, Object> apiProperties = configuration.getApiProperties();
+ final Map<String, Object> apiProperties = configuration.getApiProperties() != null ? configuration.getApiProperties() : new HashMap<>();
if (json) {
response.setHeader(Exchange.CONTENT_TYPE, (String) apiProperties.getOrDefault("api.specification.contentType.json", "application/json"));