fixed OpenAPI specification for Delay

mock-server · Nov 15, 2018 · 6e73b42 · 6e73b42
1 parent 58aedbd
commit 6e73b42
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 23 deletions.
diff --git a/mockserver-core/src/main/resources/org/mockserver/model/schema/httpClassCallback.json b/mockserver-core/src/main/resources/org/mockserver/model/schema/httpClassCallback.json
@@ -3,6 +3,9 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
+        "delay": {
+            "$ref": "#/definitions/delay"
+        },
         "callbackClass": {
             "type": "string"
         }

diff --git a/mockserver-core/src/main/resources/org/mockserver/model/schema/httpForward.json b/mockserver-core/src/main/resources/org/mockserver/model/schema/httpForward.json
@@ -3,6 +3,9 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
+        "delay": {
+            "$ref": "#/definitions/delay"
+        },
         "host": {
             "type": "string"
         },
@@ -14,9 +17,6 @@
                 "HTTP",
                 "HTTPS"
             ]
-        },
-        "delay": {
-            "$ref": "#/definitions/delay"
         }
     },
     "definitions": {

diff --git a/mockserver-core/src/main/resources/org/mockserver/model/schema/httpObjectCallback.json b/mockserver-core/src/main/resources/org/mockserver/model/schema/httpObjectCallback.json
@@ -3,6 +3,9 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
+        "delay": {
+            "$ref": "#/definitions/delay"
+        },
         "clientId": {
             "type": "string"
         }

diff --git a/...ver-core/src/main/resources/org/mockserver/model/schema/httpOverrideForwardedRequest.json b/...ver-core/src/main/resources/org/mockserver/model/schema/httpOverrideForwardedRequest.json
@@ -3,11 +3,11 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
-        "httpRequest": {
-            "$ref": "#/definitions/httpRequest"
-        },
         "delay": {
             "$ref": "#/definitions/delay"
+        },
+        "httpRequest": {
+            "$ref": "#/definitions/httpRequest"
         }
     },
     "definitions": {

diff --git a/mockserver-core/src/main/resources/org/mockserver/model/schema/httpResponse.json b/mockserver-core/src/main/resources/org/mockserver/model/schema/httpResponse.json
@@ -3,12 +3,12 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
-        "body": {
-            "$ref": "#/definitions/bodyWithContentType"
-        },
         "delay": {
             "$ref": "#/definitions/delay"
         },
+        "body": {
+            "$ref": "#/definitions/bodyWithContentType"
+        },
         "cookies": {
             "$ref": "#/definitions/keyToValue"
         },

diff --git a/mockserver-core/src/main/resources/org/mockserver/model/schema/httpTemplate.json b/mockserver-core/src/main/resources/org/mockserver/model/schema/httpTemplate.json
@@ -3,6 +3,9 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
+        "delay": {
+            "$ref": "#/definitions/delay"
+        },
         "templateType": {
             "enum": [
                 "JAVASCRIPT",
@@ -11,9 +14,6 @@
         },
         "template": {
             "type": "string"
-        },
-        "delay": {
-            "$ref": "#/definitions/delay"
         }
     },
     "definitions": {

diff --git a/...er-core/src/main/resources/org/mockserver/openapi/mock-server-openapi-embedded-model.yaml b/...er-core/src/main/resources/org/mockserver/openapi/mock-server-openapi-embedded-model.yaml
@@ -265,14 +265,24 @@ components:
       oneOf:
       - required:
         - httpResponse
+      - required:
+        - httpResponseTemplate
+      - required:
+        - httpResponseClassCallback
+      - required:
+        - httpResponseObjectCallback
       - required:
         - httpForward
       - required:
-        - httpClassCallback
+        - httpForwardTemplate
       - required:
-        - httpError
+        - httpForwardClassCallback
       - required:
-        - httpObjectCallback
+        - httpForwardObjectCallback
+      - required:
+        - httpOverrideForwardedRequest
+      - required:
+        - httpError
     HttpRequest:
       title: "request matcher"
       type: object
@@ -299,10 +309,10 @@ components:
       type: object
       additionalProperties: false
       properties:
-        body:
-          $ref: "#/components/schemas/BodyWithContentType"
         delay:
           $ref: "#/components/schemas/Delay"
+        body:
+          $ref: "#/components/schemas/BodyWithContentType"
         cookies:
           $ref: "#/components/schemas/KeyToValue"
         connectionOptions:
@@ -318,19 +328,21 @@ components:
       type: object
       additionalProperties: false
       properties:
+        delay:
+          $ref: "#/components/schemas/Delay"
         templateType:
           enum:
           - JAVASCRIPT
           - VELOCITY
         template:
           type: string
-        delay:
-          $ref: "#/components/schemas/Delay"
     HttpForward:
       title: host and port to forward to
       type: object
       additionalProperties: false
       properties:
+        delay:
+          $ref: "#/components/schemas/Delay"
         host:
           type: string
         port:
@@ -339,31 +351,33 @@ components:
           enum:
           - HTTP
           - HTTPS
-        delay:
-          $ref: "#/components/schemas/Delay"
     HttpClassCallback:
       title: class callback
       type: object
       additionalProperties: false
       properties:
+        delay:
+          $ref: "#/components/schemas/Delay"
         callbackClass:
           type: string
     HttpObjectCallback:
       title: object / method callback
       type: object
       additionalProperties: false
       properties:
+        delay:
+          $ref: "#/components/schemas/Delay"
         clientId:
           type: string
     HttpOverrideForwardedRequest:
       title: override forwarded request
       type: object
       additionalProperties: false
       properties:
-        httpRequest:
-          $ref: "#/components/schemas/HttpRequest"
         delay:
           $ref: "#/components/schemas/Delay"
+        httpRequest:
+          $ref: "#/components/schemas/HttpRequest"
     HttpError:
       title: error behaviour
       type: object