You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by il...@apache.org on 2018/04/06 09:33:28 UTC
[cxf] branch 3.1.x-fixes updated: Fixing folded schema references
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new e1ddbc3 Fixing folded schema references
e1ddbc3 is described below
commit e1ddbc39c7a1c2cc0e0d653fc7d839e10afb6a89
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Apr 6 11:33:13 2018 +0200
Fixing folded schema references
---
.../cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
index 1ff9b2e..ae2e02c 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
@@ -128,7 +128,7 @@ public final class SwaggerToOpenApiConversionUtils {
sw3.setProperty("externalDocs", externalDocsObject);
}
- return readerWriter.toJson(sw3);
+ return readerWriter.toJson(sw3).replace("#/definitions/", "#/components/schemas/");
}
private static void setComponentsProperty(
@@ -340,8 +340,7 @@ public final class SwaggerToOpenApiConversionUtils {
if (requestBodyName != null) {
requestBodies.put(requestBodyName, sw3RequestBody);
String ref = "#/components/requestBodies/" + requestBodyName;
- sw2PathVerbProps.setProperty("requestBody",
- Collections.singletonMap("$ref", ref));
+ sw2PathVerbProps.setProperty("requestBody", Collections.singletonMap("$ref", ref));
}
}
}
--
To stop receiving notification emails like this one, please contact
ilgrosso@apache.org.