Attachment #141665 for bug #283453

View | Details | Raw Unified | Return to bug 283453
Collapse All | Expand All

Lines 3424-3429 Link Here

(-)foundation/org.eclipse.persistence.core/resource/xsd/eclipselink_persistence_map_1.1.xsd (+1 lines)
3424	<xsd:extension base="abstract-composite-direct-collection-mapping">	3424	<xsd:extension base="abstract-composite-direct-collection-mapping">
3425	<xsd:sequence>	3425	<xsd:sequence>
3426	<xsd:element minOccurs="0" name="is-cdata" type="xsd:boolean" />	3426	<xsd:element minOccurs="0" name="is-cdata" type="xsd:boolean" />
		3427	<xsd:element minOccurs="0" name="null-policy" type="abstract-null-policy" />
3427	</xsd:sequence>	3428	</xsd:sequence>
3428	</xsd:extension>	3429	</xsd:extension>
3429	</xsd:complexContent>	3430	</xsd:complexContent>

Lines 22-28 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/XMLCompositeDirectCollectionMappingNodeValue.java (-2 / +44 lines)
22	import org.eclipse.persistence.oxm.XMLConstants;	22	import org.eclipse.persistence.oxm.XMLConstants;
23	import org.eclipse.persistence.oxm.XMLField;	23	import org.eclipse.persistence.oxm.XMLField;
24	import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;	24	import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
		25	import org.eclipse.persistence.oxm.mappings.XMLDirectMapping;
25	import org.eclipse.persistence.oxm.mappings.converters.XMLConverter;	26	import org.eclipse.persistence.oxm.mappings.converters.XMLConverter;
		27	import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;
26	import org.eclipse.persistence.oxm.record.MarshalRecord;	28	import org.eclipse.persistence.oxm.record.MarshalRecord;
27	import org.eclipse.persistence.oxm.record.UnmarshalRecord;	29	import org.eclipse.persistence.oxm.record.UnmarshalRecord;
28	import org.xml.sax.Attributes;	30	import org.xml.sax.Attributes;
Lines 131-136 Link Here
131	public boolean startElement(XPathFragment xPathFragment, UnmarshalRecord unmarshalRecord, Attributes atts) {	133	public boolean startElement(XPathFragment xPathFragment, UnmarshalRecord unmarshalRecord, Attributes atts) {
132	XMLField xmlField = (XMLField) xmlCompositeDirectCollectionMapping.getField();	134	XMLField xmlField = (XMLField) xmlCompositeDirectCollectionMapping.getField();
133	if (xmlField.getLastXPathFragment().nameIsText()) {	135	if (xmlField.getLastXPathFragment().nameIsText()) {
		136
134	String type = atts.getValue(XMLConstants.SCHEMA_INSTANCE_URL, XMLConstants.SCHEMA_TYPE_ATTRIBUTE);	137	String type = atts.getValue(XMLConstants.SCHEMA_INSTANCE_URL, XMLConstants.SCHEMA_TYPE_ATTRIBUTE);
135	if (null != type) {	138	if (null != type) {
136	String namespaceURI = null;	139	String namespaceURI = null;
Lines 142-147 Link Here
142	}	145	}
143	unmarshalRecord.setTypeQName(new QName(namespaceURI, type));	146	unmarshalRecord.setTypeQName(new QName(namespaceURI, type));
144	}	147	}
		148
		149	if (xmlCompositeDirectCollectionMapping.getNullPolicy().isNullRepresentedByXsiNil() && xmlCompositeDirectCollectionMapping.getNullPolicy().valueIsNull(atts)) {
		150	getContainerPolicy().addInto(null, unmarshalRecord.getContainerInstance(this), unmarshalRecord.getSession());
		151	}
		152
145	} else if (xmlField.getLastXPathFragment().isAttribute()) {	153	} else if (xmlField.getLastXPathFragment().isAttribute()) {
146	if (!this.xmlCompositeDirectCollectionMapping.usesSingleNode()) {	154	if (!this.xmlCompositeDirectCollectionMapping.usesSingleNode()) {
147	String namespaceURI = xmlField.getLastXPathFragment().getNamespaceURI();	155	String namespaceURI = xmlField.getLastXPathFragment().getNamespaceURI();
Lines 157-162 Link Here
157	}	165	}
158		166
159	public void endElement(XPathFragment xPathFragment, UnmarshalRecord unmarshalRecord) {	167	public void endElement(XPathFragment xPathFragment, UnmarshalRecord unmarshalRecord) {
		168	XMLField xmlField = (XMLField) xmlCompositeDirectCollectionMapping.getField();
		169	if (!xmlField.getLastXPathFragment().nameIsText()) {
		170	return;
		171	}
		172
160	Object value = unmarshalRecord.getStringBuffer().toString();	173	Object value = unmarshalRecord.getStringBuffer().toString();
161	Object collection = unmarshalRecord.getContainerInstance(this);	174	Object collection = unmarshalRecord.getContainerInstance(this);
162	unmarshalRecord.resetStringBuffer();	175	unmarshalRecord.resetStringBuffer();
Lines 167-172 Link Here
167	addUnmarshalValue(unmarshalRecord, stringTokenizer.nextToken(), collection);	180	addUnmarshalValue(unmarshalRecord, stringTokenizer.nextToken(), collection);
168	}	181	}
169	} else {	182	} else {
		183	if (value.equals(EMPTY_STRING)) {
		184	if (xmlCompositeDirectCollectionMapping.getNullPolicy().isNullRepresentedByEmptyNode() \|\|
		185	xmlCompositeDirectCollectionMapping.getNullPolicy().isNullRepresentedByXsiNil()) {
		186	return;
		187	}
		188	}
170	addUnmarshalValue(unmarshalRecord, value, collection);	189	addUnmarshalValue(unmarshalRecord, value, collection);
171	}	190	}
172	}	191	}
Lines 186-194 Link Here
186	}	205	}
187		206
188	private void addUnmarshalValue(UnmarshalRecord unmarshalRecord, Object value, Object collection) {	207	private void addUnmarshalValue(UnmarshalRecord unmarshalRecord, Object value, Object collection) {
189	if ((null == value) \|\| EMPTY_STRING.equals(value)) {	208	if (null == value) {
190	return;	209	return;
191	}	210	}
		211
		212	if (xmlCompositeDirectCollectionMapping.getNullPolicy().isNullRepresentedByXsiNil() && xmlCompositeDirectCollectionMapping.getNullPolicy().valueIsNull(unmarshalRecord.getAttributes())) {
		213	return;
		214	}
		215
		216	if ((!isWhitespaceAware() && EMPTY_STRING.equals(value))) {
		217	return;
		218	}
		219
192	XMLField xmlField = (XMLField) xmlCompositeDirectCollectionMapping.getField();	220	XMLField xmlField = (XMLField) xmlCompositeDirectCollectionMapping.getField();
193		221
194	XMLConversionManager xmlConversionManager = (XMLConversionManager) unmarshalRecord.getSession().getDatasourcePlatform().getConversionManager();	222	XMLConversionManager xmlConversionManager = (XMLConversionManager) unmarshalRecord.getSession().getDatasourcePlatform().getConversionManager();
Lines 206-211 Link Here
206	value = xmlCompositeDirectCollectionMapping.getValueConverter().convertDataValueToObjectValue(value, unmarshalRecord.getSession());	234	value = xmlCompositeDirectCollectionMapping.getValueConverter().convertDataValueToObjectValue(value, unmarshalRecord.getSession());
207	}	235	}
208	}	236	}
		237
209	unmarshalRecord.addAttributeValue(this, value, collection);	238	unmarshalRecord.addAttributeValue(this, value, collection);
210	}	239	}
211		240
Lines 254-259 Link Here
254	}	283	}
255	}	284	}
256	marshalRecord.endElement(xPathFragment, namespaceResolver);	285	marshalRecord.endElement(xPathFragment, namespaceResolver);
		286	} else {
		287	if (xmlCompositeDirectCollectionMapping.getNullPolicy().getMarshalNullRepresentation() != XMLNullRepresentationType.ABSENT_NODE) {
		288	marshalRecord.openStartElement(xPathFragment, namespaceResolver);
		289	XPathFragment nextFragment = xPathFragment.getNextFragment();
		290
		291	xmlCompositeDirectCollectionMapping.getNullPolicy().directMarshal(nextFragment, marshalRecord, object, session, namespaceResolver);
		292
		293	marshalRecord.endElement(nextFragment, namespaceResolver);
		294	}
257	}	295	}
258		296
259	}	297	}
Lines 262-265 Link Here
262	return xmlCompositeDirectCollectionMapping;	300	return xmlCompositeDirectCollectionMapping;
263	}	301	}
264		302
265	}	303	public boolean isWhitespaceAware() {
		304	return !xmlCompositeDirectCollectionMapping.getNullPolicy().isNullRepresentedByEmptyNode();
		305	}
		306
		307	}

Lines 19-24 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/factories/EclipseLinkObjectPersistenceRuntimeXMLProject.java (-2 / +22 lines)
19	//EclipseLink imports	19	//EclipseLink imports
20	import org.eclipse.persistence.descriptors.ClassDescriptor;	20	import org.eclipse.persistence.descriptors.ClassDescriptor;
21	import org.eclipse.persistence.internal.helper.NonSynchronizedVector;	21	import org.eclipse.persistence.internal.helper.NonSynchronizedVector;
		22	import org.eclipse.persistence.internal.sessions.factories.ObjectPersistenceRuntimeXMLProject_11_1_1.NullPolicyAttributeAccessor;
		23	import org.eclipse.persistence.mappings.DatabaseMapping;
22	import org.eclipse.persistence.mappings.converters.Converter;	24	import org.eclipse.persistence.mappings.converters.Converter;
23	import org.eclipse.persistence.mappings.converters.EnumTypeConverter;	25	import org.eclipse.persistence.mappings.converters.EnumTypeConverter;
24	import org.eclipse.persistence.mappings.transformers.ConstantTransformer;	26	import org.eclipse.persistence.mappings.transformers.ConstantTransformer;
Lines 28-33 Link Here
28	import org.eclipse.persistence.oxm.mappings.XMLCompositeObjectMapping;	30	import org.eclipse.persistence.oxm.mappings.XMLCompositeObjectMapping;
29	import org.eclipse.persistence.oxm.mappings.XMLDirectMapping;	31	import org.eclipse.persistence.oxm.mappings.XMLDirectMapping;
30	import org.eclipse.persistence.oxm.mappings.converters.XMLListConverter;	32	import org.eclipse.persistence.oxm.mappings.converters.XMLListConverter;
		33	import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
31	import org.eclipse.persistence.oxm.mappings.nullpolicy.NullPolicy;	34	import org.eclipse.persistence.oxm.mappings.nullpolicy.NullPolicy;
32	import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;	35	import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;
33	import org.eclipse.persistence.oxm.schema.XMLSchemaClassPathReference;	36	import org.eclipse.persistence.oxm.schema.XMLSchemaClassPathReference;
Lines 305-309 Link Here
305	//NULL_SQL_TYPE	308	//NULL_SQL_TYPE
306	descriptor.addMapping(colDefMapping);	309	descriptor.addMapping(colDefMapping);
307	return descriptor;	310	return descriptor;
308	}	311	}
309	}	312
		313
		314
		315	@Override
		316	protected ClassDescriptor buildXMLCompositeDirectCollectionMappingDescriptor() {
		317	XMLDescriptor descriptor = (XMLDescriptor) super.buildXMLCompositeDirectCollectionMappingDescriptor();
		318
		319	XMLCompositeObjectMapping aMapping = new XMLCompositeObjectMapping();
		320	aMapping.setReferenceClass(AbstractNullPolicy.class);
		321	aMapping.setAttributeName("nullPolicy");
		322	aMapping.setXPath(getPrimaryNamespaceXPath() + "null-policy");
		323	((DatabaseMapping)aMapping).setAttributeAccessor(new NullPolicyAttributeAccessor());
		324	descriptor.addMapping(aMapping);
		325
		326	return descriptor;
		327	}
		328
		329	}

Lines 25-30 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/oxm/mappings/XMLCompositeDirectCollectionMapping.java (-3 / +16 lines)
25	import org.eclipse.persistence.mappings.converters.TypeConversionConverter;	25	import org.eclipse.persistence.mappings.converters.TypeConversionConverter;
26	import org.eclipse.persistence.mappings.foundation.AbstractCompositeDirectCollectionMapping;	26	import org.eclipse.persistence.mappings.foundation.AbstractCompositeDirectCollectionMapping;
27	import org.eclipse.persistence.oxm.mappings.converters.XMLConverter;	27	import org.eclipse.persistence.oxm.mappings.converters.XMLConverter;
		28	import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
		29	import org.eclipse.persistence.oxm.mappings.nullpolicy.NullPolicy;
28	import org.eclipse.persistence.oxm.record.XMLRecord;	30	import org.eclipse.persistence.oxm.record.XMLRecord;
29	import org.eclipse.persistence.queries.ObjectBuildingQuery;	31	import org.eclipse.persistence.queries.ObjectBuildingQuery;
30		32
Lines 214-225 Link Here
214	*	216	*
215	* @since Oracle TopLink 10<i>g</i> Release 2 (10.1.3)	217	* @since Oracle TopLink 10<i>g</i> Release 2 (10.1.3)
216	*/	218	*/
217	public class XMLCompositeDirectCollectionMapping extends AbstractCompositeDirectCollectionMapping implements XMLMapping {	219	public class XMLCompositeDirectCollectionMapping extends AbstractCompositeDirectCollectionMapping implements XMLMapping, XMLNillableMapping {
218	private boolean isCDATA;	220	private boolean isCDATA;
219	private boolean isWriteOnly;	221	private boolean isWriteOnly;
		222	private AbstractNullPolicy nullPolicy;
220		223
221	public XMLCompositeDirectCollectionMapping() {	224	public XMLCompositeDirectCollectionMapping() {
222	super();	225	super();
		226	this.nullPolicy = new NullPolicy();
		227	this.nullPolicy.setNullRepresentedByEmptyNode(true);
223	}	228	}
224		229
225	/**	230	/**
Lines 383-387 Link Here
383	getAttributeAccessor().setIsReadOnly(this.isReadOnly());	388	getAttributeAccessor().setIsReadOnly(this.isReadOnly());
384	super.preInitialize(session);	389	super.preInitialize(session);
385	}	390	}
386		391
387	}	392	public AbstractNullPolicy getNullPolicy() {
		393	return this.nullPolicy;
		394	}
		395
		396	public void setNullPolicy(AbstractNullPolicy value) {
		397	this.nullPolicy = value;
		398	}
		399
		400	}

Lines 1-2 Link Here

(-)moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttribute.xml (-1 / +3 lines)
1	<?xml version="1.0"?>	1	<?xml version="1.0"?>
2	<employee id="123" task="write code" last-name="Doe"/>	2	<employee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="123" last-name="Doe">
		3	<tasks task="write code"/>
		4	</employee>

Lines 1-6 Link Here

(-)moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElement.xml (-5 / +5 lines)
1	<?xml version="1.0"?>	1	<?xml version="1.0"?>
2	<employee>	2	<employee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3	<id>123</id>	3	<id>123</id>
4	<task>write code</task>	4	<task>write code</task>
5	<last-name>Doe</last-name>	5	<last-name>Doe</last-name>
6	</employee>	6	</employee>




        suite.addTestSuite(DirectCollectionErrorTestCases.class);
        suite.addTest(UnionTestCases.suite());

        // NodeNullPolicy test cases see: TopLinkOXM-Nillable4_blaise.doc
        // see: TopLink_OX_Nillable_TestDesignSpec_v20061026.doc
        // UC2a
        suite.addTestSuite(DirectCollectionOptionalNodeNullPolicyElementTestCases.class);// 6 of 6 pass by default
        // UC2b
        //suite.addTestSuite(DirectCollectionOptionalNodeNullPolicyAttributeTestCases.class);// 6 of 6 pass by default
        // UC3
        // see #5876860: we are turning off failing Nillable tests for collections until the feature is implemented
        //suite.addTestSuite(DirectCollectionNillableNodeNullPolicyTestCases.class);// 3 of 6 pass until implementation set
        // UC4-true
        // see #5876860: we are turning off failing Nillable tests for collections until the feature is implemented
        //suite.addTestSuite(DirectCollectionIsSetNodeNullPolicyTrueTestCases.class);// 3 of 6 pass until implementation set
        // UC4-false - n/a

        suite.addTestSuite(XMLDirectCollectionOfListsTestCases.class);

        return suite;




/*******************************************************************************
 * Copyright (c) 1998, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:


import java.util.Vector;

import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.IsSetNullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;

import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.sessions.Project;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;

public class DirectCollectionIsSetNodeNullPolicyTrueTestCases extends XMLMappingTestCases {
    private final static String XML_RESOURCE = //
    	"org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrue.xml";

    private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrue.xml";

    public DirectCollectionIsSetNodeNullPolicyTrueTestCases(String name) throws Exception {
        super(name);
        setControlDocument(XML_RESOURCE);

        AbstractNullPolicy aNullPolicy = new IsSetNullPolicy();
        // alter unmarshal policy state
        aNullPolicy.setNullRepresentedByXsiNil(true);
        // alter marshal policy state
        aNullPolicy.setMarshalNullRepresentation(XMLNullRepresentationType.XSI_NIL);

        ((IsSetNullPolicy) aNullPolicy).setIsSetMethodName("isSetTasks");

        Project aProject = new DirectCollectionNodeNullPolicyProject(true);
        ClassDescriptor aDescriptor = aProject.getDescriptor(Employee.class);
        XMLCompositeDirectCollectionMapping aMapping = (XMLCompositeDirectCollectionMapping) aDescriptor.getMappingForAttributeName("tasks");
        aMapping.setNullPolicy(aNullPolicy);
        //aMapping.setNullPolicy(aNullPolicy);
        setProject(aProject);
    }

    protected Object getControlObject() {
        Employee anEmployee = new Employee();
        anEmployee.setId(123);
        anEmployee.setFirstName(null);
        Vector aVector = new Vector();
        aVector.add(null);
        aVector.add("write code");
        aVector.add(null);
        anEmployee.setTasks(aVector);
        // (the isSet method is set=true when we set tasks=null or tasks=new Vector()?) 
        //anEmployee.setTasks(null);
        anEmployee.setLastName("Doe");
        return anEmployee;
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.oxm.mappings.directcollection.nillable;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;

public class DirectCollectionMappingNillableTestSuite extends TestCase {
    public static Test suite() {
        TestSuite suite = new TestSuite("DirectCollection Mapping Nillable Test Suite");

        // NodeNullPolicy test cases see: TopLinkOXM-Nillable4_blaise.doc
        // see: TopLink_OX_Nillable_TestDesignSpec_v20061026.doc
        suite.addTestSuite(DirectCollectionOptionalNodeNullPolicyElementTestCases.class);
        suite.addTestSuite(DirectCollectionOptionalNodeNullPolicyAttributeTestCases.class);
        suite.addTestSuite(DirectCollectionNillableNodeNullPolicyTestCases.class);
        suite.addTestSuite(DirectCollectionIsSetNodeNullPolicyTrueTestCases.class);

        return suite;
    }

    public static void main(String[] args) {
        String[] arguments = { "-c", "org.eclipse.persistence.testing.oxm.mappings.directcollection.nillable.DirectCollectionMappingNillableTestSuite" };
        junit.textui.TestRunner.main(arguments);
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:

 ******************************************************************************/
package org.eclipse.persistence.testing.oxm.mappings.directcollection.nillable;


import java.util.Vector;

import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.NullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;

import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.sessions.Project;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;

public class DirectCollectionNillableNodeNullPolicyTestCases extends XMLMappingTestCases {
    private final static String XML_RESOURCE = //
    	"org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableNodeNullPolicy.xml";

    private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableNodeNullPolicy.xml";

    public DirectCollectionNillableNodeNullPolicyTestCases(String name) throws Exception {
        super(name);
        setControlDocument(XML_RESOURCE);

        AbstractNullPolicy aNullPolicy = new NullPolicy();
        // alter unmarshal policy state
        aNullPolicy.setNullRepresentedByEmptyNode(false);
        aNullPolicy.setNullRepresentedByXsiNil(true);
        // alter marshal policy state
        aNullPolicy.setMarshalNullRepresentation(XMLNullRepresentationType.XSI_NIL);//.ABSENT_NODE);

        Project aProject = new DirectCollectionNodeNullPolicyProject(true);
        ClassDescriptor aDescriptor = aProject.getDescriptor(Employee.class);
        XMLCompositeDirectCollectionMapping aMapping = (XMLCompositeDirectCollectionMapping) aDescriptor.getMappingForAttributeName("tasks");
        aMapping.setNullPolicy(aNullPolicy);
        //aMapping.setNullPolicy(aNullPolicy);
        setProject(aProject);
    }

    protected Object getControlObject() {
        Employee anEmployee = new Employee();
        anEmployee.setId(123);
        anEmployee.setFirstName(null);
        Vector aVector = new Vector();
        aVector.add(null);
        aVector.add("write code");
        aVector.add(null);
        anEmployee.setTasks(aVector);
        anEmployee.setLastName("Doe");
        return anEmployee;
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:


import java.util.Vector;

import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.NullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;

import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.sessions.Project;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;

public class DirectCollectionOptionalNodeNullPolicyAttributeTestCases extends XMLMappingTestCases {
    private final static String XML_RESOURCE = //
    	"org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttribute.xml";

    private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttribute.xml";

    public DirectCollectionOptionalNodeNullPolicyAttributeTestCases(String name) throws Exception {
        super(name);
        setControlDocument(XML_RESOURCE);

        AbstractNullPolicy aNullPolicy = new NullPolicy();
        // alter unmarshal policy state
        aNullPolicy.setNullRepresentedByEmptyNode(false);
        aNullPolicy.setNullRepresentedByXsiNil(false);
        // alter marshal policy state
        aNullPolicy.setMarshalNullRepresentation(XMLNullRepresentationType.ABSENT_NODE);

        Project aProject = new DirectCollectionNodeNullPolicyProject(false);
        ClassDescriptor aDescriptor = aProject.getDescriptor(Employee.class);
        XMLCompositeDirectCollectionMapping aMapping = (XMLCompositeDirectCollectionMapping) aDescriptor.getMappingForAttributeName("tasks");
        aMapping.setNullPolicy(aNullPolicy);
        //aMapping.setNullPolicy(aNullPolicy);
        setProject(aProject);
    }

    protected Object getControlObject() {
        Employee anEmployee = new Employee();
        anEmployee.setId(123);
        anEmployee.setFirstName(null);
        Vector aVector = new Vector();
        aVector.add(null);
        aVector.add("write code");
        aVector.add(null);
        anEmployee.setTasks(aVector);
        anEmployee.setLastName("Doe");
        return anEmployee;
    }

    public Object getReadControlObject() {
        Employee anEmployee = new Employee();
        anEmployee.setId(123);
        anEmployee.setFirstName(null);
        Vector aVector = new Vector();
        aVector.add("write code");
        anEmployee.setTasks(aVector);
        anEmployee.setLastName("Doe");
        return anEmployee;
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:


import java.util.Vector;

import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.NullPolicy;
import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;

import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
import org.eclipse.persistence.sessions.Project;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;

public class DirectCollectionOptionalNodeNullPolicyElementTestCases extends XMLMappingTestCases {
    private final static String XML_RESOURCE = //
    	"org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElement.xml";

    private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElement.xml";

    public DirectCollectionOptionalNodeNullPolicyElementTestCases(String name) throws Exception {
        super(name);
        setControlDocument(XML_RESOURCE);

        AbstractNullPolicy aNullPolicy = new NullPolicy();
        // alter unmarshal policy state
        aNullPolicy.setNullRepresentedByEmptyNode(false);
        aNullPolicy.setNullRepresentedByXsiNil(false);
        // alter marshal policy state
        aNullPolicy.setMarshalNullRepresentation(XMLNullRepresentationType.ABSENT_NODE);

        Project aProject = new DirectCollectionNodeNullPolicyProject(true);
        ClassDescriptor aDescriptor = aProject.getDescriptor(Employee.class);
        XMLCompositeDirectCollectionMapping aMapping = (XMLCompositeDirectCollectionMapping) aDescriptor.getMappingForAttributeName("tasks");
        aMapping.setNullPolicy(aNullPolicy);
        //aMapping.setNullPolicy(aNullPolicy);
        setProject(aProject);
    }

    protected Object getControlObject() {
        Employee anEmployee = new Employee();
        anEmployee.setId(123);
        anEmployee.setFirstName(null);
        Vector aVector = new Vector();
        aVector.add(null);
        aVector.add("write code");
        aVector.add(null);
        anEmployee.setTasks(aVector);
        anEmployee.setLastName("Doe");
        return anEmployee;
    }

    public Object getReadControlObject() {
        Employee anEmployee = new Employee();
        anEmployee.setId(123);
        anEmployee.setFirstName(null);
        Vector aVector = new Vector();
        aVector.add("write code");
        anEmployee.setTasks(aVector);
        anEmployee.setLastName("Doe");
        return anEmployee;
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:

import java.util.Vector;

public class Employee {

    public static final int DEFAULT_ID = 123;

    // Factory method
    public static Employee getInstance() {
        return new Employee(DEFAULT_ID, new Vector(), "Doe");
    }
    
    private int id;
    private Vector tasks;
    private String firstName;
    private String lastName;

    //public String getFirstName() {
    //    return firstName;
    //}

    private boolean isSetTasks = false;

    // ==============================================
        // no unset for now
    //    isSetFirstName = true;
    //    this.firstName = firstName;
    //}

    public Employee() {
        super();
        setTasks(new Vector());
        isSetTasks = true;
    }

    public Employee(int id) {
        super();
        //tasks = new Vector();
        //isSetTasks = true;
        this.id = id;
        setTasks(new Vector());
    }

    public Employee(int id, Vector aVector, String lastName) {
        super();
        this.id = id;
        setTasks(aVector);
        //this.firstName = firstName;
        this.lastName = lastName;
    }

    // Factory method
    public static Employee getInstance() {
        return new Employee(DEFAULT_ID, new Vector(), "Doe");
    }

    // ==============================================

    public int getId() {
        return id;
    }

    public void setId(int id) {
        this.id = id;
    }

    public String getFirstName() {
        return firstName;
    }

    public void setFirstName(String firstName) {
        this.firstName = firstName;
    }

    public String getLastName() {
        return lastName;
    }

    public void setLastName(String lastName) {
        this.lastName = lastName;
    }

    public Vector getTasks() {
        return tasks;
    }

    public void setTasks(Vector tasks) {
        this.tasks = tasks;
        isSetTasks = (tasks == null) ? false : true;
    }

    public boolean isSetTasks() {
        return isSetTasks;
    }

    // override default equals
    public boolean equals(Object object) {
        if (!(object instanceof Employee)) {
            return false;
        }
        Employee employeeObject = (Employee) object;
        if (getId() != employeeObject.getId()) {
            return false;
        }
        if ((employeeObject.getLastName() == null) && (getLastName() != null)) {
            return false;
        }
        if ((employeeObject.getFirstName() == null) && (getFirstName() != null)) {
            return false;
        }
        if ((employeeObject.getLastName() != null) && (getLastName() == null)) {
            return false;
        }
        if ((employeeObject.getFirstName() != null) && (getFirstName() == null)) {
        //    return false;
        //}
        //if ((getFirstName() != null) && (employeeObject.getFirstName() != null) && !getFirstName().equals(employeeObject.getFirstName())) {
        //    return false;
        //}
        if ((getLastName() != null) && (employeeObject.getLastName() != null) && // 
        		!getLastName().equals(employeeObject.getLastName())) {
            return false;
        }
        if ((getFirstName() != null) && (employeeObject.getFirstName() != null) && !getFirstName().equals(employeeObject.getFirstName())) {
            return false;
        }
        if ((getLastName() != null) && (employeeObject.getLastName() != null) && !getLastName().equals(employeeObject.getLastName())) {
            return false;
        }
        if ((employeeObject.getTasks() == null) && (getTasks() != null)) {
            return false;
        }
        if ((employeeObject.getTasks() != null) && (getTasks() == null)) {
            return false;
        }
        if ((employeeObject.getTasks() != null) && (getTasks() != null) && (!(employeeObject.getTasks() instanceof Vector) || !(getTasks() instanceof Vector))) {
        		(!(employeeObject.getTasks() instanceof Vector) || !(getTasks() instanceof Vector))) {
            return false;
        }

        if((this.getId() == employeeObject.getId()) && //
                ((this.getTasks()==null && employeeObject.getTasks()==null) || //
                        (this.getTasks().isEmpty() && employeeObject.getTasks().isEmpty()) || //
                        (this.getTasks().containsAll(employeeObject.getTasks()))) && //
                        (this.getTasks().size() == employeeObject.getTasks().size())) {
        	return true;
        }

        // todo handle :
        /*Expected:
        	Employee(123,[null, write code, null],Doe)
        	Actual:
        	Employee(123,[write code],Doe)
        */
        return false;
    }

    // ==============================================
        return id;
    }

    public String toString() {
        return "Employee(" + getId() + "," + firstName + "," + tasks +  "," + lastName + ")";
    }

}
		return tasks;
	}

    public boolean isSetTasks() {
        return isSetTasks;
    }

    public void setId(int id) {
        this.id = id;
    }

    public void setLastName(String lastName) {
        this.lastName = lastName;
    }

	public void setTasks(Vector tasks) {
		this.tasks = tasks;
		isSetTasks = true;
	}

	public String toString() {
        return "Employee(" + getId() + "," + //firstName + "," +
        	tasks +  "," +
        	lastName + ")";
    }
}

Lines 1115-1121 Link Here

(-)moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java (-1 / +4 lines)
1115	((XMLField) mapping.getField()).setSchemaType(XMLConstants.QNAME_QNAME);	1115	((XMLField) mapping.getField()).setSchemaType(XMLConstants.QNAME_QNAME);
1116	}	1116	}
1117		1117
1118		1118	if (property.getActualType() == null \|\| property.getActualType().getRawName().equals("java.lang.String")) {
		1119	mapping.getNullPolicy().setNullRepresentedByEmptyNode(false);
		1120	}
		1121
1119	if(property.isXmlElementType() && property.getGenericType()!=null ){	1122	if(property.isXmlElementType() && property.getGenericType()!=null ){
1120	Class theClass = helper.getClassForJavaClass(property.getGenericType());	1123	Class theClass = helper.getClassForJavaClass(property.getGenericType());
1121	mapping.setAttributeElementClass(theClass);	1124	mapping.setAttributeElementClass(theClass);

Return to bug 283453

Lines 100-119 Link Here

(-)moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/oxm/mappings/directcollection/DirectCollectionMappingTestSuite.java (-14 lines)
100	suite.addTestSuite(DirectCollectionErrorTestCases.class);	100	suite.addTestSuite(DirectCollectionErrorTestCases.class);
101	suite.addTest(UnionTestCases.suite());	101	suite.addTest(UnionTestCases.suite());
102		102
103	// NodeNullPolicy test cases see: TopLinkOXM-Nillable4_blaise.doc
104	// see: TopLink_OX_Nillable_TestDesignSpec_v20061026.doc
105	// UC2a
106	suite.addTestSuite(DirectCollectionOptionalNodeNullPolicyElementTestCases.class);// 6 of 6 pass by default
107	// UC2b
108	//suite.addTestSuite(DirectCollectionOptionalNodeNullPolicyAttributeTestCases.class);// 6 of 6 pass by default
109	// UC3
110	// see #5876860: we are turning off failing Nillable tests for collections until the feature is implemented
111	//suite.addTestSuite(DirectCollectionNillableNodeNullPolicyTestCases.class);// 3 of 6 pass until implementation set
112	// UC4-true
113	// see #5876860: we are turning off failing Nillable tests for collections until the feature is implemented
114	//suite.addTestSuite(DirectCollectionIsSetNodeNullPolicyTrueTestCases.class);// 3 of 6 pass until implementation set
115	// UC4-false - n/a
116
117	suite.addTestSuite(XMLDirectCollectionOfListsTestCases.class);	103	suite.addTestSuite(XMLDirectCollectionOfListsTestCases.class);
118		104
119	return suite;	105	return suite;

Lines 1-10 Link Here

(-)moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrueTestCases.java (-25 / +24 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 1998, 2009 Oracle. All rights reserved.	2	* Copyright (c) 1998, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0	4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5	* which accompanies this distribution.	5	* which accompanies this distribution.
6	* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html	6	* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7	* and the Eclipse Distribution License is available at	7	* and the Eclipse Distribution License is available at
8	* http://www.eclipse.org/org/documents/edl-v10.php.	8	* http://www.eclipse.org/org/documents/edl-v10.php.
9	*	9	*
10	* Contributors:	10	* Contributors:
Lines 14-62 Link Here
14		14
15	import java.util.Vector;	15	import java.util.Vector;
16		16
		17	import org.eclipse.persistence.descriptors.ClassDescriptor;
		18	import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
17	import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;	19	import org.eclipse.persistence.oxm.mappings.nullpolicy.AbstractNullPolicy;
18	import org.eclipse.persistence.oxm.mappings.nullpolicy.IsSetNullPolicy;	20	import org.eclipse.persistence.oxm.mappings.nullpolicy.IsSetNullPolicy;
19	import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;	21	import org.eclipse.persistence.oxm.mappings.nullpolicy.XMLNullRepresentationType;
20
21	import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
22	import org.eclipse.persistence.sessions.Project;	22	import org.eclipse.persistence.sessions.Project;
23	import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;	23	import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
24		24
25	public class DirectCollectionIsSetNodeNullPolicyTrueTestCases extends XMLMappingTestCases {	25	public class DirectCollectionIsSetNodeNullPolicyTrueTestCases extends XMLMappingTestCases {
26	private final static String XML_RESOURCE = //
27	"org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrue.xml";
28		26
		27	private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrue.xml";
		28
29	public DirectCollectionIsSetNodeNullPolicyTrueTestCases(String name) throws Exception {	29	public DirectCollectionIsSetNodeNullPolicyTrueTestCases(String name) throws Exception {
30	super(name);	30	super(name);
31	setControlDocument(XML_RESOURCE);	31	setControlDocument(XML_RESOURCE);
32		32
33	AbstractNullPolicy aNullPolicy = new IsSetNullPolicy();	33	AbstractNullPolicy aNullPolicy = new IsSetNullPolicy();
34	// alter unmarshal policy state	34	// alter unmarshal policy state
35	aNullPolicy.setNullRepresentedByEmptyNode(false);	35	aNullPolicy.setNullRepresentedByXsiNil(true);
36	aNullPolicy.setNullRepresentedByXsiNil(false);	36	// alter marshal policy state
37	// alter marshal policy state	37	aNullPolicy.setMarshalNullRepresentation(XMLNullRepresentationType.XSI_NIL);
38	aNullPolicy.setMarshalNullRepresentation(XMLNullRepresentationType.ABSENT_NODE);	38
39	((IsSetNullPolicy)aNullPolicy).setIsSetMethodName("isSetFirstName");	39	((IsSetNullPolicy) aNullPolicy).setIsSetMethodName("isSetTasks");
		40
40	Project aProject = new DirectCollectionNodeNullPolicyProject(true);	41	Project aProject = new DirectCollectionNodeNullPolicyProject(true);
41	XMLCompositeDirectCollectionMapping aMapping = (XMLCompositeDirectCollectionMapping)aProject.getDescriptor(Employee.class)//	42	ClassDescriptor aDescriptor = aProject.getDescriptor(Employee.class);
42	.getMappingForAttributeName("tasks");	43	XMLCompositeDirectCollectionMapping aMapping = (XMLCompositeDirectCollectionMapping) aDescriptor.getMappingForAttributeName("tasks");
43	// TODO: renable after we implement NullPolicy for this mapping	44	aMapping.setNullPolicy(aNullPolicy);
44	//aMapping.setNullPolicy(aNullPolicy);
45	setProject(aProject);	45	setProject(aProject);
46	}	46	}
47		47
48	protected Object getControlObject() {	48	protected Object getControlObject() {
49	Employee anEmployee = new Employee();	49	Employee anEmployee = new Employee();
50	anEmployee.setId(123);	50	anEmployee.setId(123);
51	//anEmployee.setFirstName(null);	51	anEmployee.setFirstName(null);
52	Vector aVector = new Vector();	52	Vector aVector = new Vector();
53	//aVector.add(null);	53	aVector.add(null);
54	aVector.add("write code");	54	aVector.add("write code");
55	//aVector.add(null);	55	aVector.add(null);
56	anEmployee.setTasks(aVector);	56	anEmployee.setTasks(aVector);
57	// (the isSet method is set=true when we set tasks=null or tasks=new Vector()?)
58	//anEmployee.setTasks(null);
59	anEmployee.setLastName("Doe");	57	anEmployee.setLastName("Doe");
60	return anEmployee;	58	return anEmployee;
61	}	59	}
62	}	60
		61	}