You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by kl...@apache.org on 2023/08/19 14:17:32 UTC
[camel] branch main updated: CAMEL-19764: fix generation for basic and bearer security schemes (#11151)
This is an automated email from the ASF dual-hosted git repository.
klease pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 477d2da3b4d CAMEL-19764: fix generation for basic and bearer security schemes (#11151)
477d2da3b4d is described below
commit 477d2da3b4d7eb0cb39cd012fb8f2c4b79d77791
Author: klease <38...@users.noreply.github.com>
AuthorDate: Sat Aug 19 16:17:25 2023 +0200
CAMEL-19764: fix generation for basic and bearer security schemes (#11151)
---
.../src/main/java/org/apache/camel/openapi/OpenAPI3to2.java | 2 +-
.../src/main/java/org/apache/camel/openapi/RestOpenApiReader.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenAPI3to2.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenAPI3to2.java
index 21ff9e25174..2b3f7bcf8dc 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenAPI3to2.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenAPI3to2.java
@@ -134,7 +134,7 @@ public class OpenAPI3to2 {
SecuritySchemeDefinition swaggerScheme = null;
switch (securityScheme.getType()) {
case HTTP:
- if ("basic".equals(securityScheme.getName())) {
+ if ("basic".equals(securityScheme.getScheme())) {
swaggerScheme = new BasicAuthDefinition();
} else {
throw new IllegalStateException("OpenAPI 2.0 does not support bearer token security schemes.");
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 14950c13511..f5e38ebff75 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
@@ -299,11 +299,11 @@ public class RestOpenApiReader {
for (RestSecurityDefinition def : sd.getSecurityDefinitions()) {
if (def instanceof BasicAuthDefinition) {
SecurityScheme auth = new SecurityScheme().type(SecurityScheme.Type.HTTP)
- .name("basic").description(def.getDescription());
+ .scheme("basic").description(def.getDescription());
openApi.getComponents().addSecuritySchemes(def.getKey(), auth);
} else if (def instanceof BearerTokenDefinition) {
SecurityScheme auth = new SecurityScheme().type(SecurityScheme.Type.HTTP)
- .name("bearer").description(def.getDescription())
+ .scheme("bearer").description(def.getDescription())
.bearerFormat(((BearerTokenDefinition) def).getFormat());
openApi.getComponents().addSecuritySchemes(def.getKey(), auth);
} else if (def instanceof ApiKeyDefinition) {