Return-Path: <commits-return-42970-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
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 461A4200B5A
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu,  4 Aug 2016 11:50:35 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 44FAA160AB0; Thu,  4 Aug 2016 09:50:35 +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 96225160A7C
	for <archive-asf-public@cust-asf.ponee.io>; Thu,  4 Aug 2016 11:50:34 +0200 (CEST)
Received: (qmail 12132 invoked by uid 500); 4 Aug 2016 09:50:33 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 12117 invoked by uid 99); 4 Aug 2016 09:50:33 -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; Thu, 04 Aug 2016 09:50:33 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 9AC0AE0278; Thu,  4 Aug 2016 09:50:33 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: ilgrosso@apache.org
To: commits@cxf.apache.org
Date: Thu, 04 Aug 2016 09:50:34 -0000
Message-Id: <8bb32be7d83c4cd886f5700ab9f43487@git.apache.org>
In-Reply-To: <90c1030f1e0c4a8d851f342b9d23e9c3@git.apache.org>
References: <90c1030f1e0c4a8d851f342b9d23e9c3@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] cxf git commit: [CXF-6990] Sorting tag list before writing out
archived-at: Thu, 04 Aug 2016 09:50:35 -0000

[CXF-6990] Sorting tag list before writing out


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/75ce1c4b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/75ce1c4b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/75ce1c4b

Branch: refs/heads/3.0.x-fixes
Commit: 75ce1c4bd7b08cad5ee0bc8684cd289bba06c975
Parents: 90f9a15
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Aug 4 11:46:38 2016 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Aug 4 11:46:38 2016 +0200

----------------------------------------------------------------------
 .../org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/75ce1c4b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
index c6dcdae..230489c 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -142,6 +143,15 @@ public class Swagger2Serializers extends SwaggerSerializers {
                 }
             }
         }
+        if (replaceTags && data.getTags() != null) {
+            Collections.sort(data.getTags(), new Comparator<Tag>() {
+
+                @Override
+                public int compare(final Tag tag1, final Tag tag2) {
+                    return tag1.getName().compareTo(tag2.getName());
+                }
+            });
+        }
 
         super.writeTo(data, type, genericType, annotations, mediaType, headers, out);
     }