This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit a18684be09309dec2379c0cb50a118072ae678d0 Author: wujimin <wuji...@huawei.com> AuthorDate: Thu Dec 21 11:22:56 2017 +0800 JAV-582 jaxrs Response switch to new mechanism --- .../generator/jaxrs/JaxrsSwaggerGeneratorContext.java | 9 --------- ...ponseProcessor.java => JaxrsResponseProcessor.java} | 7 ++++++- ...cecomb.swagger.generator.core.ResponseTypeProcessor | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java index dcbf1bc..3ab4321 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java @@ -33,7 +33,6 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; import io.servicecomb.swagger.generator.core.utils.ClassUtils; import io.servicecomb.swagger.generator.jaxrs.processor.annotation.ConsumesAnnotationProcessor; @@ -47,7 +46,6 @@ import io.servicecomb.swagger.generator.jaxrs.processor.annotation.PathParamAnno import io.servicecomb.swagger.generator.jaxrs.processor.annotation.ProducesAnnotationProcessor; import io.servicecomb.swagger.generator.jaxrs.processor.annotation.QueryParamAnnotationProcessor; import io.servicecomb.swagger.generator.jaxrs.processor.parameter.JaxrsDefaultParameterProcessor; -import io.servicecomb.swagger.generator.jaxrs.processor.response.ResponseProcessor; import io.servicecomb.swagger.generator.rest.RestSwaggerGeneratorContext; public class JaxrsSwaggerGeneratorContext extends RestSwaggerGeneratorContext { @@ -113,11 +111,4 @@ public class JaxrsSwaggerGeneratorContext extends RestSwaggerGeneratorContext { parameterAnnotationMgr.register(HeaderParam.class, new HeaderParamAnnotationProcessor()); parameterAnnotationMgr.register(QueryParam.class, new QueryParamAnnotationProcessor()); } - - @Override - protected void initResponseTypeProcessorMgr() { - super.initResponseTypeProcessorMgr(); - - responseTypeProcessorMgr.register(Response.class, new ResponseProcessor()); - } } diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/processor/response/ResponseProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java similarity index 91% rename from swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/processor/response/ResponseProcessor.java rename to swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java index 59e9b70..12366c1 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/processor/response/ResponseProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/io/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java @@ -20,6 +20,7 @@ import java.lang.reflect.Type; import java.util.List; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import io.servicecomb.swagger.generator.core.OperationGenerator; import io.servicecomb.swagger.generator.core.ResponseTypeProcessor; @@ -27,7 +28,11 @@ import io.servicecomb.swagger.generator.core.utils.ParamUtils; import io.swagger.converter.ModelConverters; import io.swagger.models.properties.Property; -public class ResponseProcessor implements ResponseTypeProcessor { +public class JaxrsResponseProcessor implements ResponseTypeProcessor { + @Override + public Class<?> getResponseType() { + return Response.class; + } @Override public Property process(OperationGenerator operationGenerator) { diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/io.servicecomb.swagger.generator.core.ResponseTypeProcessor b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/io.servicecomb.swagger.generator.core.ResponseTypeProcessor new file mode 100644 index 0000000..eb2f38b --- /dev/null +++ b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/io.servicecomb.swagger.generator.core.ResponseTypeProcessor @@ -0,0 +1,18 @@ +# +# 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. +# + +io.servicecomb.swagger.generator.jaxrs.processor.response.JaxrsResponseProcessor \ No newline at end of file -- To stop receiving notification emails like this one, please contact "commits@servicecomb.apache.org" <commits@servicecomb.apache.org>.