You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/06/09 07:22:44 UTC

[cxf] branch CXF-8300 created (now 2d30eb9)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch CXF-8300
in repository https://gitbox.apache.org/repos/asf/cxf.git.


      at 2d30eb9  CXF-8300 - Swagger2Feature displays cached API when service is redeployed

This branch includes the following new commits:

     new 2d30eb9  CXF-8300 - Swagger2Feature displays cached API when service is redeployed

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[cxf] 01/01: CXF-8300 - Swagger2Feature displays cached API when service is redeployed

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch CXF-8300
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 2d30eb92abfea27b594d5c1b286430f8d6d049d4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 9 08:22:13 2020 +0100

    CXF-8300 - Swagger2Feature displays cached API when service is redeployed
---
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index bdb844d..64200b3 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
+import java.util.UUID;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -576,6 +577,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature<Swagger2Feature.Port
 
         private class ServletConfigProvider implements ContextProvider<ServletConfig> {
 
+            private String id = UUID.randomUUID().toString();
+
             @Override
             public ServletConfig createContext(Message message) {
                 final ServletConfig sc = (ServletConfig)message.get("HTTP.CONFIG");
@@ -592,6 +595,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature<Swagger2Feature.Port
                             public String getInitParameter(String name) {
                                 if (Objects.equals(SwaggerContextService.USE_PATH_BASED_CONFIG, name)) {
                                     return "true";
+                                } else if (SwaggerContextService.CONFIG_ID_KEY.equals(name)) {
+                                    return id;
                                 } else {
                                     return super.getInitParameter(name);
                                 }
@@ -604,6 +609,8 @@ public class Swagger2Feature extends AbstractSwaggerFeature<Swagger2Feature.Port
                         public String getInitParameter(String name) {
                             if (Objects.equals(SwaggerContextService.USE_PATH_BASED_CONFIG, name)) {
                                 return "true";
+                            } else if (SwaggerContextService.CONFIG_ID_KEY.equals(name)) {
+                                return id;
                             } else {
                                 return super.getInitParameter(name);
                             }