cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1568434 - in /cxf/trunk/rt/rs/extensions/search: pom.xml src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
Date Fri, 14 Feb 2014 18:22:39 GMT
Author: sergeyb
Date: Fri Feb 14 18:22:39 2014
New Revision: 1568434

URL: http://svn.apache.org/r1568434
Log:
Temporarily dropping commons-lang dep from ODataParser as agreed with Andriy; will revisit
it for 3.0.0 Final

Modified:
    cxf/trunk/rt/rs/extensions/search/pom.xml
    cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
    cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java

Modified: cxf/trunk/rt/rs/extensions/search/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/pom.xml?rev=1568434&r1=1568433&r2=1568434&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/pom.xml (original)
+++ cxf/trunk/rt/rs/extensions/search/pom.xml Fri Feb 14 18:22:39 2014
@@ -37,10 +37,6 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>    
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java?rev=1568434&r1=1568433&r2=1568434&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
(original)
+++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
Fri Feb 14 18:22:39 2014
@@ -28,7 +28,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.ClassUtils;
 import org.apache.cxf.jaxrs.ext.search.collections.CollectionCheckInfo;
 
 /**
@@ -208,10 +207,6 @@ public class Beanspector<T> {
             return cls;
         }
         
-        public Class<?> getWrappedTypeClass() {
-            return cls.isPrimitive() ? ClassUtils.primitiveToWrapper(cls) : cls;
-        }
-        
         public Type getGenericType() {
             return genericType;
         }

Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java?rev=1568434&r1=1568433&r2=1568434&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
(original)
+++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
Fri Feb 14 18:22:39 2014
@@ -162,7 +162,7 @@ public class ODataParser<T> extends Abst
             
             Object typedValue = null;
             // If property type and value type are compatible, just use them
-            if (property.typeInfo.getWrappedTypeClass().isAssignableFrom(value.typeClass))
{
+            if (property.typeInfo.getTypeClass().isAssignableFrom(value.typeClass)) {
                 typedValue = value.value;
             } else { // Property type and value type are not compatible and convert / cast
are required
                 typedValue = parseType(property.propertyName, null, null, property.propertyName,




Mime
View raw message