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/10 08:54:59 UTC

[cxf] branch master updated: CXF-8300 - Swagger2Feature displays cached API when service is redeployed (#679)

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

coheigea 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 ee9a519  CXF-8300 - Swagger2Feature displays cached API when service is redeployed (#679)
ee9a519 is described below

commit ee9a519fc027560fb8fdad95fefb3077bd9c9e2a
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Wed Jun 10 09:54:49 2020 +0100

    CXF-8300 - Swagger2Feature displays cached API when service is redeployed (#679)
---
 .../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);
                             }