You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/05 11:11:17 UTC
svn commit: r1728625 - in
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common:
builder/BuilderUtil.java builder/StAXOMBuilder.java factory/SAXOMBuilder.java
Author: veithen
Date: Fri Feb 5 10:11:16 2016
New Revision: 1728625
URL: http://svn.apache.org/viewvc?rev=1728625&view=rev
Log:
Remove unused code.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderUtil.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderUtil.java?rev=1728625&r1=1728624&r2=1728625&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderUtil.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderUtil.java Fri Feb 5 10:11:16 2016
@@ -25,7 +25,7 @@ import org.apache.axiom.om.impl.intf.Axi
public class BuilderUtil {
private BuilderUtil() {}
- public static void setNamespace(OMElement element, String namespaceURI, String prefix, boolean namespaceURIInterning) {
+ public static void setNamespace(OMElement element, String namespaceURI, String prefix) {
if (prefix == null) {
prefix = "";
}
@@ -38,9 +38,6 @@ public class BuilderUtil {
OMNamespace namespace = element.findNamespaceURI(prefix);
if (namespace == null && namespaceURI.length() > 0
|| namespace != null && !namespace.getNamespaceURI().equals(namespaceURI)) {
- if (namespaceURIInterning) {
- namespaceURI = namespaceURI.intern();
- }
// This is actually the place where we perform namespace repairing as specified
// in the contract of OMXMLBuilderFactory#createStAXOMBuilder:
namespace = ((AxiomElement)element).addNamespaceDeclaration(namespaceURI, prefix);
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1728625&r1=1728624&r2=1728625&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java Fri Feb 5 10:11:16 2016
@@ -132,12 +132,6 @@ public class StAXOMBuilder implements Bu
*/
private Exception parserException;
- // namespaceURI interning
- // default is false because most XMLStreamReader implementations don't do interning
- // due to performance impacts. Thus a customer should not assume that a namespace
- // on an OMElement is interned.
- private boolean namespaceURIInterning = false;
-
private int lookAheadToken = -1;
private final BuilderHandler handler;
@@ -824,57 +818,15 @@ public class StAXOMBuilder implements Bu
int namespaceCount = parser.getNamespaceCount();
for (int i = 0; i < namespaceCount; i++) {
String prefix = parser.getNamespacePrefix(i);
-
- //if the namespace is not defined already when we write the start tag declare it
- // check whether this is the default namespace and make sure we have not declared that earlier
String namespaceURI = parser.getNamespaceURI(i);
-
- if (namespaceURI == null) {
- // No need to care about interning here; String literals are always interned
- namespaceURI = "";
- } else {
- // NOTE_A:
- // By default most parsers don't intern the namespace.
- // Unfortunately the property to detect interning on the delegate parsers is hard to detect.
- // Woodstox has a proprietary property on the XMLInputFactory.
- // IBM has a proprietary property on the XMLStreamReader.
- // For now only force the interning if requested.
- if (isNamespaceURIInterning()) {
- namespaceURI = namespaceURI.intern();
- }
- }
-
- if (prefix == null) {
- prefix = "";
- }
-
- ((AxiomElement)node).addNamespaceDeclaration(namespaceURI, prefix);
+ ((AxiomElement)node).addNamespaceDeclaration(
+ namespaceURI == null ? "" : namespaceURI,
+ prefix == null ? "" : prefix);
}
-
- // set the own namespace
- String namespaceURI = parser.getNamespaceURI();
- String prefix = parser.getPrefix();
-
- // See NOTE_A above
- BuilderUtil.setNamespace(node, namespaceURI, prefix, isNamespaceURIInterning());
+ BuilderUtil.setNamespace(node, parser.getNamespaceURI(), parser.getPrefix());
}
/**
- * Set namespace uri interning
- * @param b
- */
- public final void setNamespaceURIInterning(boolean b) {
- this.namespaceURIInterning = b;
- }
-
- /**
- * @return if namespace uri interning
- */
- public final boolean isNamespaceURIInterning() {
- return this.namespaceURIInterning;
- }
-
- /**
* Pushes the virtual parser ahead one token.
* If a look ahead token was calculated it is returned.
* @return next token
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java?rev=1728625&r1=1728624&r2=1728625&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java Fri Feb 5 10:11:16 2016
@@ -153,7 +153,7 @@ public class SAXOMBuilder extends OMCont
for (int i = 0; i < namespaceCount; i++) {
element.addNamespaceDeclaration(namespaces[2*i+1], namespaces[2*i]);
}
- BuilderUtil.setNamespace(element, namespaceURI, prefix, false);
+ BuilderUtil.setNamespace(element, namespaceURI, prefix);
handler.target = element;
return element;
}