[camel] branch camel-2.x updated: CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 8487416 CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
8487416 is described below
commit 84874166d76d4379edb82f1a25ab356084fbb824
Author: Dmitry Volodin
AuthorDate: Thu Mar 21 19:11:42 2019 +0300
CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
---
.../java/org/apache/camel/swagger/RestSwaggerSupport.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
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 c0578fe..56d9773 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
@@ -31,14 +31,13 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.swagger.jackson.mixin.ResponseSchemaMixin;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Contact;
import io.swagger.models.Info;
import io.swagger.models.License;
-import io.swagger.models.Response;
import io.swagger.models.Scheme;
import io.swagger.models.Swagger;
+import io.swagger.util.Json;
import io.swagger.util.Yaml;
import org.apache.camel.Exchange;
import org.apache.camel.model.ModelHelper;
@@ -205,6 +204,8 @@ public class RestSwaggerSupport {
public void renderResourceListing(RestApiResponseAdapter response,
BeanConfig swaggerConfig, String contextId, String route, boolean json, boolean
yaml,
Map headers, ClassResolver classResolver,
RestConfiguration configuration) throws Exception {
+ObjectMapper mapper;
+
LOG.trace("renderResourceListing");
if (cors) {
@@ -227,10 +228,9 @@ public class RestSwaggerSupport {
clearVendorExtensions(swagger);
}
-ObjectMapper mapper = new ObjectMapper();
+mapper = Json.mapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
byte[] bytes = mapper.writeValueAsBytes(swagger);
@@ -251,10 +251,9 @@ public class RestSwaggerSupport {
clearVendorExtensions(swagger);
}
-ObjectMapper mapper = new ObjectMapper();
+mapper = Yaml.mapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
byte[] jsonData = mapper.writeValueAsBytes(swagger);
[camel] branch camel-2.23.x updated: CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.23.x by this push:
new 072d3ce CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
072d3ce is described below
commit 072d3ce3d18d973d4ddd8078f016818f472326a6
Author: Dmitry Volodin
AuthorDate: Thu Mar 21 19:11:42 2019 +0300
CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
---
.../java/org/apache/camel/swagger/RestSwaggerSupport.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
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 249faa3..7104fe8 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
@@ -31,14 +31,13 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.swagger.jackson.mixin.ResponseSchemaMixin;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Contact;
import io.swagger.models.Info;
import io.swagger.models.License;
-import io.swagger.models.Response;
import io.swagger.models.Scheme;
import io.swagger.models.Swagger;
+import io.swagger.util.Json;
import io.swagger.util.Yaml;
import org.apache.camel.Exchange;
import org.apache.camel.model.ModelHelper;
@@ -205,6 +204,8 @@ public class RestSwaggerSupport {
public void renderResourceListing(RestApiResponseAdapter response,
BeanConfig swaggerConfig, String contextId, String route, boolean json, boolean
yaml,
Map headers, ClassResolver classResolver,
RestConfiguration configuration) throws Exception {
+ObjectMapper mapper;
+
LOG.trace("renderResourceListing");
if (cors) {
@@ -225,10 +226,9 @@ public class RestSwaggerSupport {
clearVendorExtensions(swagger);
}
-ObjectMapper mapper = new ObjectMapper();
+mapper = Json.mapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
byte[] bytes = mapper.writeValueAsBytes(swagger);
@@ -247,10 +247,9 @@ public class RestSwaggerSupport {
clearVendorExtensions(swagger);
}
-ObjectMapper mapper = new ObjectMapper();
+mapper = Yaml.mapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
byte[] jsonData = mapper.writeValueAsBytes(swagger);
[camel] branch master updated: CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
This is an automated email from the ASF dual-hosted git repository.
dmvolod 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 e3cdcd4 CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
e3cdcd4 is described below
commit e3cdcd4357c21958872e89ed3f823cec9ea28746
Author: Dmitry Volodin
AuthorDate: Thu Mar 21 18:29:48 2019 +0300
CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL
---
.../java/org/apache/camel/swagger/RestSwaggerSupport.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
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 4f0968a..e8a7abe 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
@@ -37,14 +37,13 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.swagger.jackson.mixin.ResponseSchemaMixin;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Contact;
import io.swagger.models.Info;
import io.swagger.models.License;
-import io.swagger.models.Response;
import io.swagger.models.Scheme;
import io.swagger.models.Swagger;
+import io.swagger.util.Json;
import io.swagger.util.Yaml;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -256,6 +255,8 @@ public class RestSwaggerSupport {
public void renderResourceListing(CamelContext camelContext,
RestApiResponseAdapter response, BeanConfig swaggerConfig, String contextId,
String route, boolean json, boolean yaml,
Map headers,
ClassResolver classResolver, RestConfiguration configuration) throws Exception {
+ObjectMapper mapper;
+
LOG.trace("renderResourceListing");
if (cors) {
@@ -284,10 +285,9 @@ public class RestSwaggerSupport {
clearVendorExtensions(swagger);
}
-ObjectMapper mapper = new ObjectMapper();
+mapper = Json.mapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
byte[] bytes = mapper.writeValueAsBytes(swagger);
@@ -308,10 +308,9 @@ public class RestSwaggerSupport {
clearVendorExtensions(swagger);
}
-ObjectMapper mapper = new ObjectMapper();
+mapper = Yaml.mapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-mapper.addMixIn(Response.class, ResponseSchemaMixin.class);
byte[] jsonData = mapper.writeValueAsBytes(swagger);
[camel] branch master updated: Upgrade JGroups to version 4.0.19.Final
This is an automated email from the ASF dual-hosted git repository. acosentino 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 76717b3 Upgrade JGroups to version 4.0.19.Final 76717b3 is described below commit 76717b3c7fb1f80aabb840d2f4268fce91eab44f Author: Andrea Cosentino AuthorDate: Thu Mar 21 16:26:05 2019 +0100 Upgrade JGroups to version 4.0.19.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 37f6eac..81af0d1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -378,7 +378,7 @@ org.eclipse.jetty 1.4.0 5.3.0.201903130848-r -4.0.18.Final +4.0.19.Final 0.4.2.Final 4.0.15.Final 1.8
[camel-k-runtime] branch master updated (654b2dd -> 03477de)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. from 654b2dd fix: add custom netty http binding to workaround CAMEL-13351 new b6373f9 chore(build): update dependencies new 03477de chore(build): fix immutables warning The 187 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: .../camel/k/tooling/maven/model/crd/CamelCatalog.java | 13 +++-- pom.xml | 12 ++-- 2 files changed, 17 insertions(+), 8 deletions(-)
[camel] branch camel-2.23.x updated (9f10c0b -> 3d331e8)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 9f10c0b CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL new 9ce70ff CAMEL-13348 support to do the elasticsearch without specifying the indexName and indexType new 3d331e8 CAMEL-13352 Updated the document of HostAddresses option The 34221 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/docs/elasticsearch-rest-component.adoc| 2 +- .../elasticsearch/ElasticsearchConfiguration.java | 3 +-- .../converter/ElasticsearchActionRequestConverter.java | 18 ++ .../ElasticsearchGetSearchDeleteExistsUpdateTest.java | 18 +- 4 files changed, 29 insertions(+), 12 deletions(-)
[camel] branch camel-2.x updated (670488a -> 717c73f)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 670488a CAMEL-13340: Invalid swagger json/yaml generated for Rest DSL new 317c886 CAMEL-13348 support to do the elasticsearch without specifying the indexName and indexType new ddec085 CAMEL-13352 Updated the document of HostAddresses option new 717c73f CAMEL-13352 Update the elasticsearch-rest-component The 34403 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/docs/elasticsearch-rest-component.adoc| 2 +- .../elasticsearch/ElasticsearchConfiguration.java | 3 +-- .../converter/ElasticsearchActionRequestConverter.java | 18 ++ .../ElasticsearchGetSearchDeleteExistsUpdateTest.java | 18 +- 4 files changed, 29 insertions(+), 12 deletions(-)
[camel] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 99c72f3 Regen 99c72f3 is described below commit 99c72f3610d95151e24f4b4ff13a13c0028e5524 Author: Claus Ibsen AuthorDate: Thu Mar 21 08:15:44 2019 +0100 Regen --- .../src/main/docs/elasticsearch-rest-component.adoc | 2 +- docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc index 5bfa09c..93fa2fa 100644 --- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc +++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc @@ -82,7 +82,7 @@ with the following path and query parameters: | *connectionTimeout* (producer) | The time in ms to wait before connection will timeout. | 3 | int | *disconnect* (producer) | Disconnect after it finish calling the producer | false | boolean | *enableSSL* (producer) | Enable SSL | false | boolean -| *hostAddresses* (producer) | *Required* Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for hostAddresses to be considered instead. | | String +| *hostAddresses* (producer) | *Required* Comma separated list with ip:port formatted remote transport addresses to use. | | String | *indexName* (producer) | The name of the index to act against | | String | *indexType* (producer) | The type of the index to act against | | String | *maxRetryTimeout* (producer) | The time in ms before retry | 3 | int diff --git a/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc b/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc index 5bfa09c..93fa2fa 100644 --- a/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc +++ b/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc @@ -82,7 +82,7 @@ with the following path and query parameters: | *connectionTimeout* (producer) | The time in ms to wait before connection will timeout. | 3 | int | *disconnect* (producer) | Disconnect after it finish calling the producer | false | boolean | *enableSSL* (producer) | Enable SSL | false | boolean -| *hostAddresses* (producer) | *Required* Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for hostAddresses to be considered instead. | | String +| *hostAddresses* (producer) | *Required* Comma separated list with ip:port formatted remote transport addresses to use. | | String | *indexName* (producer) | The name of the index to act against | | String | *indexType* (producer) | The type of the index to act against | | String | *maxRetryTimeout* (producer) | The time in ms before retry | 3 | int
