You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/01/16 08:04:17 UTC

[cxf] branch master updated: [CXF-7946]OperationResourceInfoComparator should consider methods parameters

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

ffang 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 e145578  [CXF-7946]OperationResourceInfoComparator should consider methods parameters
e145578 is described below

commit e14557808f2ae714af1c47f850fa309e1cfaa444
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Jan 16 16:04:00 2019 +0800

    [CXF-7946]OperationResourceInfoComparator should consider methods parameters
---
 .../cxf/jaxrs/model/OperationResourceInfoComparator.java     |  3 +++
 .../src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfoComparator.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfoComparator.java
index 3855bb8..ce31f8f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfoComparator.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfoComparator.java
@@ -117,6 +117,9 @@ public class OperationResourceInfoComparator implements Comparator<OperationReso
             } else if (!e1IsDefault && e2IsDefault) {
                 result = -1;
             }
+        } 
+        if (result == 0) {
+            result = JAXRSUtils.compareMethodParameters(e1.getInParameterTypes(), e2.getInParameterTypes());
         }
         if (result == 0) {
             String m1Name =
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 8fdc16a..66758c7 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -705,6 +705,18 @@ public final class JAXRSUtils {
         }
         return size1 == size2 ? 0 : size1 < size2 ? -1 : 1;
     }
+    
+    public static int compareMethodParameters(Class<?>[] para1, Class<?>[] para2) {
+        int size1 = para1.length;
+        int size2 = para2.length;
+        for (int i = 0; i < size1 && i < size2; i++) {
+            int result = para1[i].getName().compareTo(para2[i].getName());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return size1 == size2 ? 0 : size1 < size2 ? -1 : 1;
+    }
     public static int compareMediaTypes(MediaType mt1, MediaType mt2) {
         return compareMediaTypes(mt1, mt2, MEDIA_TYPE_Q_PARAM);
     }