From 1923db4bd1e01b6ee2d62deff842ccbc344db640 Mon Sep 17 00:00:00 2001 From: Jesse Ehrenzweig Date: Mon, 20 Feb 2023 11:14:24 -0500 Subject: [PATCH] Updated OpenAPI "mp.openapi.extensions.smallrye.openapi" key mapping. * The value string "3.0.3" (OpenApiConstants.OPEN_API_VERSION) had previously been mapped to this MP key. * Update the OpenApiConfigMapping rules so that the "quarkus.smallrye-openapi.open-api-version" key is now mapped to this MP key. --- .../smallrye/openapi/test/jaxrs/ConfigMappingTest.java | 4 ++-- .../smallrye/openapi/runtime/OpenApiConfigMapping.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java index 2ab37c84c37be..451e214b9e2a2 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java @@ -16,7 +16,7 @@ public class ConfigMappingTest { .withApplicationRoot((jar) -> jar .addClasses(DefaultContentTypeResource.class, Greeting.class) - .addAsResource(new StringAsset("quarkus.smallrye-openapi.open-api-version=3.0.3\n" + .addAsResource(new StringAsset("quarkus.smallrye-openapi.open-api-version=3.0.2\n" + "quarkus.smallrye-openapi.servers=http:\\//www.server1.com,http:\\//www.server2.com\n" + "quarkus.smallrye-openapi.info-title=My API\n" + "quarkus.smallrye-openapi.info-version=1.2.3\n" @@ -37,7 +37,7 @@ public void testOpenApiPathAccessResource() { .then() .log().body().and() .body("openapi", - Matchers.equalTo("3.0.3")) + Matchers.equalTo("3.0.2")) .body("servers[0].url", Matchers.startsWith("http://www.server")) .body("servers[1].url", diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConfigMapping.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConfigMapping.java index cc788f25f18ec..01e6666e57993 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConfigMapping.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConfigMapping.java @@ -55,7 +55,7 @@ public Iterator iterateNames(final ConfigSourceInterceptorContext contex private static Map relocations() { Map relocations = new HashMap<>(); - mapKey(relocations, io.smallrye.openapi.api.constants.OpenApiConstants.OPEN_API_VERSION, QUARKUS_OPEN_API_VERSION); + mapKey(relocations, io.smallrye.openapi.api.constants.OpenApiConstants.VERSION, QUARKUS_OPEN_API_VERSION); mapKey(relocations, org.eclipse.microprofile.openapi.OASConfig.SERVERS, QUARKUS_SERVERS); mapKey(relocations, io.smallrye.openapi.api.constants.OpenApiConstants.INFO_TITLE, QUARKUS_INFO_TITLE); mapKey(relocations, io.smallrye.openapi.api.constants.OpenApiConstants.INFO_VERSION, QUARKUS_INFO_VERSION);