JAV-439 register annotation in AbstractSwaggerGeneratorContext

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>
apache · Oct 16, 2017 · e8204ed · e8204ed
1 parent 9879003
commit e8204ed
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 42 deletions.
diff --git a/.../src/main/java/io/servicecomb/swagger/generator/core/AbstractSwaggerGeneratorContext.java b/.../src/main/java/io/servicecomb/swagger/generator/core/AbstractSwaggerGeneratorContext.java
@@ -24,6 +24,7 @@
 
 import io.servicecomb.foundation.common.RegisterManager;
 import io.servicecomb.foundation.common.utils.SPIServiceUtils;
+import io.servicecomb.swagger.extend.annotations.RawJsonRequestBody;
 import io.servicecomb.swagger.extend.annotations.ResponseHeaders;
 import io.servicecomb.swagger.generator.core.AnnotationProcessorManager.AnnotationType;
 import io.servicecomb.swagger.generator.core.processor.annotation.ApiImplicitParamClassProcessor;
@@ -38,6 +39,7 @@
 import io.servicecomb.swagger.generator.core.processor.annotation.ResponseHeaderProcessor;
 import io.servicecomb.swagger.generator.core.processor.annotation.ResponseHeadersProcessor;
 import io.servicecomb.swagger.generator.core.processor.annotation.SwaggerDefinitionProcessor;
+import io.servicecomb.swagger.generator.core.processor.parametertype.RawJsonRequestBodyProcessor;
 import io.servicecomb.swagger.generator.core.processor.response.DefaultResponseTypeProcessor;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -124,6 +126,7 @@ protected void initMethodAnnotationMgr() {
   }
 
   protected void initParameterAnnotationMgr() {
+    parameterAnnotationMgr.register(RawJsonRequestBody.class, new RawJsonRequestBodyProcessor());
   }
 
   protected void initParameterTypeProcessorMgr() {

diff --git a/...awJsonRequestBodyAnnotationProcessor.java → ...etertype/RawJsonRequestBodyProcessor.java b/...awJsonRequestBodyAnnotationProcessor.java → ...etertype/RawJsonRequestBodyProcessor.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.servicecomb.swagger.generator.springmvc.processor.annotation;
+package io.servicecomb.swagger.generator.core.processor.parametertype;
 
 import io.servicecomb.swagger.generator.core.OperationGenerator;
 import io.servicecomb.swagger.generator.core.ParameterAnnotationProcessor;
 import io.servicecomb.swagger.generator.core.utils.ParamUtils;
 import io.swagger.models.parameters.BodyParameter;
 
-public class RawJsonRequestBodyAnnotationProcessor implements ParameterAnnotationProcessor {
+public class RawJsonRequestBodyProcessor implements ParameterAnnotationProcessor {
   @Override
   public void process(Object annotation, OperationGenerator operationGenerator, int paramIdx) {
     BodyParameter bodyParameter = ParamUtils.createBodyParameter(operationGenerator, paramIdx);

diff --git a/...rs/src/main/java/io/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java b/...rs/src/main/java/io/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java
@@ -34,7 +34,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
-import io.servicecomb.swagger.extend.annotations.RawJsonRequestBody;
 import io.servicecomb.swagger.generator.core.utils.ClassUtils;
 import io.servicecomb.swagger.generator.jaxrs.processor.annotation.ConsumesAnnotationProcessor;
 import io.servicecomb.swagger.generator.jaxrs.processor.annotation.CookieParamAnnotationProcessor;
@@ -46,7 +45,6 @@
 import io.servicecomb.swagger.generator.jaxrs.processor.annotation.PathParamAnnotationProcessor;
 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.annotation.RawJsonRequestBodyAnnotationProcessor;
 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;
@@ -113,8 +111,6 @@ protected void initParameterAnnotationMgr() {
 
     parameterAnnotationMgr.register(HeaderParam.class, new HeaderParamAnnotationProcessor());
     parameterAnnotationMgr.register(QueryParam.class, new QueryParamAnnotationProcessor());
-
-    parameterAnnotationMgr.register(RawJsonRequestBody.class, new RawJsonRequestBodyAnnotationProcessor());
   }
 
   @Override

diff --git a/...b/swagger/generator/jaxrs/processor/annotation/RawJsonRequestBodyAnnotationProcessor.java b/...b/swagger/generator/jaxrs/processor/annotation/RawJsonRequestBodyAnnotationProcessor.java
diff --git a/...ain/java/io/servicecomb/swagger/generator/springmvc/SpringmvcSwaggerGeneratorContext.java b/...ain/java/io/servicecomb/swagger/generator/springmvc/SpringmvcSwaggerGeneratorContext.java
@@ -32,7 +32,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import io.servicecomb.swagger.extend.annotations.RawJsonRequestBody;
 import io.servicecomb.swagger.generator.core.utils.ClassUtils;
 import io.servicecomb.swagger.generator.rest.RestSwaggerGeneratorContext;
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.CookieValueAnnotationProcessor;
@@ -42,7 +41,6 @@
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.PathVariableAnnotationProcessor;
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.PostMappingMethodAnnotationProcessor;
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.PutMappingMethodAnnotationProcessor;
-import io.servicecomb.swagger.generator.springmvc.processor.annotation.RawJsonRequestBodyAnnotationProcessor;
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.RequestAttributeAnnotationProcessor;
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.RequestBodyAnnotationProcessor;
 import io.servicecomb.swagger.generator.springmvc.processor.annotation.RequestHeaderAnnotationProcessor;
@@ -104,7 +102,6 @@ protected void initParameterAnnotationMgr() {
     parameterAnnotationMgr.register(RequestHeader.class, new RequestHeaderAnnotationProcessor());
     parameterAnnotationMgr.register(RequestParam.class, new RequestParamAnnotationProcessor());
     parameterAnnotationMgr.register(RequestAttribute.class, new RequestAttributeAnnotationProcessor());
-    parameterAnnotationMgr.register(RawJsonRequestBody.class, new RawJsonRequestBodyAnnotationProcessor());
   }
 
   @Override