You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/05/05 22:10:12 UTC
svn commit: r1334481 [1/4] - in /axis/axis2/java/core/trunk/modules:
adb-codegen/src/org/apache/axis2/schema/template/
adb-codegen/test/org/apache/axis2/schema/
adb-codegen/test/org/apache/axis2/schema/all/
adb-codegen/test/org/apache/axis2/schema/anyt...
Author: veithen
Date: Sat May 5 20:10:07 2012
New Revision: 1334481
URL: http://svn.apache.org/viewvc?rev=1334481&view=rev
Log:
AXIS2-4413: Removed the getPullParser stuff from generated ADB code. Also modified ADBXMLStreamReaderTest so that all unit tests use POJOs (the POJO databinding continues to use ADBXMLStreamReaderImpl).
Added:
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/reader/DummyBean.java (with props)
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/AllTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/AttributeTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/Base64BinaryTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/ChameleonTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChoiceTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/DecimalTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/list/ListTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/nonamespace/NoNamespaceTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ParticleMaxOccursTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/references/ReferenceTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/restriction/ComplexRestrictionTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/UnqualifiedTest.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBBean.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBHelper.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBHelperDataSource.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyType.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyURI.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Array.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayCoordinate.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayE.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Base64.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Base64Binary.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Date.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/DateTime.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Decimal.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Duration.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITIES.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITY.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GDay.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonth.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonthDay.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYear.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYearMonth.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/HexBinary.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ID.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREF.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREFS.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Integer.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Language.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NCName.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKEN.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKENS.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NOTATION.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Name.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NegativeInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonNegativeInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonPositiveInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NormalizedString.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/PositiveInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/QName.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/String.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Struct.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Time.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Token.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedByte.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedInt.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedLong.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedShort.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_boolean.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_byte.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_double.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_float.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_int.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Sat May 5 20:10:07 2012
@@ -1615,330 +1615,6 @@
<!-- ######################################################################################### -->
- /**
- * databinding method to get an XML representation of this object
- *
- */
- public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
- throws org.apache.axis2.databinding.ADBException{
-
-
- <xsl:choose>
- <xsl:when test="@type or @anon">
- java.util.ArrayList elementList = new java.util.ArrayList();
- java.util.ArrayList attribList = new java.util.ArrayList();
-
- <xsl:if test="$extension">
- attribList.add(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema-instance","type"));
- attribList.add(new javax.xml.namespace.QName("<xsl:value-of select="$nsuri"/>","<xsl:value-of select="$originalName"/>"));
- </xsl:if>
-
- <xsl:for-each select="property[not(@attribute)]">
- <xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
- <xsl:variable name="varName">local<xsl:value-of select="@javaname"/></xsl:variable>
- <xsl:variable name="min"><xsl:value-of select="@minOccurs"/></xsl:variable>
- <xsl:variable name="namespace"><xsl:value-of select="@nsuri"/></xsl:variable>
- <xsl:variable name="settingTracker">local<xsl:value-of select="@javaname"/>Tracker</xsl:variable>
-
-
- <xsl:if test="$min=0 or $choice"> if (<xsl:value-of select="$settingTracker"/>){</xsl:if>
- <xsl:choose>
- <xsl:when test="(@ours or @default) and not(@array)">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- <!-- Arraylist can handle null's -->
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(<xsl:value-of select="$varName"/>==null?null:
- <xsl:value-of select="$varName"/>);
- </xsl:when>
- <xsl:otherwise>
- if (<xsl:value-of select="$varName"/>==null){
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- elementList.add(<xsl:value-of select="$varName"/>);
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:when test="(@ours or @default) and @array">
- if (<xsl:value-of select="$varName"/>!=null) {
- for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
-
- if (<xsl:value-of select="$varName"/>[i] != null){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(<xsl:value-of select="$varName"/>[i]);
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(null);
- </xsl:when>
- <xsl:when test="$min=0">
- // nothing to do
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null !!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- }
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(<xsl:value-of select="$varName"/>);
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- </xsl:when>
- <!-- handle non ADB arrays - Not any however -->
- <xsl:when test="@array and not(@any)">
- if (<xsl:value-of select="$varName"/>!=null){
- for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
- <xsl:if test="not(@primitive)">
- if (<xsl:value-of select="$varName"/>[i] != null){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(null);
- </xsl:when>
- <xsl:when test="$min=0">
- // have to do nothing
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
- </xsl:if>
- <xsl:if test="@primitive">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
-
- </xsl:if>
-
- }
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(null);
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- </xsl:when>
-
- <!-- handle non ADB arrays - Any case - any may not be
- nillable -->
- <xsl:when test="@array and @any">
- if (<xsl:value-of select="$varName"/> != null) {
- for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
- if (<xsl:value-of select="$varName"/>[i] != null){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
- } else {
- <xsl:choose>
- <xsl:when test="$min=0">
- // have to do nothing
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- }
- } else {
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- </xsl:when>
- <!-- handle any - non array case-->
- <xsl:when test="@any">
- if (<xsl:value-of select="$varName"/> != null){
- elementList.add(org.apache.axis2.databinding.utils.Constants.OM_ELEMENT_KEY);
- elementList.add(<xsl:value-of select="$varName"/>);
- } else {
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- </xsl:when>
- <!-- handle binary - Since it is a Datahandler, we can just add it to the list
- and the ADB pullparser would handle it right-->
- <xsl:when test="@binary">
- <xsl:choose>
- <xsl:when test="$simple">
- elementList.add(org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT);
- </xsl:when>
- <xsl:otherwise>
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- </xsl:otherwise>
- </xsl:choose>
- elementList.add(<xsl:value-of select="$varName"/>);
- </xsl:when>
- <!-- the usual case!!!!-->
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="$simple">
- <!-- if the type is simple then this must be only the element text -->
- elementList.add(org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT);
- </xsl:when>
- <xsl:otherwise>
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- </xsl:otherwise>
- </xsl:choose>
-
- <xsl:if test="@primitive">
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- </xsl:if>
- <xsl:if test="not(@primitive)">
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(<xsl:value-of select="$varName"/>==null?null:
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- </xsl:when>
- <xsl:otherwise>
- if (<xsl:value-of select="$varName"/> != null){
- elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- } else {
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
-
- </xsl:otherwise>
- </xsl:choose>
- <xsl:if test="$min=0 or $choice">}</xsl:if>
- </xsl:for-each>
-
- <xsl:for-each select="property[@attribute]">
- <xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
- <xsl:variable name="varName">local<xsl:value-of select="@javaname"/></xsl:variable>
- <xsl:variable name="namespace"><xsl:value-of select="@nsuri"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="@any and not(@array)">
- attribList.add(org.apache.axis2.databinding.utils.Constants.OM_ATTRIBUTE_KEY);
- attribList.add(<xsl:value-of select="$varName"/>);
- </xsl:when>
- <xsl:when test="@any and @array">
- for (int i=0;i <<xsl:value-of select="$varName"/>.length;i++){
- attribList.add(org.apache.axis2.databinding.utils.Constants.OM_ATTRIBUTE_KEY);
- attribList.add(<xsl:value-of select="$varName"/>[i]);
- }
- </xsl:when>
- <xsl:otherwise>
- attribList.add(
- new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>"));
- <xsl:choose>
- <xsl:when test="@ours">
- attribList.add(<xsl:value-of select="$varName"/>.toString());
- </xsl:when>
- <xsl:otherwise>
- attribList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
-
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
- <!-- end of when for type & anon -->
- </xsl:when>
- <xsl:when test="$union and $simple">
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
- new java.lang.Object[]{
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- localObject.toString()
- },
- null);
- </xsl:when>
-
- <xsl:when test="$list and $simple">
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
- new java.lang.Object[]{
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- toString()
- },
- null);
- </xsl:when>
-
- <!-- Not a type and not anon. So it better be only one inclusion-->
- <xsl:otherwise>
- <!-- if the element is associated with a type, then its gonna be only one -->
- //We can safely assume an element has only one type associated with it
- <xsl:variable name="varName">local<xsl:value-of select="property/@javaname"/></xsl:variable>
- <xsl:variable name="nillable" select="property/@nillable"></xsl:variable>
- <xsl:variable name="primitive" select="property/@primitive"></xsl:variable>
-
- <xsl:choose>
- <!-- This better be only one!!-->
- <xsl:when test="property/@ours">
-
- <xsl:choose>
- <xsl:when test="$nillable">
- if (<xsl:value-of select="$varName"/>==null){
- return new org.apache.axis2.databinding.utils.reader.NullXMLStreamReader(MY_QNAME);
- }else{
- return <xsl:value-of select="$varName"/>.getPullParser(MY_QNAME);
- }
- </xsl:when>
- <xsl:otherwise>return <xsl:value-of select="$varName"/>.getPullParser(MY_QNAME);</xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="$nillable and not($primitive)">
- if (<xsl:value-of select="$varName"/>==null){
- return new org.apache.axis2.databinding.utils.reader.NullXMLStreamReader(MY_QNAME);
- }else{
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
- new java.lang.Object[]{
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>)
- },
- null);
- }
- </xsl:when>
- <xsl:otherwise> return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
- new java.lang.Object[]{
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>)
- },
- null);</xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
-
- }
-
- <!-- ######################################################################################### -->
/**
* Factory class that keeps the parse method
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl Sat May 5 20:10:07 2012
@@ -1116,280 +1116,6 @@ public <xsl:if test="not(@unwrapped) or
}
- public javax.xml.stream.XMLStreamReader getPullParser(<xsl:value-of select="@name"/> bean, javax.xml.namespace.QName qName)
- throws org.apache.axis2.databinding.ADBException{
-
- <xsl:choose>
- <xsl:when test="@type or @anon">
- java.util.ArrayList elementList = new java.util.ArrayList();
- java.util.ArrayList attribList = new java.util.ArrayList();
-
- <xsl:for-each select="property[not(@attribute)]">
- <xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
- <xsl:variable name="varName">bean.local<xsl:value-of select="@javaname"/></xsl:variable>
- <xsl:variable name="min"><xsl:value-of select="@minOccurs"/></xsl:variable>
- <xsl:variable name="namespace"><xsl:value-of select="@nsuri"/></xsl:variable>
- <xsl:variable name="settingTracker">bean.local<xsl:value-of select="@javaname"/>Tracker</xsl:variable>
-
-
- <xsl:if test="$min=0 or $choice"> if (<xsl:value-of select="$settingTracker"/>){</xsl:if>
- <xsl:choose>
- <xsl:when test="(@ours or @default) and not(@array)">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- <!-- Arraylist can handle null's -->
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(<xsl:value-of select="$varName"/>==null?null:
- <xsl:value-of select="$varName"/>);
- </xsl:when>
- <xsl:otherwise>
- if (<xsl:value-of select="$varName"/>==null){
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- elementList.add(<xsl:value-of select="$varName"/>);
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:when test="(@ours or @default) and @array">
- if (<xsl:value-of select="$varName"/>!=null) {
- for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
-
- if (<xsl:value-of select="$varName"/>[i] != null){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(<xsl:value-of select="$varName"/>[i]);
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(null);
- </xsl:when>
- <xsl:when test="$min=0">
- // nothing to do
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null !!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- }
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(<xsl:value-of select="$varName"/>);
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- </xsl:when>
- <!-- handle non ADB arrays - Not any however -->
- <xsl:when test="@array and not(@any)">
- if (<xsl:value-of select="$varName"/>!=null){
- for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
- <xsl:if test="not(@primitive)">
- if (<xsl:value-of select="$varName"/>[i] != null){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(null);
- </xsl:when>
- <xsl:when test="$min=0">
- // have to do nothing
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
- </xsl:if>
- <xsl:if test="@primitive">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
-
- </xsl:if>
-
- }
- } else {
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(null);
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- </xsl:when>
-
- <!-- handle non ADB arrays - Any case - any may not be
- nillable -->
- <xsl:when test="@array and @any">
- if (<xsl:value-of select="$varName"/> != null) {
- for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
- if (<xsl:value-of select="$varName"/>[i] != null){
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
- } else {
- <xsl:choose>
- <xsl:when test="$min=0">
- // have to do nothing
- </xsl:when>
- <xsl:otherwise>
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- </xsl:otherwise>
- </xsl:choose>
- }
-
- }
- } else {
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- </xsl:when>
- <!-- handle any - non array case-->
- <xsl:when test="@any">
- if (<xsl:value-of select="$varName"/> != null){
- elementList.add(org.apache.axis2.databinding.utils.Constants.OM_ELEMENT_KEY);
- elementList.add(<xsl:value-of select="$varName"/>);
- } else {
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- </xsl:when>
- <!-- handle binary - Since it is a Datahandler, we can just add it to the list
- and the ADB pullparser would handle it right-->
- <xsl:when test="@binary">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- elementList.add(<xsl:value-of select="$varName"/>);
- </xsl:when>
- <!-- the usual case!!!!-->
- <xsl:otherwise>
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
- <xsl:if test="@primitive">
- elementList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- </xsl:if>
- <xsl:if test="not(@primitive)">
- <xsl:choose>
- <xsl:when test="@nillable">
- elementList.add(<xsl:value-of select="$varName"/>==null?null:
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- </xsl:when>
- <xsl:otherwise>
- if (<xsl:value-of select="$varName"/> != null){
- elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- } else {
- throw new org.apache.axis2.databinding.ADBException("<xsl:value-of select="$propertyName"/> cannot be null!!");
- }
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
-
- </xsl:otherwise>
- </xsl:choose>
- <xsl:if test="$min=0 or $choice">}</xsl:if>
- </xsl:for-each>
-
- <xsl:for-each select="property[@attribute]">
- <xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
- <xsl:variable name="varName">bean.local<xsl:value-of select="@javaname"/></xsl:variable>
- <xsl:variable name="namespace"><xsl:value-of select="@nsuri"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="@any and not(@array)">
- attribList.add(org.apache.axis2.databinding.utils.Constants.OM_ATTRIBUTE_KEY);
- attribList.add(<xsl:value-of select="$varName"/>);
- </xsl:when>
- <xsl:when test="@any and @array">
- for (int i=0;i <<xsl:value-of select="$varName"/>.length;i++){
- attribList.add(org.apache.axis2.databinding.utils.Constants.OM_ATTRIBUTE_KEY);
- attribList.add(<xsl:value-of select="$varName"/>[i]);
- }
- </xsl:when>
- <xsl:otherwise>
- attribList.add(
- new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>"));
- attribList.add(
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
-
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray());
- <!-- end of when for type & anon -->
- </xsl:when>
- <!-- Not a type and not anon. So it better be only one inclusion-->
- <xsl:otherwise>
- <!-- if the element is associated with a type, then its gonna be only one -->
- //We can safely assume an element has only one type associated with it
- <xsl:variable name="varName">bean.local<xsl:value-of select="property/@javaname"/></xsl:variable>
- <xsl:variable name="nillable" select="property/@nillable"></xsl:variable>
- <xsl:variable name="primitive" select="property/@primitive"></xsl:variable>
- <xsl:variable name="propertyType" select="property/@type"></xsl:variable>
-
- <xsl:choose>
- <!-- This better be only one!!-->
- <xsl:when test="property/@ours">
-
- <xsl:choose>
- <xsl:when test="$nillable">
- if (<xsl:value-of select="$varName"/>==null){
- return new org.apache.axis2.databinding.utils.reader.NullXMLStreamReader(bean.MY_QNAME);
- }else{
- return <xsl:value-of select="$propertyType"/>Helper.INSTANCE.getPullParser(<xsl:value-of select="$varName"/>,bean.MY_QNAME);
- }
- </xsl:when>
- <xsl:otherwise>return <xsl:value-of select="$propertyType"/>Helper.INSTANCE.getPullParser(<xsl:value-of select="$varName"/>,bean.MY_QNAME);</xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="$nillable and not($primitive)">
- if (<xsl:value-of select="$varName"/>==null){
- return new org.apache.axis2.databinding.utils.reader.NullXMLStreamReader(bean.MY_QNAME);
- }else{
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(bean.MY_QNAME,
- new java.lang.Object[]{
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>)
- },
- null);
- }
- </xsl:when>
- <xsl:otherwise> return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(bean.MY_QNAME,
- new java.lang.Object[]{
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>)
- },
- null);</xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
-
- }
-
/**
* static method to create the object
* Precondition: If this object is an element, the current or next start element starts this object and any intervening reader events are ignorable
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java Sat May 5 20:10:07 2012
@@ -71,22 +71,6 @@ public class ADBBeanUtil {
return getOMElement(bean, getQName(bean.getClass()), OMAbstractFactory.getOMFactory());
}
- public static XMLStreamReader getPullParser(Object bean, QName qname) throws Exception {
- if (bean instanceof ADBBean) {
- return ((ADBBean)bean).getPullParser(qname);
- } else {
- return getPullParser(bean, getHelper(bean.getClass()), qname);
- }
- }
-
- private static <T> XMLStreamReader getPullParser(Object bean, ADBHelper<T> helper, QName qname) throws XMLStreamException {
- return helper.getPullParser(helper.getBeanClass().cast(bean), qname);
- }
-
- public static XMLStreamReader getPullParser(Object bean) throws Exception {
- return getPullParser(bean, getQName(bean.getClass()));
- }
-
public static void serialize(Object bean, QName qname, XMLStreamWriter writer) throws Exception {
if (bean instanceof ADBBean) {
((ADBBean)bean).serialize(qname, writer);
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java Sat May 5 20:10:07 2012
@@ -285,23 +285,10 @@ public abstract class AbstractTestCase e
testSerializeDeserialize(bean, bean);
}
- public static void testSerializeDeserialize(ADBBean bean, boolean testGetPullParser) throws Exception {
- testSerializeDeserialize(bean, bean, testGetPullParser);
- }
-
public static void testSerializeDeserialize(ADBBean bean, ADBBean expectedResult) throws Exception {
- testSerializeDeserialize(bean, expectedResult, true);
- }
-
- public static void testSerializeDeserialize(ADBBean bean, ADBBean expectedResult, boolean testGetPullParser) throws Exception {
testSerializeDeserializeUsingStAX(bean, expectedResult);
testSerializeDeserializeUsingOMStAXWrapper(bean, expectedResult);
- if (testGetPullParser) {
- // TODO: this badly fails for many of the test cases => there are still issues to solve!!!
- testSerializeDeserializeUsingPullParser(bean, expectedResult);
- }
-
testSerializeDeserializeWrapped(bean, expectedResult);
testSerializeDeserializeUsingMTOM(bean, expectedResult, true);
testSerializeDeserializeUsingMTOM(bean, expectedResult, false);
@@ -347,12 +334,7 @@ public abstract class AbstractTestCase e
assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(), omElement2.getXMLStreamReader()));
}
- // Deserialization approach 3: use the pull parser produced by ADB.
- private static void testSerializeDeserializeUsingPullParser(Object bean, Object expectedResult) throws Exception {
- assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(), ADBBeanUtil.getPullParser(bean)));
- }
-
- // Approach 4: Serialize the bean as the child of an element that declares a default namespace.
+ // Approach 3: Serialize the bean as the child of an element that declares a default namespace.
// If ADB behaves correctly, this should not have any impact. A failure here may be an indication
// of an incorrect usage of XMLStreamWriter#writeStartElement(String).
private static void testSerializeDeserializeWrapped(Object bean, Object expectedResult) throws Exception {
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/AllTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/AllTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/AllTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/all/AllTest.java Sat May 5 20:10:07 2012
@@ -28,6 +28,6 @@ public class AllTest extends AbstractTes
update.setArg0("test");
update.setArg1(true);
update.setId(2);
- testSerializeDeserialize(update, false);
+ testSerializeDeserialize(update);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java Sat May 5 20:10:07 2012
@@ -30,7 +30,7 @@ public class AnyTypeTest extends Abstrac
public void testAnyTypeElement1_1() throws Exception {
TestAnyTypeElement1 testAnyTypeElement = new TestAnyTypeElement1();
testAnyTypeElement.setTestAnyTypeElement1("test");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement1_2() throws Exception {
@@ -43,20 +43,20 @@ public class AnyTypeTest extends Abstrac
public void testAnyTypeElement2_1() throws Exception {
TestAnyTypeElement2 testAnyTypeElement = new TestAnyTypeElement2();
testAnyTypeElement.setTestAnyTypeElement2("test");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement2_2() throws Exception {
TestAnyTypeElement2 testAnyTypeElement = new TestAnyTypeElement2();
testAnyTypeElement.setTestAnyTypeElement2(null);
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement3_1() throws Exception {
TestAnyTypeElement3 testAnyTypeElement = new TestAnyTypeElement3();
testAnyTypeElement.setParam1(new Object[]{"test1","test2"});
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement3_2() throws Exception {
@@ -73,14 +73,14 @@ public class AnyTypeTest extends Abstrac
TestAnyTypeElement3 testAnyTypeElement = new TestAnyTypeElement3();
testAnyTypeElement.setParam1(new Object[]{"test",null});
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement4_1() throws Exception {
TestAnyTypeElement4 testAnyTypeElement = new TestAnyTypeElement4();
testAnyTypeElement.setParam1(new Object[]{"test1","test2"});
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement4_2() throws Exception {
@@ -95,14 +95,14 @@ public class AnyTypeTest extends Abstrac
TestAnyTypeElement4 expectedResult = new TestAnyTypeElement4();
expectedResult.setParam1(new Object[] { "test" });
- testSerializeDeserialize(testAnyTypeElement, expectedResult, false);
+ testSerializeDeserialize(testAnyTypeElement, expectedResult);
}
public void testAnyTypeElement5_1() throws Exception {
TestAnyTypeElement5 testAnyTypeElement = new TestAnyTypeElement5();
testAnyTypeElement.setParam1(new Object[]{"test1","test2"});
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement5_2() throws Exception {
@@ -117,14 +117,14 @@ public class AnyTypeTest extends Abstrac
public void testAnyTypeElement5_3() throws Exception {
TestAnyTypeElement5 testAnyTypeElement = new TestAnyTypeElement5();
testAnyTypeElement.setParam1(new Object[]{"test",null});
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement6_1() throws Exception {
TestAnyTypeElement6 testAnyTypeElement = new TestAnyTypeElement6();
testAnyTypeElement.setParam1(new Object[]{"test1","test2"});
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement6_2() throws Exception {
@@ -153,13 +153,13 @@ public class AnyTypeTest extends Abstrac
testAnyTypeElement6.setParam1(testComplexParents);
- testSerializeDeserialize(testAnyTypeElement6, false);
+ testSerializeDeserialize(testAnyTypeElement6);
}
public void testAnyTypeElement7_1() throws Exception {
TestAnyTypeElement7 testAnyTypeElement = new TestAnyTypeElement7();
testAnyTypeElement.setParam1("test");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement7_2() throws Exception {
@@ -173,13 +173,13 @@ public class AnyTypeTest extends Abstrac
TestComplexParent testComplexParent = new TestComplexParent();
testComplexParent.setParam1("test param1");
testAnyTypeElement7.setParam1(testComplexParent);
- testSerializeDeserialize(testAnyTypeElement7, false);
+ testSerializeDeserialize(testAnyTypeElement7);
}
public void testAnyTypeElement8_1() throws Exception {
TestAnyTypeElement8 testAnyTypeElement = new TestAnyTypeElement8();
testAnyTypeElement.setParam1("test");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement8_2() throws Exception {
@@ -191,7 +191,7 @@ public class AnyTypeTest extends Abstrac
public void testAnyTypeElement9_1() throws Exception {
TestAnyTypeElement9 testAnyTypeElement = new TestAnyTypeElement9();
testAnyTypeElement.setParam1("test");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement9_2() throws Exception {
@@ -203,7 +203,7 @@ public class AnyTypeTest extends Abstrac
public void testAnyTypeElement10_1() throws Exception {
TestAnyTypeElement10 testAnyTypeElement = new TestAnyTypeElement10();
testAnyTypeElement.setParam1("test");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyTypeElement10_2() throws Exception {
@@ -216,14 +216,14 @@ public class AnyTypeTest extends Abstrac
// datatype tests
TestAnyTypeElement1 testAnyTypeElement = new TestAnyTypeElement1();
testAnyTypeElement.setTestAnyTypeElement1(new Integer(5));
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testAnyElementQName() throws Exception {
// datatype tests
TestAnyTypeElement1 testAnyTypeElement = new TestAnyTypeElement1();
testAnyTypeElement.setTestAnyTypeElement1(new QName("http://wso2.org","testElement"));
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
public void testTestElement() throws Exception {
@@ -251,7 +251,7 @@ public class AnyTypeTest extends Abstrac
testElement.setParam1(dynamicProperties);
- testSerializeDeserialize(testElement, false);
+ testSerializeDeserialize(testElement);
}
// Regression test for AXIS2-4273
@@ -269,7 +269,7 @@ public class AnyTypeTest extends Abstrac
public void testEmptyString() throws Exception {
TestAnyTypeElement1 testAnyTypeElement = new TestAnyTypeElement1();
testAnyTypeElement.setTestAnyTypeElement1("");
- testSerializeDeserialize(testAnyTypeElement, false);
+ testSerializeDeserialize(testAnyTypeElement);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/AttributeTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/AttributeTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/AttributeTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/attribute/AttributeTest.java Sat May 5 20:10:07 2012
@@ -78,6 +78,6 @@ public class AttributeTest extends Abstr
testAttributeReferenceType.setTestAttribute1("attribute1");
testAttributeReferenceElement.setTestAttributeReferenceElement(testAttributeReferenceType);
- testSerializeDeserialize(testAttributeReferenceElement, false);
+ testSerializeDeserialize(testAttributeReferenceElement);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/Base64BinaryTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/Base64BinaryTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/Base64BinaryTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/Base64BinaryTest.java Sat May 5 20:10:07 2012
@@ -37,7 +37,7 @@ public class Base64BinaryTest extends Ab
contentType_type0.setContentType_type0("test content type");
base64Binary.setContentType(contentType_type0);
- testSerializeDeserialize(testBase64Binary, false);
+ testSerializeDeserialize(testBase64Binary);
}
public void testBase64Binary() throws Exception {
@@ -63,7 +63,7 @@ public class Base64BinaryTest extends Ab
contentType_type0.setContentType_type0("test content type");
hexBinary.setContentType(contentType_type0);
- testSerializeDeserialize(testHexBinary, false);
+ testSerializeDeserialize(testHexBinary);
}
public void testBase64MultiElement() throws Exception {
@@ -75,7 +75,7 @@ public class Base64BinaryTest extends Ab
testBase64MultiElement.setParam2("test string");
testBase64MultiElement.setParam3(5);
- testSerializeDeserialize(testBase64MultiElement, false);
+ testSerializeDeserialize(testBase64MultiElement);
}
public void testBase64BinaryOnbounded() throws Exception {
@@ -85,6 +85,6 @@ public class Base64BinaryTest extends Ab
new DataHandler("DataHandler 2", "text/plain"),
new DataHandler("DataHandler 3", "text/plain")
});
- testSerializeDeserialize(bean, false);
+ testSerializeDeserialize(bean);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java Sat May 5 20:10:07 2012
@@ -26,14 +26,14 @@ public class BooleanTest extends Abstrac
public void testBooleanTest1() throws Exception {
TestBoolean1 testBoolean = new TestBoolean1();
testBoolean.setTestBoolean1(true);
- testSerializeDeserialize(testBoolean, false);
+ testSerializeDeserialize(testBoolean);
}
public void testBooleanTest2() throws Exception {
TestBoolean2 testBoolean = new TestBoolean2();
testBoolean.setParam1(false);
testBoolean.setAttribute1(true);
- testSerializeDeserialize(testBoolean, false);
+ testSerializeDeserialize(testBoolean);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/ChameleonTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/ChameleonTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/ChameleonTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/ChameleonTest.java Sat May 5 20:10:07 2012
@@ -31,6 +31,6 @@ public class ChameleonTest extends Abstr
supp.setParam("test");
MainSchemaElement main = new MainSchemaElement();
main.setParam(supp);
- testSerializeDeserialize(main, false);
+ testSerializeDeserialize(main);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChoiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChoiceTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChoiceTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChoiceTest.java Sat May 5 20:10:07 2012
@@ -30,6 +30,6 @@ public class ChoiceTest extends Abstract
TestChoice expectedResult = new TestChoice();
expectedResult.setChoice2(5);
- testSerializeDeserialize(testChoice, expectedResult, false);
+ testSerializeDeserialize(testChoice, expectedResult);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/DecimalTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/DecimalTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/DecimalTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/decimal/DecimalTest.java Sat May 5 20:10:07 2012
@@ -38,7 +38,7 @@ public class DecimalTest extends Abstrac
arrayOfDecimal.addDecimal(new BigDecimal("111.38"));
arrayOfDecimal.addDecimal(new BigDecimal("111.54"));
- testSerializeDeserialize(getHistoricNavResponse, false);
+ testSerializeDeserialize(getHistoricNavResponse);
}
// TODO: explain what this test has to do with "DecimalTest"???
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java Sat May 5 20:10:07 2012
@@ -30,6 +30,6 @@ public class EnumerationTest extends Abs
countPlacesInRect.setUpperleft("upperleft");
countPlacesInRect.setPtype(PlaceType.River);
- testSerializeDeserialize(countPlacesInRect, false);
+ testSerializeDeserialize(countPlacesInRect);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java Sat May 5 20:10:07 2012
@@ -34,7 +34,7 @@ public class ComplexExtenstionTest exten
extendedComplexType.setParentElement1("test1");
extendedComplexType.setParentElement2("test2");
- testSerializeDeserialize(testComplexElement, false);
+ testSerializeDeserialize(testComplexElement);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java Sat May 5 20:10:07 2012
@@ -34,7 +34,7 @@ public class SimpleExtensionTest extends
fullName.setAttribute2(SimpleType.Factory.fromString("ATTRIBUTE", ""));
- testSerializeDeserialize(fullName, false);
+ testSerializeDeserialize(fullName);
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java Sat May 5 20:10:07 2012
@@ -32,7 +32,7 @@ public class GroupTest extends AbstractT
testSequenceGroup.setSequenceParam2("sequenceParam2");
testGroupSequenceElement.setTestSequenceGroup(testSequenceGroup);
- testSerializeDeserialize(testGroupSequenceElement, false);
+ testSerializeDeserialize(testGroupSequenceElement);
}
public void testNestedSequenceGroupElement() throws Exception {
@@ -51,7 +51,7 @@ public class GroupTest extends AbstractT
testSequenceNestedGroupElement.setTestSequenceNestedGroup(testSequenceNestedGroup);
- testSerializeDeserialize(testSequenceNestedGroupElement, false);
+ testSerializeDeserialize(testSequenceNestedGroupElement);
}
public void testChoiceGroupElement() throws Exception {
@@ -65,7 +65,7 @@ public class GroupTest extends AbstractT
TestChoiceGroupElement expectedResult = new TestChoiceGroupElement();
expectedResult.setTestChoiceGroup(testChoiceGroup);
- testSerializeDeserialize(testGroupChoiceElement, expectedResult, false);
+ testSerializeDeserialize(testGroupChoiceElement, expectedResult);
}
public void testNestedChoiceGroupElement() throws Exception {
@@ -93,7 +93,7 @@ public class GroupTest extends AbstractT
expectedResult.setTestChoiceNestedGroup(expectedChoiceNestedGroup);
- testSerializeDeserialize(testChoiceNestedGroupElement, expectedResult, false);
+ testSerializeDeserialize(testChoiceNestedGroupElement, expectedResult);
}
public void testAttributeGroup() throws Exception {
@@ -101,7 +101,7 @@ public class GroupTest extends AbstractT
testAttributeGroup.setAttribute1("Attribute1");
testAttributeGroup.setParam1("Param1");
- testSerializeDeserialize(testAttributeGroup, false);
+ testSerializeDeserialize(testAttributeGroup);
}
public void testNestedAttributeGroup() throws Exception {
@@ -110,7 +110,7 @@ public class GroupTest extends AbstractT
testNestedAttributeGroupElement.setAttribute2("Attribute2");
testNestedAttributeGroupElement.setParam1("Param1");
- testSerializeDeserialize(testNestedAttributeGroupElement, false);
+ testSerializeDeserialize(testNestedAttributeGroupElement);
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java Sat May 5 20:10:07 2012
@@ -41,7 +41,7 @@ public class InnerChoiceTest extends Abs
expectedTestInnerSequence1Choice_type0.setChoice2(5);
expectedSequence.setTestInnerSequence1Choice_type0(expectedTestInnerSequence1Choice_type0);
- testSerializeDeserialize(testSequence, expectedSequence, false);
+ testSerializeDeserialize(testSequence, expectedSequence);
}
public void testInnerChoice21() throws Exception {
@@ -52,7 +52,7 @@ public class InnerChoiceTest extends Abs
testInnerSequence2Choice_type1.setChoice1(new String[]{"choice1", "choice2"});
testSequence.setTestInnerSequence2Choice_type0(testInnerSequence2Choice_type1);
- testSerializeDeserialize(testSequence, false);
+ testSerializeDeserialize(testSequence);
}
public void testInnerChoice22() throws Exception {
@@ -63,7 +63,7 @@ public class InnerChoiceTest extends Abs
testInnerSequence2Choice_type1.setChoice2(new int[]{2, 4});
testSequence.setTestInnerSequence2Choice_type0(testInnerSequence2Choice_type1);
- testSerializeDeserialize(testSequence, false);
+ testSerializeDeserialize(testSequence);
}
public void testInnerChoice31() throws Exception {
@@ -74,7 +74,7 @@ public class InnerChoiceTest extends Abs
testInnerSequence3Choice_type0.setChoice1(new String[]{"choice1", null, "choice2"});
testSequence.setTestInnerSequence3Choice_type0(testInnerSequence3Choice_type0);
- testSerializeDeserialize(testSequence, false);
+ testSerializeDeserialize(testSequence);
}
public void testInnerChoice32() throws Exception {
@@ -85,6 +85,6 @@ public class InnerChoiceTest extends Abs
testInnerSequence3Choice_type0.setChoice2(new int[]{2, Integer.MIN_VALUE, 6});
testSequence.setTestInnerSequence3Choice_type0(testInnerSequence3Choice_type0);
- testSerializeDeserialize(testSequence, false);
+ testSerializeDeserialize(testSequence);
}
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java?rev=1334481&r1=1334480&r2=1334481&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java Sat May 5 20:10:07 2012
@@ -51,6 +51,6 @@ public class TestInnerParticleExtension
testElement.setChildElement(childElement_type0);
- testSerializeDeserialize(testElement, false);
+ testSerializeDeserialize(testElement);
}
}