fix: refs #4907 - fix 'openapi.openapi' field processing for 3.1

Author: frantuma

modules/swagger-jaxrs2/src/main/java/io/swagger/v3/jaxrs2/Reader.java

@@ -289,7 +289,13 @@ public OpenAPI read(Class<?> cls,
         final javax.ws.rs.Path apiPath = ReflectionUtils.getAnnotation(cls, javax.ws.rs.Path.class);
         final boolean openapi31 = Boolean.TRUE.equals(config.isOpenAPI31());
 
-        if (openapi31) {
+        if (
+                openapi31 &&
+                (
+                        config.getOpenAPI() == null ||
+                        config.getOpenAPI().getOpenapi() == null ||
+                        config.getOpenAPI().getOpenapi().startsWith("3.0")
+                ) && config.getOpenAPIVersion() == null) {
             openAPI.setOpenapi("3.1.0");
         }
 

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/ReaderTest.java

@@ -5409,4 +5409,98 @@ public void testTicket4878() {
         SerializationMatchers.assertEqualsToYaml31(openAPI, yaml);
         ModelConverters.reset();
     }
+
+    @Test(description = "Test model resolution for global path parameters with openAPI 3.1")
+    public void testTicket4907() {
+        ModelConverters.reset();
+
+        // openAPI31 true and no other config
+        SwaggerConfiguration config = new SwaggerConfiguration().openAPI31(true);
+        Reader reader = new Reader(config);
+        OpenAPI openAPI = reader.read(Ticket4878Resource.class);
+        String yaml = "openapi: 3.1.0\n" +
+                "paths:\n" +
+                "  /{globalPathParam}/{localPathParam}:\n" +
+                "    get:\n" +
+                "      operationId: getMethod\n" +
+                "      parameters:\n" +
+                "      - name: globalPathParam\n" +
+                "        in: path\n" +
+                "        required: true\n" +
+                "        schema:\n" +
+                "          type: string\n" +
+                "          $comment: 3.1 property for global path param\n" +
+                "      - name: localPathParam\n" +
+                "        in: path\n" +
+                "        required: true\n" +
+                "        schema:\n" +
+                "          type: string\n" +
+                "          $comment: 3.1 property for local path param\n" +
+                "      responses:\n" +
+                "        default:\n" +
+                "          description: default response\n" +
+                "          content:\n" +
+                "            '*/*': {}\n";
+        SerializationMatchers.assertEqualsToYaml31(openAPI, yaml);
+
+        // openAPI31 true and openAPI set
+        config.setOpenAPI(new OpenAPI().openapi("3.1.1"));
+        reader = new Reader(config);
+        openAPI = reader.read(Ticket4878Resource.class);
+        yaml = "openapi: 3.1.1\n" +
+                "paths:\n" +
+                "  /{globalPathParam}/{localPathParam}:\n" +
+                "    get:\n" +
+                "      operationId: getMethod\n" +
+                "      parameters:\n" +
+                "      - name: globalPathParam\n" +
+                "        in: path\n" +
+                "        required: true\n" +
+                "        schema:\n" +
+                "          type: string\n" +
+                "          $comment: 3.1 property for global path param\n" +
+                "      - name: localPathParam\n" +
+                "        in: path\n" +
+                "        required: true\n" +
+                "        schema:\n" +
+                "          type: string\n" +
+                "          $comment: 3.1 property for local path param\n" +
+                "      responses:\n" +
+                "        default:\n" +
+                "          description: default response\n" +
+                "          content:\n" +
+                "            '*/*': {}\n";
+        SerializationMatchers.assertEqualsToYaml31(openAPI, yaml);
+
+        // openAPI31 true and openAPIVersion set
+        config.setOpenAPI(null);
+        config.setOpenAPIVersion("3.1.1");
+        reader = new Reader(config);
+        openAPI = reader.read(Ticket4878Resource.class);
+        yaml = "openapi: 3.1.1\n" +
+                "paths:\n" +
+                "  /{globalPathParam}/{localPathParam}:\n" +
+                "    get:\n" +
+                "      operationId: getMethod\n" +
+                "      parameters:\n" +
+                "      - name: globalPathParam\n" +
+                "        in: path\n" +
+                "        required: true\n" +
+                "        schema:\n" +
+                "          type: string\n" +
+                "          $comment: 3.1 property for global path param\n" +
+                "      - name: localPathParam\n" +
+                "        in: path\n" +
+                "        required: true\n" +
+                "        schema:\n" +
+                "          type: string\n" +
+                "          $comment: 3.1 property for local path param\n" +
+                "      responses:\n" +
+                "        default:\n" +
+                "          description: default response\n" +
+                "          content:\n" +
+                "            '*/*': {}\n";
+        SerializationMatchers.assertEqualsToYaml31(openAPI, yaml);
+        ModelConverters.reset();
+    }
 }