[camel] branch master updated: CAMEL-14724: swagger/openapi operation id should favour verb, rest, and route in that order.

[davsclaus]

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b072098  CAMEL-14724: swagger/openapi operation id should favour verb, 
rest, and route in that order.
b072098 is described below

commit b072098e8a71a0e4c069370d6afca0843506181d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Mar 16 20:01:31 2020 +0100

    CAMEL-14724: swagger/openapi operation id should favour verb, rest, and 
route in that order.
---
 .../main/java/org/apache/camel/openapi/RestOpenApiReader.java  | 10 +++++++++-
 .../main/java/org/apache/camel/swagger/RestSwaggerReader.java  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
 
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index b390a04..4463b23 100644
--- 
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++ 
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -386,7 +386,15 @@ public class RestOpenApiReader {
             }
 
             final String routeId = verb.getRouteId();
-            final String operationId = 
Optional.ofNullable(rest.getId()).orElse(routeId);
+            // favour ids from verb, rest, route
+            final String operationId;
+            if (verb.getId() != null) {
+                operationId = verb.getId();
+            } else if (rest.getId() != null) {
+                operationId = rest.getId();
+            } else {
+                operationId = routeId;
+            }
             op.operationId = operationId;
 
             // add id as vendor extensions
diff --git 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index c9b75bf..bcd6b53 100644
--- 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -255,7 +255,15 @@ public class RestSwaggerReader {
             }
 
             final String routeId = verb.getRouteId();
-            final String operationId = 
Optional.ofNullable(rest.getId()).orElse(routeId);
+            // favour ids from verb, rest, route
+            final String operationId;
+            if (verb.getId() != null) {
+                operationId = verb.getId();
+            } else if (rest.getId() != null) {
+                operationId = rest.getId();
+            } else {
+                operationId = routeId;
+            }
             op.operationId(operationId);
 
             // add id as vendor extensions