Merge e70b182 into a5a88eb

apache · Nov 15, 2019 · 06f9332 · 06f9332
2 parents a5a88eb + e70b182
commit 06f9332
Show file tree

Hide file tree

Showing 80 changed files with 270 additions and 195 deletions.
diff --git a/...on/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java b/...on/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -26,7 +26,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.exc.InputCoercionException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
@@ -108,7 +108,7 @@ void batFastFail(Class<?> cls, Class<?> e1, Class<?> e2) {
   }
 
   void batFastFail(Class<?> cls) {
-    batFastFail(cls, JsonParseException.class, InvalidFormatException.class);
+    batFastFail(cls, InputCoercionException.class, InvalidFormatException.class);
   }
 
   void batFastFail(String fieldName, Class<?> e1, Class<?> e2) {
@@ -130,8 +130,8 @@ public void testEnum() {
 
   @Test
   public void testChar() {
-    batFastFail(char.class, JsonParseException.class, MismatchedInputException.class);
-    batFastFail(Character.class, JsonParseException.class, MismatchedInputException.class);
+    batFastFail(char.class, InputCoercionException.class, MismatchedInputException.class);
+    batFastFail(Character.class, InputCoercionException.class, MismatchedInputException.class);
 
     batFastFail("cValue", JsonMappingException.class, MismatchedInputException.class);
     batFastFail("cObjValue", JsonMappingException.class, MismatchedInputException.class);

diff --git a/.../src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java b/.../src/test/java/org/apache/servicecomb/core/definition/schema/StaticSchemaFactoryTest.java
@@ -138,7 +138,7 @@ public interface Test3rdPartyServiceIntf {
       + "        default: 0\n"
       + "        format: \"int32\"\n"
       + "      responses:\n"
-      + "        200:\n"
+      + "        \"200\":\n"
       + "          description: \"response of 200\"\n"
       + "          schema:\n"
       + "            type: \"integer\"\n"
@@ -160,7 +160,7 @@ public interface Test3rdPartyServiceIntf {
       + "        default: 0\n"
       + "        format: \"int32\"\n"
       + "      responses:\n"
-      + "        200:\n"
+      + "        \"200\":\n"
       + "          description: \"response of 200\"\n"
       + "          schema:\n"
       + "            type: \"integer\"\n"

diff --git a/core/src/test/resources/test/test/schema.yaml b/core/src/test/resources/test/test/schema.yaml
@@ -37,7 +37,7 @@ paths:
         schema:
           $ref: "#/definitions/testintBody"
       responses:
-        200:
+        "200":
           description: "response of 200"
 definitions:
   testintBody:

diff --git a/demo/demo-crossapp/crossapp-client/src/main/resources/schemas/helloworld.yaml b/demo/demo-crossapp/crossapp-client/src/main/resources/schemas/helloworld.yaml
@@ -30,7 +30,7 @@ paths:
     get:
       operationId: sayHello
       responses: 
-        200:
+        "200":
           description: say hello
           schema: 
             type: string
diff --git a/demo/demo-crossapp/crossapp-server/src/main/resources/schemas/helloworld.yaml b/demo/demo-crossapp/crossapp-server/src/main/resources/schemas/helloworld.yaml
@@ -30,7 +30,7 @@ paths:
     get:
       operationId: sayHello
       responses: 
-        200:
+        "200":
           description: say hello
           schema: 
             type: string
diff --git a/demo/demo-schema/src/main/resources/microservices/jaxrs/compute.yaml b/demo/demo-schema/src/main/resources/microservices/jaxrs/compute.yaml
@@ -51,7 +51,7 @@ paths:
           type: integer
           format: int32
       responses: 
-        200:
+        "200":
           description: add numer
           schema: 
             type: integer
@@ -71,7 +71,7 @@ paths:
           type: integer
           format: int32
       responses:
-        200:
+        "200":
           description: reduce
           schema:
             type: integer
@@ -86,7 +86,7 @@ paths:
           schema:
             $ref: '#/definitions/Person'
       responses:
-        200:
+        "200":
           description: say hello
           schema:
             $ref: '#/definitions/Person'
@@ -100,7 +100,7 @@ paths:
           x-raw-json: true
           type: string
       responses:
-        200:
+        "200":
           description: test RawJson String
           schema:
             type: string
@@ -118,7 +118,7 @@ paths:
           schema:
             $ref: '#/definitions/Person'
       responses:
-        200:
+        "200":
           description: say something
           schema:
             type: string
@@ -131,7 +131,7 @@ paths:
           required: true
           type: string
       responses:
-        200:
+        "200":
           description: say hi
           schema:
             type: string
@@ -148,7 +148,7 @@ paths:
           required: true
           type: string
       responses:
-        200:
+        "200":
           description: say hi
           schema:
             type: string
@@ -161,15 +161,15 @@ paths:
           required: true
           type: string
       responses:
-        200:
+        "200":
           description: say hi
           schema:
             type: string
   /istrue:
     get:
       operationId: isTrue
       responses:
-        200:
+        "200":
           description: is true
           schema:
             type: boolean
@@ -186,7 +186,7 @@ paths:
           items:
             type: string
       responses:
-        200:
+        "200":
           description: add string
           schema:
             type: string

diff --git a/demo/demo-schema/src/main/resources/microservices/pojo/helloworld.Greeter.yaml b/demo/demo-schema/src/main/resources/microservices/pojo/helloworld.Greeter.yaml
@@ -46,7 +46,7 @@ paths:
           schema:
             type: string
       responses: 
-        200:
+        "200":
           description: asdf
           schema:
             type: string
@@ -64,7 +64,7 @@ paths:
           schema:
             type: string
       responses: 
-        200:
+        "200":
           description: asdf
           schema:
             type: string

diff --git a/demo/demo-schema/src/main/resources/microservices/pojo/server.yaml b/demo/demo-schema/src/main/resources/microservices/pojo/server.yaml
@@ -47,7 +47,7 @@ paths:
           items:
             type: string
       responses:
-        200:
+        "200":
           description: asdf
           schema: 
             type: string
@@ -60,7 +60,7 @@ paths:
           required: false
           type: string
       responses:
-        200:
+        "200":
           description: asdf
           schema: 
             type: string
@@ -73,7 +73,7 @@ paths:
           type: integer
           format: int32
       responses:
-        200:
+        "200":
           description: asdf
           schema: 
             type: string
@@ -86,7 +86,7 @@ paths:
           type: integer
           format: int32
       responses:
-        200:
+        "200":
           description: asdf
           schema: 
             type: string
@@ -100,7 +100,7 @@ paths:
           type: integer
           format: int32
       responses:
-        200:
+        "200":
           description: asdf
           schema: 
             type: string
@@ -136,7 +136,7 @@ paths:
           schema:
             $ref: '#/definitions/User'
       responses: 
-        200:
+        "200":
           description: asdf
           schema: 
             $ref: '#/definitions/User'
@@ -154,7 +154,7 @@ paths:
           schema: 
             $ref: '#/definitions/TestRequest'
       responses: 
-        200:
+        "200":
           description: asdf
           schema: 
             $ref: '#/definitions/User'
@@ -173,15 +173,15 @@ paths:
           items:
             type: string
       responses:
-        200:
+        "200":
           description: add string
           schema:
             type: string
   /testTraceId:
     get:
       operationId: testTraceId
       responses:
-        200:
+        "200":
           description: get trace id
           schema:
             type: string

diff --git a/demo/demo-schema/src/main/resources/microservices/pojo/tcc-server.yaml b/demo/demo-schema/src/main/resources/microservices/pojo/tcc-server.yaml
@@ -49,7 +49,7 @@ paths:
           schema:
             $ref: '#/definitions/User'
       responses: 
-        200:
+        "200":
           description: asdf
           schema: 
             $ref: '#/definitions/User'
@@ -67,7 +67,7 @@ paths:
           schema: 
             $ref: '#/definitions/TestRequest'
       responses: 
-        200:
+        "200":
           description: asdf
           schema: 
             $ref: '#/definitions/User'

diff --git a/demo/demo-schema/src/main/resources/microservices/springmvc/controller.yaml b/demo/demo-schema/src/main/resources/microservices/springmvc/controller.yaml
@@ -51,7 +51,7 @@ paths:
           type: integer
           format: int32
       responses: 
-        200:
+        "200":
           description: add numer
           schema: 
             type: integer
@@ -66,7 +66,7 @@ paths:
           required: true
           type: string
       responses:
-        200:
+        "200":
           description: say hello
           schema:
             type: string
@@ -84,7 +84,7 @@ paths:
           schema:
             $ref: '#/definitions/Person'
       responses:
-        200:
+        "200":
           description: say something
           schema:
             type: string
@@ -97,7 +97,7 @@ paths:
           required: true
           type: string
       responses:
-        200:
+        "200":
           description: say hi
           schema:
             type: string
@@ -110,7 +110,7 @@ paths:
           required: true
           type: string
       responses:
-        200:
+        "200":
           description: say hei
           schema:
             type: string

diff --git a/...emo-spring-boot-pojo-server/src/main/resources/microservices/pojo/helloworld.Greeter.yaml b/...emo-spring-boot-pojo-server/src/main/resources/microservices/pojo/helloworld.Greeter.yaml
@@ -46,7 +46,7 @@ paths:
           schema:
             type: string
       responses: 
-        200:
+        "200":
           description: asdf
           schema:
             type: string
@@ -64,7 +64,7 @@ paths:
           schema:
             type: string
       responses: 
-        200:
+        "200":
           description: asdf
           schema:
             type: string