Fix OMElementWrapperHandler getChildren (unwrap) since minOccurs="0" case will not work properly with current code. Add test.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1086760 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 132 insertions, 15 deletions

diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-2.x/trunk/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 9084f09dc0..fcaa596f6f 100644
--- a/sca-java-2.x/trunk/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-2.x/trunk/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
@@ -108,7 +108,7 @@ public class OMElementWrapperHandler implements WrapperHandler<OMElement> {
         List<Object> elements = new ArrayList<Object>();
         int i = 0;
         for (ElementInfo e : childElements) {
-            elements.add(getChild(wrapper, e, i));
+            elements.add(getChild(wrapper, e));
             i++;
         }
         return elements;
@@ -152,6 +152,10 @@ public class OMElementWrapperHandler implements WrapperHandler<OMElement> {
 
     private static final QName XSI_TYPE_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "type", "xsi");
 
+    /*
+     *  Left this method in the code to show the idea of grouping like wrapper children without
+     *  knowing the QName from the ElementInfo, but this code isn't currently used any more. 
+     */
     private List<List<OMElement>> getElements(OMElement wrapper) {
         List<List<OMElement>> elements = new ArrayList<List<OMElement>>();
         List<OMElement> current = new ArrayList<OMElement>();
@@ -175,21 +179,18 @@ public class OMElementWrapperHandler implements WrapperHandler<OMElement> {
         return elements;
     }
 
-    public Object getChild(OMElement wrapper, ElementInfo childElement, int index) {
+    public Object getChild(OMElement wrapper, ElementInfo childElement) {
         Iterator children = wrapper.getChildrenWithName(childElement.getQName());
         if (!children.hasNext()) {
-            // No name match, try by index
-            List<List<OMElement>> list = getElements(wrapper);
-            List<OMElement> elements = list.get(index);
-            if (!childElement.isMany()) {
-                return elements.isEmpty() ? null : attachXSIType(childElement, elements.get(0));
-            } else {
-                Object[] array = elements.toArray();
-                for (Object item : array) {
-                    attachXSIType(childElement, (OMElement)item);
-                }
-                return array;
-            }
+            // We used to at this point call getElements(wrapper) to group children
+            // into like elements and then try to index into this list by integer index.
+            // The problem with this approach is that it ignores the possibility that
+            // we have a wrapper child with schema specifying minOccurs="0", in which case
+            // there are no wrapper children with this QName and so the index would be wrong.
+            // 
+            // It doesn't look like anyone is depending on this function currently, so just remove
+            // it and return "null".
+            return null;
         }
         if (!childElement.isMany()) {
             if (children.hasNext()) {
@@ -211,7 +212,7 @@ public class OMElementWrapperHandler implements WrapperHandler<OMElement> {
     }
 
     /**
-     * Create xis:type if required 
+     * Create xsi:type if required 
      * @param childElement
      * @param element
      * @return
diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java b/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
new file mode 100644
index 0000000000..1d2a22d057
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
@@ -0,0 +1,116 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package org.apache.tuscany.sca.databinding.axiom;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import javax.xml.namespace.QName;

+import javax.xml.stream.XMLStreamException;

+

+import org.apache.axiom.om.OMElement;

+import org.apache.axiom.om.impl.llom.util.AXIOMUtil;

+import org.apache.tuscany.sca.interfacedef.Operation;

+import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;

+import org.apache.tuscany.sca.interfacedef.util.ElementInfo;

+import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;

+import org.junit.Assert;

+import org.junit.Before;

+import org.junit.Test;

+

+

+/**

+ * Test case for OMElementWrapperHandler

+ *

+ * @version $Rev$ $Date$

+ */

+public class OMElementWrapperHandlerTestCase {

+    private static final QName INPUT1 = new QName("http://ns1", "input1");

+    private static final QName INPUT2 = new QName("http://ns2", "input2");

+    private static final QName INPUT3 = new QName("http://ns3", "input3");

+    private static final QName INPUT4 = new QName("http://ns4", "input4");

+    private String WRAPPER_XML =

+        "<?xml version=\"1.0\"?>" + "<wrapper"

+        + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""

+        + "  xmlns:ns1=\"http://ns1\""

+        + "  xmlns:ns2=\"http://ns2\""

+        + "  xmlns:ns3=\"http://ns3\""

+        + "  xmlns:ns4=\"http://ns4\">"

+        + "  <ns1:input1 xsi:type=\"ns1:Input1Type\">"

+        // Eliminating whitespace within the quotes allows us to have a simple compare.        

+        +       "input1ContentsA"  

+        +   "</ns1:input1>"

+        + "  <ns1:input1 xsi:nil=\"true\"/>"

+        + "  <ns1:input1>"

+        +       "input1ContentsB"  

+        +   "</ns1:input1>"        

+        + "  <ns3:input3 xsi:type=\"ns3:Input3Type\">"

+        +      "input3ContentsA"  

+        +   "</ns3:input3>"

+        + "  <ns4:input4>"

+        +       "input4ContentsA"  

+        + "  </ns4:input4>"

+        + " </wrapper>";

+

+    private OMElementWrapperHandler handler;

+

+    @Before

+    public void setUp() throws Exception {

+        this.handler = new OMElementWrapperHandler();

+    }

+    

+    // Would be nice to do a "set" test too.

+

+    @Test

+    public void testGetChildren() {

+        try {

+            OMElement wrapperElem = AXIOMUtil.stringToOM(WRAPPER_XML);

+            List<ElementInfo> elements = new ArrayList<ElementInfo>();

+            for (QName inQName : new QName[] { INPUT1, INPUT2, INPUT3, INPUT4 }) {

+                ElementInfo e = new ElementInfo(inQName, null);

+                e.setNillable(true);

+                elements.add(e);

+            }

+            // INPUT1,4 are "many" 

+            elements.get(0).setMany(true);

+            elements.get(3).setMany(true);

+            

+            WrapperInfo wrapperInfo = new WrapperInfo(AxiomDataBinding.NAME, null, null, elements, null);

+            Operation op = new OperationImpl();

+            op.setWrapper(wrapperInfo);

+            List children = handler.getChildren(wrapperElem, op, true);

+            Assert.assertEquals(4, children.size());

+            Object[] firstChild = (Object[])children.get(0);

+            Assert.assertEquals(3, firstChild.length);

+            Assert.assertEquals("input1ContentsB", ((OMElement)firstChild[2]).getText());

+            Object secondChild = children.get(1);

+            Assert.assertNull(secondChild);

+            OMElement thirdChild = (OMElement)children.get(2);

+            Assert.assertEquals("input3ContentsA", thirdChild.getText());

+            Object[] fourthChild = (Object[])children.get(3);

+            Assert.assertEquals(1, fourthChild.length);

+

+        } catch (XMLStreamException e) {

+            throw new RuntimeException(e); 

+        }

+    }

+

+}

+