syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/4] syncope git commit: Upgrading to Swagger UI 2.2.2
Date Thu, 01 Sep 2016 12:56:40 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 8150cf84b -> 5f7da0cec


Upgrading to Swagger UI 2.2.2


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7bd7d0ab
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7bd7d0ab
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7bd7d0ab

Branch: refs/heads/master
Commit: 7bd7d0abbdfab3877386192994793e98236afecc
Parents: 8150cf8
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Sep 1 14:11:43 2016 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Sep 1 14:11:43 2016 +0200

----------------------------------------------------------------------
 .../syncope/core/rest/cxf/ExtendedSwagger2Serializers.java       | 3 ++-
 pom.xml                                                          | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/7bd7d0ab/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
index 41710fb..0e85752 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
@@ -129,7 +129,8 @@ public class ExtendedSwagger2Serializers extends SwaggerSerializers implements
S
                     ClassResourceInfo cri = operations.get(entry.getKey());
 
                     tag = new Tag();
-                    tag.setName(cri.getURITemplate().getValue());
+                    String tagName = StringUtils.removeStart(cri.getURITemplate().getValue(),
"/");
+                    tag.setName(StringUtils.isEmpty(tagName) ? "_" : tagName);
                     if (javadocProvider != null) {
                         tag.setDescription(javadocProvider.getClassDoc(cri));
                     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/7bd7d0ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 73ebfe8..208ee28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,8 +393,8 @@ under the License.
     <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
 
     <swagger-core.version>1.5.10</swagger-core.version>    
-    <swagger-ui.version>2.2.0</swagger-ui.version>
-        
+    <swagger-ui.version>2.2.2</swagger-ui.version>
+
     <jquery.version>2.2.4</jquery.version>
     <jquery-ui.version>1.11.4</jquery-ui.version>
     <jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>


Mime
View raw message