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 2016/09/23 11:40:32 UTC
[1/3] cxf git commit: Fixing behavior with subresources and newer
Swagger UI
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ec80c2414 -> a6c934ba2
refs/heads/3.1.x-fixes 0947c0a20 -> d345b60a4
refs/heads/master 7a5e2690c -> f24ad7978
Fixing behavior with subresources and newer Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d345b60a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d345b60a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d345b60a
Branch: refs/heads/3.1.x-fixes
Commit: d345b60a487dd14aaf5d89542a3574f795d885df
Parents: 0947c0a
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Sep 23 13:38:59 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Sep 23 13:38:59 2016 +0200
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d345b60a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
----------------------------------------------------------------------
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
index ec52215..194a49e 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
@@ -106,8 +106,7 @@ public class DefaultSwagger2Serializers extends SwaggerSerializers implements Sw
ClassResourceInfo cri = operations.get(entry.getKey());
tag = new Tag();
- String tagName = StringUtils.removeStart(cri.getURITemplate().getValue(), "/");
- tag.setName(StringUtils.isEmpty(tagName) ? "_" : tagName);
+ tag.setName(cri.getURITemplate().getValue().replaceAll("/", "_"));
if (javadocProvider != null) {
tag.setDescription(javadocProvider.getClassDoc(cri));
}
[3/3] cxf git commit: Fixing behavior with subresources and newer
Swagger UI
Posted by il...@apache.org.
Fixing behavior with subresources and newer Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6c934ba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6c934ba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6c934ba
Branch: refs/heads/3.0.x-fixes
Commit: a6c934ba238f76da93642014b7dd326a31b2b8d4
Parents: ec80c24
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Sep 23 13:40:20 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Sep 23 13:40:20 2016 +0200
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6c934ba/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
index d9efb96..560926f 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
@@ -107,8 +107,7 @@ public class DefaultSwagger2Serializers extends SwaggerSerializers implements Sw
ClassResourceInfo cri = operations.get(entry.getKey());
tag = new Tag();
- String tagName = StringUtils.removeStart(cri.getURITemplate().getValue(), "/");
- tag.setName(StringUtils.isEmpty(tagName) ? "_" : tagName);
+ tag.setName(cri.getURITemplate().getValue().replaceAll("/", "_"));
if (javadocProvider != null) {
tag.setDescription(javadocProvider.getClassDoc(cri));
}
[2/3] cxf git commit: Fixing behavior with subresources and newer
Swagger UI
Posted by il...@apache.org.
Fixing behavior with subresources and newer Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f24ad797
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f24ad797
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f24ad797
Branch: refs/heads/master
Commit: f24ad79787ec011771b5ad40277e64e202895797
Parents: 7a5e269
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Sep 23 13:38:59 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Sep 23 13:39:18 2016 +0200
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f24ad797/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
----------------------------------------------------------------------
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
index ec52215..194a49e 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
@@ -106,8 +106,7 @@ public class DefaultSwagger2Serializers extends SwaggerSerializers implements Sw
ClassResourceInfo cri = operations.get(entry.getKey());
tag = new Tag();
- String tagName = StringUtils.removeStart(cri.getURITemplate().getValue(), "/");
- tag.setName(StringUtils.isEmpty(tagName) ? "_" : tagName);
+ tag.setName(cri.getURITemplate().getValue().replaceAll("/", "_"));
if (javadocProvider != null) {
tag.setDescription(javadocProvider.getClassDoc(cri));
}