This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d430a82 [CAMEL-15328]Honor Optional http headers as method parameters
to be null in camel-cxfrs producer
new 61492b1 Merge branch 'master' of github.com:apache/camel
d430a82 is described below
commit d430a82cf05bae4eb456d0740164320c9c3a0513
Author: Freeman Fang <[email protected]>
AuthorDate: Wed Jul 22 12:20:33 2020 -0400
[CAMEL-15328]Honor Optional http headers as method parameters to be null in
camel-cxfrs producer
---
.../apache/camel/component/cxf/jaxrs/CxfRsProducer.java | 8 ++++++--
.../camel/builder/endpoint/StaticEndpointBuilders.java | 16 ++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index 0d57864..4c4d227 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -512,7 +512,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
continue;
}
for (int i = 0; i < parameterTypes.length; i++) {
- if (!params[i].isAssignableFrom(parameterTypes[i])) {
+ if (parameterTypes[i] != null &&
!params[i].isAssignableFrom(parameterTypes[i])) {
continue iterate_on_methods;
}
}
@@ -535,7 +535,11 @@ public class CxfRsProducer extends DefaultAsyncProducer {
Class<?>[] answer = new Class[objects.length];
int i = 0;
for (Object obj : objects) {
- answer[i] = obj.getClass();
+ if (obj == null) {
+ answer[i] = null;
+ } else {
+ answer[i] = obj.getClass();
+ }
i++;
}
return answer;
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 5610bf1..38d1118 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -267,7 +267,7 @@ public class StaticEndpointBuilders {
*
* @param path database
*/
- static
org.apache.camel.builder.endpoint.dsl.ArangoDbEndpointBuilderFactory.ArangoDbEndpointBuilder
arangodb(
+ public static
org.apache.camel.builder.endpoint.dsl.ArangoDbEndpointBuilderFactory.ArangoDbEndpointBuilder
arangodb(
String path) {
return
org.apache.camel.builder.endpoint.dsl.ArangoDbEndpointBuilderFactory.endpointBuilder("arangodb",
path);
}
@@ -288,7 +288,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path database
*/
- static
org.apache.camel.builder.endpoint.dsl.ArangoDbEndpointBuilderFactory.ArangoDbEndpointBuilder
arangodb(
+ public static
org.apache.camel.builder.endpoint.dsl.ArangoDbEndpointBuilderFactory.ArangoDbEndpointBuilder
arangodb(
String componentName,
String path) {
return
org.apache.camel.builder.endpoint.dsl.ArangoDbEndpointBuilderFactory.endpointBuilder(componentName,
path);
@@ -1127,7 +1127,7 @@ public class StaticEndpointBuilders {
*
* @param path label
*/
- static
org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.IAM2EndpointBuilder
aws2Iam(
+ public static
org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.IAM2EndpointBuilder
aws2Iam(
String path) {
return
org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.endpointBuilder("aws2-iam",
path);
}
@@ -1148,7 +1148,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path label
*/
- static
org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.IAM2EndpointBuilder
aws2Iam(
+ public static
org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.IAM2EndpointBuilder
aws2Iam(
String componentName,
String path) {
return
org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.endpointBuilder(componentName,
path);
@@ -11385,7 +11385,7 @@ public class StaticEndpointBuilders {
*
* @param path host:port/database/slot:outputPlugin
*/
- public static
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.PgReplicationSlotEndpointBuilder
pgReplicationSlot(
+ static
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.PgReplicationSlotEndpointBuilder
pgReplicationSlot(
String path) {
return
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.endpointBuilder("pg-replication-slot",
path);
}
@@ -11422,7 +11422,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path host:port/database/slot:outputPlugin
*/
- public static
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.PgReplicationSlotEndpointBuilder
pgReplicationSlot(
+ static
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.PgReplicationSlotEndpointBuilder
pgReplicationSlot(
String componentName,
String path) {
return
org.apache.camel.builder.endpoint.dsl.PgReplicationSlotEndpointBuilderFactory.endpointBuilder(componentName,
path);
@@ -14528,7 +14528,7 @@ public class StaticEndpointBuilders {
*
* @param path httpUri
*/
- static
org.apache.camel.builder.endpoint.dsl.VertxHttpEndpointBuilderFactory.VertxHttpEndpointBuilder
vertxHttp(
+ public static
org.apache.camel.builder.endpoint.dsl.VertxHttpEndpointBuilderFactory.VertxHttpEndpointBuilder
vertxHttp(
String path) {
return
org.apache.camel.builder.endpoint.dsl.VertxHttpEndpointBuilderFactory.endpointBuilder("vertx-http",
path);
}
@@ -14549,7 +14549,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path httpUri
*/
- static
org.apache.camel.builder.endpoint.dsl.VertxHttpEndpointBuilderFactory.VertxHttpEndpointBuilder
vertxHttp(
+ public static
org.apache.camel.builder.endpoint.dsl.VertxHttpEndpointBuilderFactory.VertxHttpEndpointBuilder
vertxHttp(
String componentName,
String path) {
return
org.apache.camel.builder.endpoint.dsl.VertxHttpEndpointBuilderFactory.endpointBuilder(componentName,
path);
