Skip to content

Commit 8456a98

Browse files
rfelcmanrfelcman
authored
Bugfix for: Specifying QName in XmlVariableNode results namespace written twice (#1710)
* Bugfix for: Specifying QName in XmlVariableNode results namespace written twice Fix + unit test. Fixes #1709 Signed-off-by: Radek Felcman <[email protected]>
1 parent 9dad717 commit 8456a98

File tree

8 files changed

+270
-5
lines changed

8 files changed

+270
-5
lines changed

‎foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLVariableXPathObjectMapping.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -211,6 +211,11 @@ public XPathFragment getXPathFragmentForValue(Object obj, NamespaceResolver nr,
211211
frag.setPrefix(prefix);
212212
returnString = prefix + namespaceSep + returnString;
213213
}
214+
//In case of JSON marshalling namespace separator there should different like '.', than default in XPathFragment ':'.
215+
//Namespace separator from there should be promoted to XPathFragment to correctly set localName.
216+
if(namespaceSep != 0){
217+
frag.setNamespaceSeparator(namespaceSep);
218+
}
214219
}
215220
frag.setXPath(returnString);
216221
frag.setNamespaceURI(uri);
@@ -229,7 +234,4 @@ public boolean isAttribute() {
229234
public void setAttribute(boolean isAttribute) {
230235
this.isAttribute = isAttribute;
231236
}
232-
233-
234-
235237
}

‎moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/AllVariableElementTestCases.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@ public static Test suite() {
3232
suite.addTestSuite(XmlVariableNodeTestCases.class);
3333
suite.addTestSuite(XmlVariableNodeQNameTestCases.class);
3434
suite.addTestSuite(XmlVariableNodeQNameNSTestCases.class);
35+
suite.addTestSuite(XmlVariableNodeQNameNS2TestCases.class);
3536
suite.addTestSuite(XmlVariableNodeTestCases.class);
3637
suite.addTestSuite(XmlVariableNodeArrayTestCases.class);
3738
suite.addTestSuite(XmlVariableNodeMapTestCases.class);

‎moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/Data.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
13+
// Contributors:
14+
// Oracle - Sep 2022 - - initial implementation
15+
package org.eclipse.persistence.testing.jaxb.xmlvariablenode;
16+
17+
import jakarta.xml.bind.annotation.XmlRootElement;
18+
import org.eclipse.persistence.oxm.annotations.XmlVariableNode;
19+
20+
@XmlRootElement(name = "data", namespace = "uri1:")
21+
public class Data {
22+
23+
public Data() {
24+
}
25+
26+
private DataChild child;
27+
28+
@XmlVariableNode("name")
29+
public DataChild getChild() {
30+
return child;
31+
}
32+
33+
public void setChild(DataChild child) {
34+
this.child = child;
35+
}
36+
37+
@Override
38+
public String toString() {
39+
return "Data{" +
40+
"child=" + child +
41+
'}';
42+
}
43+
44+
@Override
45+
public boolean equals(Object o) {
46+
if (this == o) return true;
47+
if (o == null || getClass() != o.getClass()) return false;
48+
Data data = (Data) o;
49+
return child.equals(data.child);
50+
}
51+
}

‎moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/DataChild.java

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
* Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
13+
// Contributors:
14+
// Oracle - Sep 2022 - - initial implementation
15+
package org.eclipse.persistence.testing.jaxb.xmlvariablenode;
16+
17+
import jakarta.xml.bind.annotation.XmlTransient;
18+
19+
import javax.xml.namespace.QName;
20+
21+
public class DataChild {
22+
23+
public DataChild() {
24+
}
25+
26+
public DataChild(QName name) {
27+
this.name = name;
28+
}
29+
30+
private QName name;
31+
32+
@XmlTransient
33+
public QName getName() {
34+
return name;
35+
}
36+
37+
public void setName(QName name) {
38+
this.name = name;
39+
}
40+
41+
@Override
42+
public String toString() {
43+
return "DataChild{" +
44+
"name=" + name +
45+
'}';
46+
}
47+
48+
@Override
49+
public boolean equals(Object o) {
50+
if (this == o) return true;
51+
if (o == null || getClass() != o.getClass()) return false;
52+
DataChild dataChild = (DataChild) o;
53+
return name.equals(dataChild.name);
54+
}
55+
}

‎moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNS2TestCases.java

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/*
2+
* Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0,
7+
* or the Eclipse Distribution License v. 1.0 which is available at
8+
* http://www.eclipse.org/org/documents/edl-v10.php.
9+
*
10+
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
*/
12+
13+
// Contributors:
14+
// Oracle - Sep 2022 - - initial implementation
15+
package org.eclipse.persistence.testing.jaxb.xmlvariablenode;
16+
17+
import jakarta.xml.bind.Marshaller;
18+
import jakarta.xml.bind.Unmarshaller;
19+
import org.eclipse.persistence.jaxb.JAXBContextProperties;
20+
import org.eclipse.persistence.jaxb.MarshallerProperties;
21+
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
22+
import org.eclipse.persistence.oxm.MediaType;
23+
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
24+
import org.w3c.dom.Document;
25+
26+
import javax.xml.namespace.QName;
27+
import javax.xml.transform.dom.DOMSource;
28+
import java.io.ByteArrayInputStream;
29+
import java.util.HashMap;
30+
import java.util.Map;
31+
32+
/**
33+
* Test for: Specifying QName in XmlVariableNode results namespace written twice
34+
*
35+
* https://github.com/eclipse-ee4j/eclipselink/issues/1709
36+
*/
37+
public class XmlVariableNodeQNameNS2TestCases extends JAXBWithJSONTestCases {
38+
protected final static String XML_RESOURCE = "org/eclipse/persistence/testing/jaxb/xmlvariablenode/rootqname2NS.xml";
39+
protected final static String XML_WRITE_RESOURCE = "org/eclipse/persistence/testing/jaxb/xmlvariablenode/rootqname2NSWrite.xml";
40+
protected final static String JSON_RESOURCE = "org/eclipse/persistence/testing/jaxb/xmlvariablenode/rootqname2NS.json";
41+
42+
private Marshaller marshaller = null;
43+
private Unmarshaller unmarshaller = null;
44+
45+
46+
public XmlVariableNodeQNameNS2TestCases(String name) throws Exception {
47+
super(name);
48+
setControlDocument(XML_RESOURCE);
49+
setControlJSON(JSON_RESOURCE);
50+
setWriteControlDocument(XML_WRITE_RESOURCE);
51+
setClasses(new Class<?>[]{Data.class, DataChild.class});
52+
53+
}
54+
55+
@Override
56+
protected Marshaller getJSONMarshaller() throws Exception{
57+
if (marshaller == null) {
58+
Map<String, String> namespaces = new HashMap<>();
59+
namespaces.put("uri1:", "xxx");
60+
marshaller = jaxbContext.createMarshaller();
61+
marshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON);
62+
marshaller.setProperty(MarshallerProperties.NAMESPACE_PREFIX_MAPPER, namespaces);
63+
}
64+
return marshaller;
65+
}
66+
67+
@Override
68+
protected Unmarshaller getJSONUnmarshaller() throws Exception{
69+
if (unmarshaller == null) {
70+
Map<String, String> namespaces = new HashMap<>();
71+
namespaces.put("uri1:", "xxx");
72+
unmarshaller = jaxbContext.createUnmarshaller();
73+
unmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON);
74+
unmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
75+
}
76+
return unmarshaller;
77+
}
78+
79+
@Override
80+
protected Map getProperties() {
81+
Map overrides = new HashMap();
82+
String overridesString =
83+
"<?xml version='1.0' encoding='UTF-8'?>" +
84+
"<xml-bindings xmlns='http://www.eclipse.org/eclipselink/xsds/persistence/oxm'>" +
85+
"<xml-schema>" +
86+
"<xml-ns namespace-uri='uri1:' prefix='xxx'/>" +
87+
"</xml-schema>" +
88+
"<java-types/>" +
89+
"</xml-bindings>";
90+
91+
DOMSource src = null;
92+
try {
93+
Document doc = parser.parse(new ByteArrayInputStream(overridesString.getBytes()));
94+
src = new DOMSource(doc.getDocumentElement());
95+
} catch (Exception e) {
96+
e.printStackTrace();
97+
fail("An error occurred during setup");
98+
}
99+
100+
overrides.put("org.eclipse.persistence.testing.jaxb.xmlvariablenode", src);
101+
102+
Map props = new HashMap();
103+
props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
104+
return props;
105+
}
106+
107+
@Override
108+
protected Object getControlObject() {
109+
Data data = new Data();
110+
DataChild dataChild = new DataChild(new QName("uri1:", "childdata"));
111+
data.setChild(dataChild);
112+
113+
return data;
114+
}
115+
}

‎moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/xmlvariablenode/rootqname2NS.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"xxx.data": {
3+
"xxx.childdata": {}
4+
}
5+
}

‎moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/xmlvariablenode/rootqname2NS.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
10+
http://www.eclipse.org/org/documents/edl-v10.php.
11+
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
14+
-->
15+
16+
<xxx:data xmlns:xxx="uri1:">
17+
<xxx:childdata/>
18+
</xxx:data>

‎moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/xmlvariablenode/rootqname2NSWrite.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
10+
http://www.eclipse.org/org/documents/edl-v10.php.
11+
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
14+
-->
15+
16+
<xxx:data xmlns:xxx="uri1:">
17+
<xxx:childdata/>
18+
</xxx:data>

0 commit comments

Comments
 (0)