cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r470374 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Date Thu, 02 Nov 2006 14:32:47 GMT
Author: mmao
Date: Thu Nov  2 06:32:46 2006
New Revision: 470374

URL: http://svn.apache.org/viewvc?view=rev&rev=470374
Log:
* Remove WebParam checking from URIMappingInterceptor

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java?view=diff&rev=470374&r1=470373&r2=470374
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
(original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
Thu Nov  2 06:32:46 2006
@@ -29,10 +29,8 @@
 import org.apache.cxf.service.Service;
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaDatatype;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 
 public final class ServiceModelUtil {
 

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?view=diff&rev=470374&r1=470373&r2=470374
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Thu Nov  2 06:32:46 2006
@@ -33,8 +33,6 @@
 import java.util.ResourceBundle;
 import java.util.logging.Logger;
 
-import javax.jws.WebParam;
-
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.util.CollectionUtils;
 import org.apache.cxf.common.util.PrimitiveUtils;
@@ -86,31 +84,7 @@
             get(Service.class).get(MethodDispatcher.class.getName());
         return md.getMethod(operation);
     }
-    
-    private boolean isValidParameter(Annotation[][] parameterAnnotation, int index, String
parameterName) {
-        if (parameterAnnotation == null || parameterAnnotation.length < index) {
-            return true;
-        }
-        Annotation[] annotations = parameterAnnotation[index];
-        if (annotations == null || annotations.length < 1) {
-            return true;
-        }
-        WebParam webParam = null;
-        for (Annotation annotation : annotations) {
-            if (annotation.annotationType() == WebParam.class) {
-                webParam = (WebParam) annotation;
-            }
-        }
-        if (webParam == null 
-            || StringUtils.isEmpty(webParam.name()) 
-            || webParam.name().equals(parameterName)) {
-            return true;
-        }
-        LOG.warning("The parameter name [" + parameterName 
-                    + "] is not match the one defined in the WebParam name [" + webParam.name()
+ "]");
-        return false;
-    }
-    
+       
     private boolean requireCheckParameterName(Message message) {
         // TODO add a configuration, if return false, then the parameter should be given
by order.
         Boolean order = (Boolean) message.get("HTTP_GET_CHECK_PARAM_NAME");
@@ -177,10 +151,7 @@
         
         for (String key : queries.keySet()) {
             Class<?> type = types[idx];
-            
-            // Do we need to fail the processing if the parameter not match the WebParam?
-            isValidParameter(parameterAnnotation, idx, key);
-            
+                       
             if (type == null) {
                 LOG.warning("URIMappingInterceptor MessagePartInfo NULL ");
                 throw new Fault(new org.apache.cxf.common.i18n.Message("NO_PART_FOUND", BUNDLE,




Mime
View raw message