write http operations in source order

Author: hauner

openapi-processor-core-parser-api/src/main/kotlin/io/openapiprocessor/core/parser/HttpMethod.kt

@@ -9,12 +9,12 @@ package io.openapiprocessor.core.parser
  * http methods.
  */
 enum class HttpMethod(val method: String) {
-    GET ("get"),
-    PUT ("put"),
-    POST ("post"),
     DELETE ("delete"),
-    OPTIONS ("options"),
+    GET ("get"),
     HEAD ("head"),
+    OPTIONS ("options"),
     PATCH ("patch"),
+    POST ("post"),
+    PUT ("put"),
     TRACE ("trace")
 }

openapi-processor-core-parser-openapi4j/src/main/kotlin/io/openapiprocessor/core/parser/openapi4j/Path.kt

@@ -22,16 +22,8 @@ class Path(
     override fun getPath(): String = path
 
     override fun getOperations(): List<ParserOperation> {
-        val ops: MutableList<ParserOperation> = mutableListOf()
-
-        HttpMethod.entries.map {
-            val op = info.getOperation(it.method)
-            if (op != null) {
-                ops.add (Operation(it, op, info, refResolver))
-            }
-        }
-
-        return ops
+        return info
+            .operations
+            .map { Operation(HttpMethod.valueOf(it.key.uppercase()), it.value, info, refResolver) }
     }
-
 }

openapi-processor-core-parser-swagger/src/main/kotlin/io/openapiprocessor/core/parser/swagger/Path.kt

@@ -39,13 +39,13 @@ class Path(
 
 fun SwaggerPath.getOperation(method: String): SwaggerOperation? {
     return when(method) {
-        HttpMethod.GET.method -> this.get
-        HttpMethod.PUT.method -> this.put
-        HttpMethod.POST.method -> this.post
         HttpMethod.DELETE.method -> this.delete
-        HttpMethod.OPTIONS.method -> this.options
+        HttpMethod.GET.method -> this.get
         HttpMethod.HEAD.method -> this.head
+        HttpMethod.OPTIONS.method -> this.options
         HttpMethod.PATCH.method -> this.patch
+        HttpMethod.POST.method -> this.post
+        HttpMethod.PUT.method -> this.put
         HttpMethod.TRACE.method -> this.trace
         else -> null
     }

openapi-processor-core/src/testInt/resources/tests/endpoint-http-mapping/inputs/openapi30.yaml

@@ -6,12 +6,12 @@ info:
 paths:
   /endpoint:
 
-    get:
+    delete:
       responses:
         '204':
           description: empty
 
-    delete:
+    get:
       responses:
         '204':
           description: empty

openapi-processor-core/src/testInt/resources/tests/ref-chain-spring-124.1/inputs/apis/user.v1.yaml

@@ -18,6 +18,16 @@ paths:
         required: true
         description: Id of an existing user.
 
+    delete:
+      summary: Delete User by User ID
+      description: Delete the user with the matching user ID.
+      operationId: delete-user-by-userId
+      tags:
+        - user
+      responses:
+        '200':
+          description: OK
+
     get:
       summary: Get User by User ID
       description: Retrieve the information of the user with the matching user ID.
@@ -71,16 +81,6 @@ paths:
               Put User Alice Smith:
                 $ref: '#/components/examples/UserExample'
 
-    delete:
-      summary: Delete User by User ID
-      description: Delete the user with the matching user ID.
-      operationId: delete-user-by-userId
-      tags:
-        - user
-      responses:
-        '200':
-          description: OK
-
   '/user':
     post:
       summary: Create New User

openapi-processor-core/src/testInt/resources/tests/ref-chain-spring-124.1/outputs/api/UserApi.java

@@ -16,6 +16,9 @@ public interface UserApi {
     @Mapping("/user")
     ResponseEntity<User> postUser(@Parameter User body);
 
+    @Mapping("/users/{userId}")
+    ResponseEntity<Void> deleteUserByUserId(@Parameter Long userId);
+
     @Mapping("/users/{userId}")
     ResponseEntity<User> getUserByUserId(@Parameter Long userId);
 
@@ -24,9 +27,6 @@ ResponseEntity<User> putUserByUserId(
             @Parameter Long userId,
             @Parameter User body);
 
-    @Mapping("/users/{userId}")
-    ResponseEntity<Void> deleteUserByUserId(@Parameter Long userId);
-
     @Mapping("/users")
     ResponseEntity<Collection<User>> getAllUsers();
 

openapi-processor-core/src/testInt/resources/tests/ref-chain-spring-124.2/inputs/apis/user-userId.api.v1.yaml

@@ -6,6 +6,16 @@ parameters:
   required: true
   description: Id of an existing user.
 
+delete:
+  summary: Delete User by User ID
+  description: Delete the user with the matching user ID.
+  operationId: delete-user-by-userId
+  tags:
+    - user
+  responses:
+    '200':
+      description: OK
+
 get:
   summary: Get User by User ID
   description: Retrieve the information of the user with the matching user ID.
@@ -58,13 +68,3 @@ put:
           Put User Alice Smith:
             $ref: ../examples/user.example.v1.yaml
     description: ''
-
-delete:
-  summary: Delete User by User ID
-  description: Delete the user with the matching user ID.
-  operationId: delete-user-by-userId
-  tags:
-    - user
-  responses:
-    '200':
-      description: OK

openapi-processor-core/src/testInt/resources/tests/ref-chain-spring-124.2/outputs/api/UserApi.java

@@ -13,6 +13,9 @@
 @Generated(value = "openapi-processor-core", version = "test")
 public interface UserApi {
 
+    @Mapping("/users/{userId}")
+    ResponseEntity<Void> deleteUserByUserId(@Parameter Long userId);
+
     @Mapping("/users/{userId}")
     ResponseEntity<User> getUserByUserId(@Parameter Long userId);
 
@@ -21,9 +24,6 @@ ResponseEntity<User> putUserByUserId(
             @Parameter Long userId,
             @Parameter User body);
 
-    @Mapping("/users/{userId}")
-    ResponseEntity<Void> deleteUserByUserId(@Parameter Long userId);
-
     @Mapping("/user")
     ResponseEntity<User> postUser(@Parameter User body);