cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r587264 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ systests/src/test/java/org/apache/cxf/systest/http_jetty/ systests/src/test/java/org/apache/cxf/systest/jaxws/ tools/common/src/main...
Date Mon, 22 Oct 2007 21:20:00 GMT
Author: dkulp
Date: Mon Oct 22 14:19:59 2007
New Revision: 587264

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

........
  r587142 | dkulp | 2007-10-22 12:21:47 -0400 (Mon, 22 Oct 2007) | 5 lines
  
  [CXF-1121] Another patch applied from Adrian Nistor
  * Fix potential NPEs in validator
  * @Ignore the EndingLifecycleTest failure until an approach to the issue can be done
  * Remove some console prints from the tests
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
    incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
    incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=587264&r1=587263&r2=587264&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon Oct 22 14:19:59 2007
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.jaxb;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
@@ -30,6 +31,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.cxf.common.util.PackageUtils;
@@ -59,12 +63,12 @@
         }
 
         boolean isFromWrapper = part.getMessageInfo().getOperation().isUnwrapped();
-        if (isFromWrapper 
-            && clazz.isArray() 
+        if (isFromWrapper
+            && clazz.isArray()
             && !Byte.TYPE.equals(clazz.getComponentType())) {
             clazz = clazz.getComponentType();
         }
-        
+
         Type genericType = (Type) part.getProperty("generic.type");
         if (genericType != null) {
             boolean isList = Collection.class.isAssignableFrom(clazz);
@@ -76,38 +80,38 @@
                         && !Byte.TYPE.equals(cl2.getComponentType())) {
                         genericType = cl2.getComponentType();
                     }
-                    addType(genericType);                
+                    addType(genericType);
                 } else if (!isList) {
-                    addType(genericType);                
+                    addType(genericType);
                 }
             } else {
-                addType(genericType);                
+                addType(genericType);
             }
-            
-            if (isList 
+
+            if (isList
                 && genericType instanceof ParameterizedType) {
                 ParameterizedType pt = (ParameterizedType) genericType;
-                if (pt.getActualTypeArguments().length > 0 
+                if (pt.getActualTypeArguments().length > 0
                     && pt.getActualTypeArguments()[0] instanceof Class) {
-            
-                    Class<? extends Object> arrayCls = 
+
+                    Class<? extends Object> arrayCls =
                         Array.newInstance((Class) pt.getActualTypeArguments()[0], 0).getClass();
                     clazz = arrayCls;
                     part.setTypeClass(clazz);
                     if (isFromWrapper) {
                         addType(clazz.getComponentType());
                     }
-                } else if (pt.getActualTypeArguments().length > 0 
+                } else if (pt.getActualTypeArguments().length > 0
                     && pt.getActualTypeArguments()[0] instanceof GenericArrayType)
{
                     GenericArrayType gat = (GenericArrayType)pt.getActualTypeArguments()[0];
                     gat.getGenericComponentType();
-                    Class<? extends Object> arrayCls = 
+                    Class<? extends Object> arrayCls =
                         Array.newInstance((Class) gat.getGenericComponentType(), 0).getClass();
                     clazz = Array.newInstance(arrayCls, 0).getClass();
                     part.setTypeClass(clazz);
                     if (isFromWrapper) {
                         addType(clazz.getComponentType());
-                    }                    
+                    }
                 }
             }
             if (isFromWrapper && isList) {
@@ -118,7 +122,7 @@
             addClass(clazz);
         }
     }
-    
+
     private void addType(Type cls) {
         if (cls instanceof Class) {
             addClass((Class)cls);
@@ -130,11 +134,11 @@
             GenericArrayType gt = (GenericArrayType)cls;
             Class ct = (Class) gt.getGenericComponentType();
             ct = Array.newInstance(ct, 0).getClass();
-            
+
             addClass(ct);
         }
     }
-    
+
 
     private  void addClass(Class<?> cls) {
         if (cls.isArray() && cls.getComponentType().isPrimitive()) {
@@ -175,33 +179,101 @@
         }
     }
 
-    private void walkReferences(Class<?> cls) { 
-        if (cls.getName().startsWith("java.") 
-            || cls.getName().startsWith("javax.")) { 
-            return; 
-        } 
-        //walk the public fields/methods to try and find all the classes. JAXB will only
load the 
-        //EXACT classes in the fields/methods if they are in a different package. Thus, 
-        //subclasses won't be found and the xsi:type stuff won't work at all. 
-        //We'll grab the public field/method types and then add the ObjectFactory stuff 
-        //as well as look for jaxb.index files in those packages. 
-
-        Field fields[] = cls.getFields(); 
-        for (Field f : fields) { 
-            if (f.getAnnotation(XmlTransient.class) == null
-                && !Modifier.isStatic(f.getModifiers())) { 
-                addType(f.getGenericType()); 
-            } 
-        } 
-        Method methods[] = cls.getMethods(); 
-        for (Method m : methods) { 
-            if (m.getAnnotation(XmlTransient.class) == null
-                && !Modifier.isStatic(m.getModifiers())) { 
-                addType(m.getGenericReturnType()); 
-                for (Type t : m.getGenericParameterTypes()) { 
-                    addType(t); 
-                } 
-            } 
-        } 
-    } 
-}
+    private void walkReferences(Class<?> cls) {
+        if (cls.getName().startsWith("java.")
+            || cls.getName().startsWith("javax.")) {
+            return;
+        }
+        //walk the public fields/methods to try and find all the classes. JAXB will only
load the
+        //EXACT classes in the fields/methods if they are in a different package. Thus,
+        //subclasses won't be found and the xsi:type stuff won't work at all.
+        //We'll grab the public field/method types and then add the ObjectFactory stuff
+        //as well as look for jaxb.index files in those packages.
+
+        XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class);
+        if (accessorType == null && cls.getPackage() != null) {
+            accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class);
+        }
+        XmlAccessType accessType = accessorType != null ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER;
+
+        if (accessType != XmlAccessType.PROPERTY) {   // only look for fields if we are instructed
to
+            Field fields[] = cls.getFields();
+            for (Field f : fields) {
+                if (isFieldAccepted(f, accessType)) {
+                    addType(f.getGenericType());
+                }
+            }
+        }
+
+        if (accessType != XmlAccessType.FIELD) {   // only look for methods if we are instructed
to
+            Method methods[] = cls.getMethods(); 
+            for (Method m : methods) {
+                if (isMethodAccepted(m, accessType)) {
+                    addType(m.getGenericReturnType());
+                    for (Type t : m.getGenericParameterTypes()) {
+                        addType(t);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks is the field is accepted as a JAXB property.
+     */
+    private boolean isFieldAccepted(Field field, XmlAccessType accessType) {
+        // We only accept non static fields which are not marked @XmlTransient
+        if (Modifier.isStatic(field.getModifiers()) || field.isAnnotationPresent(XmlTransient.class))
{
+            return false;
+        }
+
+        if (accessType == XmlAccessType.NONE) {
+            return checkJaxbAnnotation(field.getAnnotations());
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Checks is the method is accepted as a JAXB property getter.
+     */
+    private boolean isMethodAccepted(Method method, XmlAccessType accessType) {
+        // We only accept non static property getters which are not marked @XmlTransient
+        if (Modifier.isStatic(method.getModifiers()) || method.isAnnotationPresent(XmlTransient.class))
{
+            return false;
+        }
+
+        // must not have parameters and return type must not be void
+        if (method.getReturnType() == Void.class || method.getParameterTypes().length !=
0) {
+            return false;
+        }
+
+        boolean isPropGetter = method.getName().startsWith("get") || method.getName().startsWith("is");
+
+        if (!isPropGetter) {
+            return false;
+        }
+
+        if (accessType == XmlAccessType.NONE) {
+            return checkJaxbAnnotation(method.getAnnotations());
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Checks if there are JAXB annotations among the annotations of the class member.
+     * @param annotations the array of annotations from the class member
+     * @return true if JAXB annotations are present, false otherwise
+     */
+    private boolean checkJaxbAnnotation(Annotation[] annotations) {
+        // must check if there are any jaxb annotations
+        Package jaxbAnnotationsPackage = XmlElement.class.getPackage();
+        for (Annotation annotation : annotations) {
+            if (annotation.annotationType().getPackage() == jaxbAnnotationsPackage) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
\ No newline at end of file

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=587264&r1=587263&r2=587264&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
Mon Oct 22 14:19:59 2007
@@ -46,6 +46,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 
 import org.junit.Test;
 import org.mortbay.jetty.Connector;
@@ -242,6 +243,7 @@
      * @throws Exception
      */
     @Test
+    @Ignore("not working yet")
     public void testServerUpDownUp() throws Exception {
         
         setUpBus(true);

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=587264&r1=587263&r2=587264&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
Mon Oct 22 14:19:59 2007
@@ -843,7 +843,6 @@
             client.invoke("greetMe", "test");        
             Object[] result = client.invoke("sayHi");
             assertNotNull("no response received from service", result);
-            System.out.println(result[0]);
             assertEquals("Bonjour", result[0]);
         } catch (Exception e) {            
             e.printStackTrace();

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=587264&r1=587263&r2=587264&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
Mon Oct 22 14:19:59 2007
@@ -77,7 +77,7 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(ServerXMLBinding.class,
true));
+        assertTrue("server did not launch correctly", launchServer(ServerXMLBinding.class));
     }
 
     @Test

Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=587264&r1=587263&r2=587264&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
Mon Oct 22 14:19:59 2007
@@ -364,7 +364,7 @@
         for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();)
{
             BindingOperation bindingOp = (BindingOperation)ite2.next();
             String bopStyle = getSOAPOperationStyle(bindingOp);
-            if (!"".equals(bopStyle)) {
+            if (!StringUtils.isEmpty(bopStyle)) {
                 return bopStyle;
             }
         }

Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=587264&r1=587263&r2=587264&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
Mon Oct 22 14:19:59 2007
@@ -300,7 +300,7 @@
 
                     for (Iterator ite3 = inMess.getParts().values().iterator(); ite3.hasNext();)
{
                         Part p = (Part)ite3.next();
-                        if (style.equalsIgnoreCase(SOAPBinding.Style.RPC.name()) &&
p.getTypeName() == null
+                        if (SOAPBinding.Style.RPC.name().equalsIgnoreCase(style) &&
p.getTypeName() == null
                             && !isHeaderPart(bop, p)) {
                             addErrorMessage("An rpc-literal binding in a DESCRIPTION MUST
refer, "
                                             + "in its soapbind:body element(s), only to "
@@ -309,7 +309,7 @@
                             return false;
                         }
 
-                        if (style.equalsIgnoreCase(SOAPBinding.Style.DOCUMENT.name())
+                        if (SOAPBinding.Style.DOCUMENT.name().equalsIgnoreCase(style)
                             && p.getElementName() == null) {
                             addErrorMessage("A document-literal binding in a DESCRIPTION
MUST refer, "
                                             + "in each of its soapbind:body element(s),"



Mime
View raw message