svn commit: r25827 - /release/cxf/3.2.3/
Author: dkulp Date: Mon Mar 19 20:05:28 2018 New Revision: 25827 Log: Add 3.2.3 Added: release/cxf/3.2.3/ release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz (with props) release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.asc release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.md5 release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.sha1 release/cxf/3.2.3/apache-cxf-3.2.3-src.zip (with props) release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.asc release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.md5 release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.sha1 release/cxf/3.2.3/apache-cxf-3.2.3.tar.gz (with props) release/cxf/3.2.3/apache-cxf-3.2.3.tar.gz.asc release/cxf/3.2.3/apache-cxf-3.2.3.tar.gz.md5 release/cxf/3.2.3/apache-cxf-3.2.3.tar.gz.sha1 release/cxf/3.2.3/apache-cxf-3.2.3.zip (with props) release/cxf/3.2.3/apache-cxf-3.2.3.zip.asc release/cxf/3.2.3/apache-cxf-3.2.3.zip.md5 release/cxf/3.2.3/apache-cxf-3.2.3.zip.sha1 Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.asc == --- release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.asc (added) +++ release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.asc Mon Mar 19 20:05:28 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAlqsJ7EACgkQhY/ExPQ4 +VqMYvA/+PJ+aSbo129+E6xKrVm8JZSerN9UOP06V1EAHluD2NoQCi7G3xutf8Oi/ +gYPvtU+HaupDynzkrNYbQGN0d5OfGh0bCVfOm7yT/mlUgn3AF1dHtRj4nwpSkL5V +TGrLDtDVIJI+uDHTnEyGq51VhIhr/fag1WxQBehnOyMKFx5HVuUptgENttzy0ckN +1SMH/pavSvDYZadqEV7jdpzWUbhgaueupkPhLFXJc3CL7bpjzb0ssIunFDhXrTVf +yL9U6AKrDBRewGtyUGxUORSsCh0JaMrO5UuSmzl2XnkoiyPrLs9hUlem4thQUNca +rpMrhdOOCIPF3SCvOHx+4g0lgkIPkxbZq0Wt+wmAzpvTC71KsJVItXj7XGSwMG5G +dA55axLx7wZ6nHdN/BRkH6vxLtC5r6pJXT+O3pqJa1vQGUjC8tGH0skkbPj00bbW +vGSI85I6C0FyD1Cue248LgkDs5VrKjj/3+oKiJzieAvVIcrYvPlqwatO1jE57OZp +jv+rVx+VZ1h6eiSIyPzSGA56bmrZfym3ECDt3qa6t9lRAhHHypcaoJK8M9+YOsoN +TrfWYa5Vk+b2+oLZoKmXs9zmpTOtlVjwkFLJaQt45VixfPLJaaS2pFX55H6R2oIn +RpzEqhlur3fs1MjMqcGFVKdv7+3NQECluiQdjgkhiu0u/8rfe08= +=Jqwg +-END PGP SIGNATURE- Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.md5 == --- release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.md5 (added) +++ release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.md5 Mon Mar 19 20:05:28 2018 @@ -0,0 +1 @@ +90acbe154d4ca4f9e26fd4de3fed25e8 \ No newline at end of file Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.sha1 == --- release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.sha1 (added) +++ release/cxf/3.2.3/apache-cxf-3.2.3-src.tar.gz.sha1 Mon Mar 19 20:05:28 2018 @@ -0,0 +1 @@ +126ab149901b7e1a1129bc701113522b44494fd6 \ No newline at end of file Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.zip == Binary file - no diff available. Propchange: release/cxf/3.2.3/apache-cxf-3.2.3-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.asc == --- release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.asc (added) +++ release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.asc Mon Mar 19 20:05:28 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAlqsJ7EACgkQhY/ExPQ4 +VqPQjQ/+LFicsBvjJdOAqHPnHr4bpROhYc2j914J+AtYizIsbkZNpxAEdy6/nHBd +RDpcHFAzDaaIXUDM8jlLWbYTM1ardyE+FHftCVxBCRZf2jVlYBXHopHfWt/46xE7 +Lgot/vnVwI/iV114pLL4HSViIYjaIq0WckGuDmyZ6tk3sRuOubbiMFN8HA5uwzZz +sBEZCV0OAoMAoNtSj7CxjA15F5rUxdJoyNyyvot3tdHgfhGR+0lwXpbIFJoPhy4v +7d2qyWmKm7oXXzbj95beI16RDAu31JUMBseqPMJ2gU64/sLn7FEeubxcH1m8y70h +wzwOsFmA/baJq1eNsIl5ShgzIzVUVXAGsg47Zd9sH/eR92dd28upIhnwRMScMHKJ +5GmWaQYIW10N39sV7JitEqUSLBQneut626XgQaz/B1FzUiZhHpAO3G7PPdgZjwIH +cpNwiqO8YGsXVPie5uwZlEIcSt1piAY30vSTrDwM4YzMLENbuJZRP3rQrykJQ9a3 +Qmr4+RBK5mcxaiO2T8apL5aqnqzeXDN5teLGWqe42cC7Cb+kze7O0WDpG4qoyIr/ +uvSfZFABBTGrRKH6u2jal48OL3IJ2W+nSgn9SCxMOcuuwMcjkW8SUUMH/kat/OEn +1Ejp5HoIyYAxO3s7nVlA2kIjEQp3niYVQugqwIBwXuo1Ttd5PHY= +=XQVE +-END PGP SIGNATURE- Added: release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.md5 == --- release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.md5 (added) +++ release/cxf/3.2.3/apache-cxf-3.2.3-src.zip.md5 Mon Mar 19 20:0
[cxf] branch 3.1.x-fixes updated: Fixing SwaggerToOpenApiConversionUtils against recent OpenApi 3.0.1
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 1146722 Fixing SwaggerToOpenApiConversionUtils against recent OpenApi
3.0.1
1146722 is described below
commit 11467221746a050e21ae9d1df5817887392db99b
Author: Francesco Chicchiriccò
AuthorDate: Mon Mar 19 16:57:58 2018 +0100
Fixing SwaggerToOpenApiConversionUtils against recent OpenApi 3.0.1
---
.../openapi/SwaggerToOpenApiConversionUtils.java | 145 -
.../SwaggerToOpenApiConversionUtilsTest.java | 11 +-
2 files changed, 85 insertions(+), 71 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 f523377..1ff9b2e 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
@@ -29,6 +29,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import javax.ws.rs.core.MediaType;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -87,58 +88,63 @@ public final class SwaggerToOpenApiConversionUtils {
}
public static String getOpenApiFromSwaggerJson(
-MessageContext ctx, String json, OpenApiConfiguration cfg) throws
IOException {
+final MessageContext ctx,
+final String json,
+final OpenApiConfiguration cfg) throws IOException {
JsonMapObjectReaderWriter readerWriter = new
JsonMapObjectReaderWriter();
JsonMapObject sw2 = readerWriter.fromJsonToJsonObject(json);
JsonMapObject sw3 = new JsonMapObject();
-
+
// "openapi"
-sw3.setProperty("openapi", "3.0.0");
-
+sw3.setProperty("openapi", "3.0.1");
+
// "servers"
setServersProperty(ctx, sw2, sw3);
-
+
// "info"
JsonMapObject infoObject = sw2.getJsonMapProperty("info");
if (infoObject != null) {
sw3.setProperty("info", infoObject);
}
-
+
// "tags"
List> tagsObject = sw2.getListMapProperty("tags");
if (tagsObject != null) {
sw3.setProperty("tags", tagsObject);
}
-
+
// paths
-Map requestBodies = cfg != null &&
cfg.isCreateRequestBodies()
-? new LinkedHashMap() : null;
+Map requestBodies = cfg != null &&
cfg.isCreateRequestBodies()
+? new LinkedHashMap() : null;
setPathsProperty(sw2, sw3, requestBodies);
-
+
// components
setComponentsProperty(sw2, sw3, requestBodies);
-
+
// externalDocs
Object externalDocsObject = sw2.getProperty("externalDocs");
if (externalDocsObject != null) {
sw3.setProperty("externalDocs", externalDocsObject);
}
-
-return readerWriter.toJson(sw3).replace("#/definitions/",
"#/components/schemas/");
+
+return readerWriter.toJson(sw3);
}
-
-private static void setComponentsProperty(JsonMapObject sw2, JsonMapObject
sw3,
- Map
requestBodies) {
+
+private static void setComponentsProperty(
+final JsonMapObject sw2,
+final JsonMapObject sw3,
+final Map requestBodies) {
+
JsonMapObject comps = new JsonMapObject();
-JsonMapObject requestBodiesObj = new JsonMapObject();
+JsonMapObject requestBodiesObj = new JsonMapObject();
if (requestBodies != null) {
for (Map.Entry entry :
requestBodies.entrySet()) {
requestBodiesObj.setProperty(entry.getKey(), entry.getValue());
}
}
comps.setProperty("requestBodies", requestBodiesObj);
-
+
JsonMapObject s2Defs = sw2.getJsonMapProperty("definitions");
if (s2Defs != null) {
for (Object schema : s2Defs.asMap().values()) {
@@ -152,7 +158,7 @@ public final class SwaggerToOpenApiConversionUtils {
}
}
}
-
+
comps.setProperty("schemas", s2Defs);
}
JsonMapObject s2SecurityDefs =
sw2.getJsonMapProperty("securityDefinitions");
@@ -167,30 +173,33 @@ public final class SwaggerToOpenApiConversionUtils {
}
}
}
-
+
sw3.setProperty("components", comps);
}
-
-private static void setPathsProperty(JsonMapObject sw2, JsonMapObject sw3,
-
[cxf] branch master updated: Update test to actually test the return values to make sure they are correct
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 53b2be8 Update test to actually test the return values to make sure
they are correct
53b2be8 is described below
commit 53b2be829ed6cd7660ae90e035cc8588b0a8dfb1
Author: Daniel Kulp
AuthorDate: Mon Mar 19 12:06:30 2018 -0400
Update test to actually test the return values to make sure they are correct
---
.../cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 14 ++
1 file changed, 14 insertions(+)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 96a23a8..61dba7c 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -933,6 +933,20 @@ public class JAXRSClientServerBookTest extends
AbstractBusClientServerTestBase {
List cookies = r.getMetadata().get("Set-Cookie");
assertNotNull(cookies);
assertEquals(3, cookies.size());
+
+boolean hasDummy1 = false;
+boolean hasDummy2 = false;
+boolean hasJSESSION = false;
+
+for (Object o : cookies) {
+String c = o.toString();
+hasDummy1 |= c.contains("=dummy;");
+hasDummy2 |= c.contains("=dummy2;");
+hasJSESSION |= c.contains("JSESSIONID");
+}
+assertTrue("Did not contain JSESSIONID", hasJSESSION);
+assertTrue("Did not contain dummy", hasDummy1);
+assertTrue("Did not contain dummy2", hasDummy1);
}
--
To stop receiving notification emails like this one, please contact
dk...@apache.org.
