[servicecomb-java-chassis] branch weak-contract-type updated: [SCB-1324][WIP][WEAK] basePath should be a single slash when basePath not specified and annotation by RestController

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch weak-contract-type
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/weak-contract-type by this push:
     new d34177c  [SCB-1324][WIP][WEAK] basePath should be a single slash when basePath not specified and annotation by RestController
d34177c is described below

commit d34177c2631bc05749086f3911fdd11e320a2cdd
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue Jun 25 01:20:26 2019 +0800

    [SCB-1324][WIP][WEAK] basePath should be a single slash when basePath not specified and annotation by RestController
---
 .../RestControllerClassAnnotationProcessor.java    | 42 ++++++++++++++++++++++
 ...comb.swagger.generator.ClassAnnotationProcessor |  1 +
 .../test/resources/schemas/testObjectParam.yaml    |  2 +-
 .../test/resources/schemas/testSimpleParam.yaml    |  2 +-
 4 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RestControllerClassAnnotationProcessor.java b/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RestControllerClassAnnotationProcessor.java
new file mode 100644
index 0000000..78cb81a
--- /dev/null
+++ b/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RestControllerClassAnnotationProcessor.java
@@ -0,0 +1,42 @@
+/*
+ * 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.servicecomb.swagger.generator.springmvc.processor.annotation;
+
+import java.lang.reflect.Type;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor;
+import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.models.Swagger;
+
+public class RestControllerClassAnnotationProcessor implements ClassAnnotationProcessor<RestController> {
+  @Override
+  public Type getProcessType() {
+    return RestController.class;
+  }
+
+  @Override
+  public void process(SwaggerGenerator swaggerGenerator, RestController restController) {
+    Swagger swagger = swaggerGenerator.getSwagger();
+    if (StringUtils.isEmpty(swagger.getBasePath())) {
+      swagger.setBasePath("/");
+    }
+  }
+}
diff --git a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor
index 0376d83..c523719 100644
--- a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor
+++ b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor
@@ -15,4 +15,5 @@
 # limitations under the License.
 #
 
+org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.RestControllerClassAnnotationProcessor
 org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.RequestMappingClassAnnotationProcessor
\ No newline at end of file
diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
index 0d43e49..f773c6f 100644
--- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
+++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testObjectParam.yaml
@@ -21,7 +21,7 @@ info:
   version: "1.0.0"
   title: "swagger definition for org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema"
   x-java-interface: "gen.cse.ms.ut.DefaultParameterSchemaIntf"
-basePath: "/DefaultParameterSchema"
+basePath: "/"
 consumes:
 - "application/json"
 produces:
diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
index d73d2f2..f20e24a 100644
--- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
+++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/testSimpleParam.yaml
@@ -21,7 +21,7 @@ info:
   version: "1.0.0"
   title: "swagger definition for org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema"
   x-java-interface: "gen.cse.ms.ut.DefaultParameterSchemaIntf"
-basePath: "/DefaultParameterSchema"
+basePath: "/"
 consumes:
 - "application/json"
 produces: