cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r707129 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ rt/frontend/jaxrs/src/t...
Date Wed, 22 Oct 2008 16:45:40 GMT
Author: dkulp
Date: Wed Oct 22 09:45:40 2008
New Revision: 707129

URL: http://svn.apache.org/viewvc?rev=707129&view=rev
Log:
Merged revisions 707100 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r707100 | sergeyb | 2008-10-22 11:23:56 -0400 (Wed, 22 Oct 2008) | 1 line
  
  JAX-RS : fixing a typo introducing during refactoring with test
........

Added:
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
      - copied unchanged from r707100, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerInfo.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 09:45:40 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706675,706900,706909,707034,707089
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706675,706900,706909,707034,707089,707100

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java?rev=707129&r1=707128&r2=707129&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
Wed Oct 22 09:45:40 2008
@@ -84,8 +84,10 @@
     }
     
     public void setAnnotatedMethod(Method m) {
-        annotatedMethod = m;
-        checkMediaTypes();
+        if (m != null) {
+            annotatedMethod = m;
+            checkMediaTypes();
+        }
     }
     
     public Method getAnnotatedMethod() {

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java?rev=707129&r1=707128&r2=707129&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Wed Oct 22 09:45:40 2008
@@ -153,6 +153,12 @@
     }
     
     public static Method getAnnotatedMethod(Method m) {
+        Method annotatedMethod = doGetAnnotatedMethod(m);
+        return annotatedMethod == null ? m : annotatedMethod;
+    }
+    
+    private static Method doGetAnnotatedMethod(Method m) {
+        
         if (m == null) {
             return m;
         }
@@ -162,15 +168,16 @@
                 return m;
             }        
         }
-        
-        if (isMethodParamAnnotations(m.getAnnotations())) {
-            return m;
+        for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
+            if (isMethodParamAnnotations(paramAnnotations)) {
+                return m;
+            }
         }
         
         Class<?> superC = m.getDeclaringClass().getSuperclass();
-        if (superC != null) {
+        if (superC != null && Object.class != superC) {
             try {
-                Method method = getAnnotatedMethod(superC.getMethod(m.getName(), m.getParameterTypes()));
+                Method method = doGetAnnotatedMethod(superC.getMethod(m.getName(), m.getParameterTypes()));
                 if (method != null) {
                     return method;
                 }
@@ -180,7 +187,7 @@
         }
         for (Class<?> i : m.getDeclaringClass().getInterfaces()) {
             try {
-                Method method = getAnnotatedMethod(i.getMethod(m.getName(), m.getParameterTypes()));
+                Method method = doGetAnnotatedMethod(i.getMethod(m.getName(), m.getParameterTypes()));
                 if (method != null) {
                     return method;
                 }
@@ -188,7 +195,8 @@
                 // ignore
             }
         }
-        return m;
+        
+        return null;
     }
     
    

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerInfo.java?rev=707129&r1=707128&r2=707129&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerInfo.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerInfo.java
Wed Oct 22 09:45:40 2008
@@ -21,7 +21,9 @@
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.ContextResolver;
 
 public interface CustomerInfo {
-    void setUriInfoContext(@Context UriInfo uriInfo); 
+    void setUriInfoContext(@Context UriInfo uriInfo);
+    ContextResolver getContextResolver();
 }



Mime
View raw message