CAMEL-9446: camel-swagger-java - Support allowedValues in model generated
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/feb80b4e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/feb80b4e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/feb80b4e Branch: refs/heads/camel-2.16.x Commit: feb80b4e6801e85b4cc16d4626a5758f1c58b44b Parents: 5fb9c98 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 24 10:29:40 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 24 10:30:02 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/swagger/RestSwaggerReader.java | 3 + .../swagger/RestSwaggerReaderDayOfWeekTest.java | 84 ++++++++++++++++++++ 2 files changed, 87 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/feb80b4e/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 bb30433..62ef9e3 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 @@ -206,6 +206,9 @@ public class RestSwaggerReader { if (param.getDataType() != null) { sp.setType(param.getDataType()); } + if (param.getAllowableValues() != null) { + sp.setEnum(param.getAllowableValues()); + } } // set schema on body parameter http://git-wip-us.apache.org/repos/asf/camel/blob/feb80b4e/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 new file mode 100644 index 0000000..7494733 --- /dev/null +++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java @@ -0,0 +1,84 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.swagger; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import io.swagger.jaxrs.config.BeanConfig; +import io.swagger.models.Swagger; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.DefaultClassResolver; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.model.rest.RestParamType; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport { + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + jndi.bind("dummy-rest", new DummyRestConsumerFactory()); + return jndi; + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + // this user REST service is json only + rest("/day").tag("dude").description("Day service") + .consumes("application/json").produces("application/json") + + .get("/week").description("Day of week") + .param().name("day").type(RestParamType.query).description("Day of week") + .dataType("string").allowableValues("monday", "tuesday", "wednesday", "thursday", "friday").endParam() + .to("log:week"); + } + }; + } + + @Test + public void testReaderRead() throws Exception { + BeanConfig config = new BeanConfig(); + config.setHost("localhost:8080"); + config.setSchemes(new String[]{"http"}); + config.setBasePath("/api"); + config.setTitle("Day"); + config.setLicense("Apache 2.0"); + config.setLicenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html";); + RestSwaggerReader reader = new RestSwaggerReader(); + + Swagger swagger = reader.read(context.getRestDefinitions(), null, config, context.getName(), new DefaultClassResolver()); + assertNotNull(swagger); + + ObjectMapper mapper = new ObjectMapper(); + mapper.enable(SerializationFeature.INDENT_OUTPUT); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + String json = mapper.writeValueAsString(swagger); + + log.info(json); + + assertTrue(json.contains("\"host\" : \"localhost:8080\"")); + assertTrue(json.contains("\"enum\" : [ \"monday\", \"tuesday\", \"wednesday\", \"thursday\", \"friday\" ]")); + + context.stop(); + } + +}
