[1/3] syncope git commit: Upgrading Swagger UI
Repository: syncope Updated Branches: refs/heads/2_0_X 73aed0a74 -> 5eb958549 refs/heads/2_1_X b25a8834d -> 292006e4c refs/heads/master 36fb466af -> d9a879af8 Upgrading Swagger UI Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5eb95854 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5eb95854 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5eb95854 Branch: refs/heads/2_0_X Commit: 5eb95854960c9758e5c16f607e089343483b001e Parents: 73aed0a Author: Francesco Chicchiriccò Authored: Tue Oct 23 08:19:45 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Oct 23 08:19:45 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/5eb95854/pom.xml -- diff --git a/pom.xml b/pom.xml index 43af407..b34d013 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ under the License. ${project.build.directory}/flowable-modeler 1.5.17 -3.19.0 +3.19.4 20.0 3.3.1-1
[1/3] syncope git commit: Upgrading Swagger UI and GreenMail
Repository: syncope Updated Branches: refs/heads/2_0_X 02eb5fdce -> 865bd7017 refs/heads/2_1_X a3d0345f6 -> 484dd1a46 refs/heads/master 6ad136fa6 -> d7f034ada Upgrading Swagger UI and GreenMail Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/865bd701 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/865bd701 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/865bd701 Branch: refs/heads/2_0_X Commit: 865bd701720bcf93a4f3739892c02fe40691fce6 Parents: 02eb5fd Author: Francesco Chicchiriccò Authored: Mon Sep 3 12:42:55 2018 +0200 Committer: Francesco Chicchiriccò Committed: Mon Sep 3 12:42:55 2018 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/865bd701/pom.xml -- diff --git a/pom.xml b/pom.xml index 961d646..c2eb7d8 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ under the License. ${project.build.directory}/flowable-modeler 1.5.17 -3.18.1 +3.18.2 20.0 2.2.4 @@ -1757,7 +1757,7 @@ under the License. com.icegreen greenmail -1.5.7 +1.5.8 test
[1/3] syncope git commit: Upgrading Swagger UI
Repository: syncope Updated Branches: refs/heads/2_0_X b8f4f0bc6 -> 22a821cc7 refs/heads/2_1_X 21b937811 -> c75aae860 refs/heads/master ae6c4bc75 -> 62102d176 Upgrading Swagger UI Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/22a821cc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/22a821cc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/22a821cc Branch: refs/heads/2_0_X Commit: 22a821cc72111c15682da1a923adc715a2f6a908 Parents: b8f4f0b Author: Francesco Chicchiriccò Authored: Wed Aug 22 17:59:26 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Aug 22 17:59:26 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/22a821cc/pom.xml -- diff --git a/pom.xml b/pom.xml index 80fd31d..dcaed42 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ under the License. ${project.build.directory}/flowable-modeler 1.5.17 -3.17.6 +3.18.1 20.0 2.2.4
[1/3] syncope git commit: Upgrading Swagger UI
Repository: syncope Updated Branches: refs/heads/2_0_X 774ba5999 -> f07fadc4b refs/heads/2_1_X 8465be431 -> 90aa804eb refs/heads/master eec3e257e -> ea46b82b7 Upgrading Swagger UI Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f07fadc4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f07fadc4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f07fadc4 Branch: refs/heads/2_0_X Commit: f07fadc4b654904f46ca2bc1b46143229487d68e Parents: 774ba59 Author: Francesco Chicchiriccò Authored: Mon Jul 23 09:01:01 2018 +0200 Committer: Francesco Chicchiriccò Committed: Mon Jul 23 09:01:01 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f07fadc4/pom.xml -- diff --git a/pom.xml b/pom.xml index bc191cd..0e26cc8 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ under the License. ${project.build.directory}/flowable-modeler 1.5.17 -3.17.3 +3.17.4 20.0 2.2.4
[1/3] syncope git commit: Upgrading Swagger UI
Repository: syncope Updated Branches: refs/heads/2_0_X 8a18a493d -> 041bcad6b refs/heads/2_1_X ff9386684 -> d90a2fe38 refs/heads/master e03d47ef5 -> 47f792bd8 Upgrading Swagger UI Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/041bcad6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/041bcad6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/041bcad6 Branch: refs/heads/2_0_X Commit: 041bcad6ba8d3356346ca6b93238e94135090968 Parents: 8a18a49 Author: Francesco Chicchiriccò Authored: Thu Jul 12 07:52:38 2018 +0200 Committer: Francesco Chicchiriccò Committed: Thu Jul 12 07:52:38 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/041bcad6/pom.xml -- diff --git a/pom.xml b/pom.xml index ea5859e..5de0b9c 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ under the License. ${project.build.directory}/flowable-modeler 1.5.17 -3.17.1 +3.17.2 20.0 2.2.4
[1/3] syncope git commit: Upgrading Swagger UI and modernizer-maven-plugin
Repository: syncope Updated Branches: refs/heads/2_0_X 87e4ff51f -> 783f2f78f refs/heads/master ec9769cc8 -> 6d7fb400d Upgrading Swagger UI and modernizer-maven-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/783f2f78 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/783f2f78 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/783f2f78 Branch: refs/heads/2_0_X Commit: 783f2f78fbe2cd59cc579d7e148bc0ecabb3d109 Parents: 87e4ff5 Author: Francesco ChicchiriccòAuthored: Fri Jan 19 08:35:38 2018 +0100 Committer: Francesco Chicchiriccò Committed: Fri Jan 19 08:35:38 2018 +0100 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/783f2f78/pom.xml -- diff --git a/pom.xml b/pom.xml index 7f45447..85dd24d 100644 --- a/pom.xml +++ b/pom.xml @@ -420,7 +420,7 @@ under the License. ${project.build.directory}/flowable-modeler 1.5.17 -3.9.0 +3.9.1 20.0 2.2.4 @@ -2028,7 +2028,7 @@ under the License. org.gaul modernizer-maven-plugin -1.5.0 +1.6.0 ${targetJdk}
[1/3] syncope git commit: Upgrading Swagger UI
Repository: syncope Updated Branches: refs/heads/master 4a6bd031d -> 69df3afa3 Upgrading Swagger UI Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a40d1aa3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a40d1aa3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a40d1aa3 Branch: refs/heads/master Commit: a40d1aa313e12c91641caf8d09b60e269319292d Parents: 4a6bd03 Author: Francesco ChicchiriccòAuthored: Thu Aug 4 11:42:24 2016 +0200 Committer: Francesco Chicchiriccò Committed: Thu Aug 4 11:42:24 2016 +0200 -- .../syncope/core/rest/cxf/Swagger2Feature.java | 271 +++ .../META-INF/resources/swagger/index.html | 81 +++--- pom.xml | 2 +- 3 files changed, 306 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/a40d1aa3/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java -- diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java index fa7ce9a..1578032 100644 --- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java +++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java @@ -18,9 +18,54 @@ */ package org.apache.syncope.core.rest.cxf; +import io.swagger.jaxrs.config.BeanConfig; +import io.swagger.jaxrs.config.DefaultReaderConfig; +import io.swagger.jaxrs.config.ReaderConfig; +import io.swagger.jaxrs.listing.ApiListingResource; +import io.swagger.jaxrs.listing.SwaggerSerializers; +import io.swagger.models.Operation; +import io.swagger.models.Path; +import io.swagger.models.Swagger; +import io.swagger.models.Tag; +import java.io.IOException; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.net.URI; import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; +import javax.servlet.ServletContext; +import javax.ws.rs.HttpMethod; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.container.PreMatching; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.UriInfo; +import org.apache.commons.collections4.ComparatorUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; +import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean; +import org.apache.cxf.jaxrs.ext.MessageContext; +import org.apache.cxf.jaxrs.model.ClassResourceInfo; +import org.apache.cxf.jaxrs.model.OperationResourceInfo; +import org.apache.cxf.jaxrs.model.doc.DocumentationProvider; +import org.apache.cxf.jaxrs.provider.ServerProviderFactory; +import org.apache.cxf.jaxrs.utils.InjectionUtils; +import org.apache.cxf.jaxrs.utils.JAXRSUtils; /** * Automatically loads available javadocs from class loader (when {@link java.net.URLClassLoader}). @@ -37,4 +82,230 @@ public class Swagger2Feature extends org.apache.cxf.jaxrs.swagger.Swagger2Featur super.initialize(server, bus); } +// --- Remove the code below this point when CXF-6990 is part of next CXF release (3.1.8?) - +@Override +protected void addSwaggerResource(final Server server, final Bus bus) { +List swaggerResources = new LinkedList<>(); +ApiListingResource apiListingResource = new ApiListingResource(); +swaggerResources.add(apiListingResource); +if (SWAGGER_UI_RESOURCE_ROOT != null) { +swaggerResources.add(new SwaggerUIService()); +bus.setProperty("swagger.service.ui.available", "true"); +} +JAXRSServiceFactoryBean sfb = +(JAXRSServiceFactoryBean) server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName()); +sfb.setResourceClassesFromBeans(swaggerResources); + +List cris = sfb.getClassResourceInfo(); + +List providers = new ArrayList<>(); +for (ClassResourceInfo cri : cris) { +if (ApiListingResource.class == cri.getResourceClass()) { +InjectionUtils.injectContextProxies(cri, apiListingResource); +} +} +