Merge pull request #21 from zweidenker/development

Development

Author: noha

source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st

@@ -1,4 +1,4 @@
 baselines
 mocketry: spec
 	spec baseline: 'Mocketry' with: [ 
-		spec repository: 'github://dionisiydk/Mocketry:v4.0.x'. ]
+		spec repository: 'github://dionisiydk/Mocketry:v4.0.x'. ]

source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st

@@ -15,6 +15,14 @@ operationObjectJSON
       "schema": {
         "type": "string"
       }
+    },
+	{
+      "name": "secondId",
+      "in": "query",
+      "description": "an ID to have more than one",
+      "schema": {
+        "type": "string"
+      }
     }
   ],
   "requestBody": {

source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st

@@ -113,7 +113,15 @@ petStoreApiJsonString
             "schema": {
               "type": "string"
             }
-          }
+          },
+			{
+      			"name": "secondId",
+      			"in": "query",
+      			"description": "just an ID to have more than one",
+      			"schema": {
+        		"type": "string"
+      		}
+    }
         ],
         "responses": {
           "200": {

source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/testOpenAPISpecHasSortedParameters.st

@@ -0,0 +1,10 @@
+tests
+testOpenAPISpecHasSortedParameters
+	| api string json parameters |
+	api := OpenAPI fromString: self petStoreApiJsonString.
+	string := api specString.
+	json := NeoJSONObject fromString: string.
+	parameters := (json paths at: #'/pets/{petId}') get parameters.
+	self assert: parameters size equals: 2.
+	self assert: parameters first name equals: #petId.
+	self assert: parameters second name equals: #secondId

source/OpenAPI-Core.package/OAHeaderParametersLocation.class/instance/extractParameter..st

@@ -0,0 +1,3 @@
+reading
+extractParameter: aCall
+	^ parameter read: (aCall request headers at: parameter name ifAbsent: [ ^ nil ])

source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st

@@ -1,3 +1,5 @@
 as yet unclassified
 read: value object: object
-	^ schema read: value object: object
+	^ [schema read: value object: object] on: JSONSchemaError do: [ :ex |
+			OAInvalidFormat signal: ex description
+		 ]

source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st

@@ -4,7 +4,7 @@ neoJsonMapping: mapper
 		for: self
 		do: [ :mapping | 
 			mapping mapInstVars: #(tags summary description externalDocs operationId responses callbacks deprecated security servers).
-			(mapping mapInstVar: #parameters) valueSchema: #ParameterList.
+			(mapping mapAccessor: #parametersSortedByName mutator: #parameters: to: #parameters) valueSchema: #ParameterList.
 			(mapping mapInstVar: #requestBody) valueSchema: OARequestBody.
 			(mapping mapAccessor: #responses) valueSchema: #ResponsesDictionary. ].
 	mapper

source/OpenAPI-Core.package/OAOperation.class/instance/deprecated1..st

@@ -1,7 +1,11 @@
 reading
-initializeValuesOn: object fromRequest: request
+initializeValuesOn: aCall fromRequest: request
 	parameters ifNotNil: [
 		parameters do: [ :each | 
-			each writeParameterValueOn: object request: request]].
+			each 
+				writeParameterValueOn: aCall parameterValueDelegate 
+				request: request]].
 	requestBody ifNotNil: [ 
-		(requestBody readFrom: request object: object) ]
+		(requestBody 
+			readFrom: request 
+			object: aCall bodyValueDelegate ) ]

source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st

@@ -0,0 +1,4 @@
+accessing
+parametersSortedByName
+	parameters ifNil: [ ^ nil ].
+	^ parameters sorted: [ :a :b | a name < b name ]