You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/26 09:49:21 UTC
[1/2] camel git commit: CAMEL-9532: swagger should output default
value from defined param.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 6967f518c -> 83b9c517e
refs/heads/master 9d4c8d04a -> 8fb7ed5db
CAMEL-9532: swagger should output default value from defined param.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fb7ed5d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fb7ed5d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fb7ed5d
Branch: refs/heads/master
Commit: 8fb7ed5db2dce907dfd6c0c620ad8b3ebf496957
Parents: 9d4c8d0
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 26 09:48:49 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 26 09:48:49 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReader.java | 9 +++++++++
.../camel/swagger/RestSwaggerReaderDayOfWeekTest.java | 2 ++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8fb7ed5d/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index d0c5a55..ba1ba67 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -34,6 +34,7 @@ import io.swagger.models.RefModel;
import io.swagger.models.Response;
import io.swagger.models.Swagger;
import io.swagger.models.Tag;
+import io.swagger.models.parameters.AbstractSerializableParameter;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.parameters.FormParameter;
import io.swagger.models.parameters.HeaderParameter;
@@ -223,6 +224,14 @@ public class RestSwaggerReader {
}
}
+ // set default value on parameter
+ if (parameter instanceof AbstractSerializableParameter) {
+ AbstractSerializableParameter qp = (AbstractSerializableParameter) parameter;
+ if (param.getDefaultValue() != null) {
+ qp.setDefaultValue(param.getDefaultValue());
+ }
+ }
+
// set schema on body parameter
if (parameter instanceof BodyParameter) {
BodyParameter bp = (BodyParameter) parameter;
http://git-wip-us.apache.org/repos/asf/camel/blob/8fb7ed5d/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
index cd7df02..01f949f 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
@@ -48,6 +48,7 @@ public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
.get("/week").description("Day of week")
.param().name("day").type(RestParamType.query).description("Day of week")
+ .defaultValue("friday")
.dataType("string").allowableValues("monday", "tuesday", "wednesday", "thursday", "friday")
.endParam()
.responseMessage()
@@ -80,6 +81,7 @@ public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
log.info(json);
assertTrue(json.contains("\"host\" : \"localhost:8080\""));
+ assertTrue(json.contains("\"default\" : \"friday\""));
assertTrue(json.contains("\"enum\" : [ \"monday\", \"tuesday\", \"wednesday\", \"thursday\", \"friday\" ]"));
assertTrue(json.contains("\"$ref\" : \"#/definitions/DayResponse\""));
assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.DayResponse\""));
[2/2] camel git commit: CAMEL-9532: swagger should output default
value from defined param.
Posted by da...@apache.org.
CAMEL-9532: swagger should output default value from defined param.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83b9c517
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83b9c517
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83b9c517
Branch: refs/heads/camel-2.16.x
Commit: 83b9c517e99c205f59c1a80463ac795f6e4a5fe8
Parents: 6967f51
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 26 09:48:49 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 26 09:49:10 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReader.java | 9 +++++++++
.../camel/swagger/RestSwaggerReaderDayOfWeekTest.java | 2 ++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/83b9c517/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index d0c5a55..ba1ba67 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -34,6 +34,7 @@ import io.swagger.models.RefModel;
import io.swagger.models.Response;
import io.swagger.models.Swagger;
import io.swagger.models.Tag;
+import io.swagger.models.parameters.AbstractSerializableParameter;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.parameters.FormParameter;
import io.swagger.models.parameters.HeaderParameter;
@@ -223,6 +224,14 @@ public class RestSwaggerReader {
}
}
+ // set default value on parameter
+ if (parameter instanceof AbstractSerializableParameter) {
+ AbstractSerializableParameter qp = (AbstractSerializableParameter) parameter;
+ if (param.getDefaultValue() != null) {
+ qp.setDefaultValue(param.getDefaultValue());
+ }
+ }
+
// set schema on body parameter
if (parameter instanceof BodyParameter) {
BodyParameter bp = (BodyParameter) parameter;
http://git-wip-us.apache.org/repos/asf/camel/blob/83b9c517/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
index cd7df02..01f949f 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
@@ -48,6 +48,7 @@ public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
.get("/week").description("Day of week")
.param().name("day").type(RestParamType.query).description("Day of week")
+ .defaultValue("friday")
.dataType("string").allowableValues("monday", "tuesday", "wednesday", "thursday", "friday")
.endParam()
.responseMessage()
@@ -80,6 +81,7 @@ public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
log.info(json);
assertTrue(json.contains("\"host\" : \"localhost:8080\""));
+ assertTrue(json.contains("\"default\" : \"friday\""));
assertTrue(json.contains("\"enum\" : [ \"monday\", \"tuesday\", \"wednesday\", \"thursday\", \"friday\" ]"));
assertTrue(json.contains("\"$ref\" : \"#/definitions/DayResponse\""));
assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.DayResponse\""));