Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D132F200B7A for ; Mon, 5 Sep 2016 17:27:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CFB2A160ABC; Mon, 5 Sep 2016 15:27:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 21E73160AB0 for ; Mon, 5 Sep 2016 17:27:35 +0200 (CEST) Received: (qmail 91310 invoked by uid 500); 5 Sep 2016 15:27:35 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 91301 invoked by uid 99); 5 Sep 2016 15:27:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2016 15:27:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E308DFD9F; Mon, 5 Sep 2016 15:27:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <01954c67cb5144efb45a9703a96577a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7022] Minimising a number of interface methods, adding a tad fix (with thanks to Francesco) Date: Mon, 5 Sep 2016 15:27:35 +0000 (UTC) archived-at: Mon, 05 Sep 2016 15:27:37 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 08c5289ff -> 61349a507 [CXF-7022] Minimising a number of interface methods, adding a tad fix (with thanks to Francesco) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/61349a50 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/61349a50 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/61349a50 Branch: refs/heads/3.1.x-fixes Commit: 61349a5076f31b2b078a201d780d59ffc6f59db3 Parents: 08c5289 Author: Sergey Beryozkin Authored: Mon Sep 5 16:10:29 2016 +0100 Committer: Sergey Beryozkin Committed: Mon Sep 5 16:27:17 2016 +0100 ---------------------------------------------------------------------- .../cxf/jaxrs/swagger/DefaultSwagger2Serializers.java | 9 ++------- .../apache/cxf/jaxrs/swagger/Swagger2Serializers.java | 12 ------------ 2 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/61349a50/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 2a32e7c..f5068c7 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 @@ -104,7 +104,8 @@ public class DefaultSwagger2Serializers extends SwaggerSerializers implements Sw 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)); } @@ -172,32 +173,26 @@ public class DefaultSwagger2Serializers extends SwaggerSerializers implements Sw this.dynamicBasePath = dynamicBasePath; } - @Override public void setReplaceTags(final boolean replaceTags) { this.replaceTags = replaceTags; } - @Override public void setJavadocProvider(final DocumentationProvider javadocProvider) { this.javadocProvider = javadocProvider; } - @Override public void setClassResourceInfos(final List classResourceInfos) { this.cris = classResourceInfos; } - @Override public void setJavaDocPath(final String javaDocPath) throws Exception { this.javadocProvider = new JavaDocProvider(javaDocPath); } - @Override public void setJavaDocPaths(final String... javaDocPaths) throws Exception { this.javadocProvider = new JavaDocProvider(javaDocPaths); } - @Override public void setJavaDocURLs(final URL[] javaDocURLs) { this.javadocProvider = new JavaDocProvider(javaDocURLs); } http://git-wip-us.apache.org/repos/asf/cxf/blob/61349a50/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java index ba1dec9..e3272fc 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java @@ -18,13 +18,11 @@ */ package org.apache.cxf.jaxrs.swagger; -import java.net.URL; import java.util.List; import javax.ws.rs.ext.MessageBodyWriter; import org.apache.cxf.jaxrs.model.ClassResourceInfo; -import org.apache.cxf.jaxrs.model.doc.DocumentationProvider; import io.swagger.jaxrs.config.BeanConfig; import io.swagger.models.Swagger; @@ -35,15 +33,5 @@ public interface Swagger2Serializers extends MessageBodyWriter { void setDynamicBasePath(boolean dynamicBasePath); - void setReplaceTags(boolean replaceTags); - - void setJavadocProvider(DocumentationProvider javadocProvider); - void setClassResourceInfos(List classResourceInfos); - - void setJavaDocPath(String javaDocPath) throws Exception; - - void setJavaDocPaths(String... javaDocPaths) throws Exception; - - void setJavaDocURLs(URL[] javaDocURLs); }