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/01/31 22:45:40 UTC
svn commit: r1727862 - in
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom:
om/impl/common/ om/impl/common/factory/ om/impl/common/serializer/pull/
om/impl/common/serializer/push/ om/impl/common/serializer/push/sax/
om/impl/mi...
Author: veithen
Date: Sun Jan 31 21:45:39 2016
New Revision: 1727862
URL: http://svn.apache.org/viewvc?rev=1727862&view=rev
Log:
Use generics.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMContentHandler.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/EndDocumentState.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXHelper.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/HeaderIterator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java Sun Jan 31 21:45:39 2016
@@ -45,10 +45,10 @@ public final class LiveNamespaceContext
return ns == null ? null : ns.getPrefix();
}
- protected Iterator doGetPrefixes(String namespaceURI) {
- List prefixes = new ArrayList();
- for (Iterator it = element.getNamespacesInScope(); it.hasNext(); ) {
- OMNamespace ns = (OMNamespace)it.next();
+ protected Iterator<String> doGetPrefixes(String namespaceURI) {
+ List<String> prefixes = new ArrayList<String>();
+ for (Iterator<OMNamespace> it = element.getNamespacesInScope(); it.hasNext(); ) {
+ OMNamespace ns = it.next();
if (ns.getNamespaceURI().equals(namespaceURI)) {
prefixes.add(ns.getPrefix());
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java Sun Jan 31 21:45:39 2016
@@ -30,10 +30,10 @@ import org.apache.axiom.om.OMNamespace;
/**
* Iterator implementation used by {@link OMElement#getNamespacesInScope()}.
*/
-public final class NamespaceIterator implements Iterator {
- private final Set/*<String>*/ seenPrefixes = new HashSet();
+public final class NamespaceIterator implements Iterator<OMNamespace> {
+ private final Set<String> seenPrefixes = new HashSet<String>();
private OMElement element;
- private Iterator declaredNamespaces;
+ private Iterator<OMNamespace> declaredNamespaces;
private boolean hasNextCalled;
private OMNamespace next;
@@ -47,7 +47,7 @@ public final class NamespaceIterator imp
if (declaredNamespaces == null) {
declaredNamespaces = element.getAllDeclaredNamespaces();
} else if (declaredNamespaces.hasNext()) {
- OMNamespace namespace = (OMNamespace)declaredNamespaces.next();
+ OMNamespace namespace = declaredNamespaces.next();
// We only return a namespace declaration if it has not been overridden (i.e. if
// we have not seen another declaration with the same prefix yet) and if the namespace
// URI is not empty. The second part of the condition covers the case of namespace
@@ -74,7 +74,7 @@ public final class NamespaceIterator imp
return next != null;
}
- public Object next() {
+ public OMNamespace next() {
if (hasNext()) {
OMNamespace result = next;
hasNextCalled = false;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMContentHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMContentHandler.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMContentHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMContentHandler.java Sun Jan 31 21:45:39 2016
@@ -65,7 +65,7 @@ public abstract class OMContentHandler i
/**
* Stores the replacement values for entities.
*/
- private Map entities;
+ private Map<String,String> entities;
/**
* Flag indicating that the parser is processing the external subset.
@@ -162,7 +162,7 @@ public abstract class OMContentHandler i
public final void internalEntityDecl(String name, String value) throws SAXException {
if (entities == null) {
- entities = new HashMap();
+ entities = new HashMap<String,String>();
}
entities.put(name, value);
if (!inExternalSubset) {
@@ -354,7 +354,7 @@ public abstract class OMContentHandler i
} else if (name.equals("[dtd]")) {
inExternalSubset = true;
} else if (!expandEntityReferences) {
- createOMEntityReference(target, name, entities == null ? null : (String)entities.get(name));
+ createOMEntityReference(target, name, entities == null ? null : entities.get(name));
inEntityReference = true;
entityReferenceDepth = 1;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java Sun Jan 31 21:45:39 2016
@@ -49,8 +49,8 @@ public class PushOMBuilder extends Abstr
// Seed the namespace context with the namespace context from the parent
OMContainer parent = root.getParent();
if (parent instanceof OMElement) {
- for (Iterator it = ((OMElement)parent).getNamespacesInScope(); it.hasNext(); ) {
- OMNamespace ns = (OMNamespace)it.next();
+ for (Iterator<OMNamespace> it = ((OMElement)parent).getNamespacesInScope(); it.hasNext(); ) {
+ OMNamespace ns = it.next();
setPrefix(ns.getPrefix(), ns.getNamespaceURI());
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java Sun Jan 31 21:45:39 2016
@@ -63,7 +63,7 @@ class DOMNamespaceContext extends Abstra
return null;
}
- protected Iterator doGetPrefixes(String namespaceURI) {
+ protected Iterator<String> doGetPrefixes(String namespaceURI) {
// seenPrefixes tracks all prefixes we have encountered; this is important to
// handle prefixes that are overridden by descendant elements
Set<String> seenPrefixes = new HashSet<String>();
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/EndDocumentState.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/EndDocumentState.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/EndDocumentState.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/EndDocumentState.java Sun Jan 31 21:45:39 2016
@@ -156,7 +156,7 @@ final class EndDocumentState extends Pul
}
NamespaceContext getNamespaceContext() {
- return new MapBasedNamespaceContext(Collections.EMPTY_MAP);
+ return new MapBasedNamespaceContext(Collections.<String,String>emptyMap());
}
String getNamespaceURI(String prefix) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java Sun Jan 31 21:45:39 2016
@@ -855,14 +855,14 @@ final class Navigator extends PullSerial
Map<String,String> nsMap = new LinkedHashMap<String,String>();
while (context != null && !(context instanceof OMDocument)) {
OMElement element = (OMElement) context;
- for (Iterator it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
- addNamespaceToMap((OMNamespace) it.next(), nsMap);
+ for (Iterator<OMNamespace> it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
+ addNamespaceToMap(it.next(), nsMap);
}
if (element.getNamespace() != null) {
addNamespaceToMap(element.getNamespace(), nsMap);
}
- for (Iterator it = element.getAllAttributes(); it.hasNext(); ) {
- OMAttribute attr = (OMAttribute) it.next();
+ for (Iterator<OMAttribute> it = element.getAllAttributes(); it.hasNext(); ) {
+ OMAttribute attr = it.next();
if (attr.getNamespace() != null) {
addNamespaceToMap(attr.getNamespace(), nsMap);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java Sun Jan 31 21:45:39 2016
@@ -90,11 +90,11 @@ public abstract class Serializer {
// Maintain a set of the prefixes we have already seen. This is required to take into
// account that a namespace mapping declared on an element can hide another one declared
// for the same prefix on an ancestor of the element.
- Set/*<String>*/ seenPrefixes = new HashSet();
+ Set<String> seenPrefixes = new HashSet<String>();
OMElement current = element;
while (true) {
- for (Iterator it = current.getAllDeclaredNamespaces(); it.hasNext(); ) {
- ns = (OMNamespace)it.next();
+ for (Iterator<OMNamespace> it = current.getAllDeclaredNamespaces(); it.hasNext(); ) {
+ ns = it.next();
if (seenPrefixes.add(ns.getPrefix())) {
mapNamespace(ns.getPrefix(), ns.getNamespaceURI(), true, false);
}
@@ -106,13 +106,13 @@ public abstract class Serializer {
current = (OMElement)parent;
}
} else {
- for (Iterator it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
- ns = (OMNamespace)it.next();
+ for (Iterator<OMNamespace> it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
+ ns = it.next();
mapNamespace(ns.getPrefix(), ns.getNamespaceURI(), true, false);
}
}
- for (Iterator it = element.getAllAttributes(); it.hasNext(); ) {
- OMAttribute attr = (OMAttribute)it.next();
+ for (Iterator<OMAttribute> it = element.getAllAttributes(); it.hasNext(); ) {
+ OMAttribute attr = it.next();
ns = attr.getNamespace();
if (ns == null) {
processAttribute("", "", attr.getLocalName(), attr.getAttributeType(), attr.getAttributeValue());
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXHelper.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXHelper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXHelper.java Sun Jan 31 21:45:39 2016
@@ -26,7 +26,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
final class SAXHelper {
- private Stack elementNameStack = new Stack();
+ private Stack<String> elementNameStack = new Stack<String>();
private String elementURI;
private String elementLocalName;
private String elementQName;
@@ -66,9 +66,9 @@ final class SAXHelper {
}
void writeEndElement(ContentHandler contentHandler, ScopedNamespaceContext nsContext) throws SAXException {
- String elementQName = (String)elementNameStack.pop();
- String elementLocalName = (String)elementNameStack.pop();
- String elementURI = (String)elementNameStack.pop();
+ String elementQName = elementNameStack.pop();
+ String elementLocalName = elementNameStack.pop();
+ String elementURI = elementNameStack.pop();
contentHandler.endElement(elementURI, elementLocalName, elementQName);
if (nsContext != null) {
for (int i=nsContext.getBindingsCount()-1; i>=nsContext.getFirstBindingInCurrentScope(); i--) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj Sun Jan 31 21:45:39 2016
@@ -165,8 +165,8 @@ public aspect AxiomContainerSupport {
// builder is null. Meaning this is a programatical created element but it has children which are not completed
// Build them all.
if (builder == null && getState() == INCOMPLETE) {
- for (Iterator childrenIterator = this.getChildren(); childrenIterator.hasNext();) {
- OMNode omNode = (OMNode) childrenIterator.next();
+ for (Iterator<OMNode> childrenIterator = getChildren(); childrenIterator.hasNext();) {
+ OMNode omNode = childrenIterator.next();
omNode.build();
}
} else {
@@ -443,9 +443,8 @@ public aspect AxiomContainerSupport {
public final void AxiomContainer.notifyChildComplete() {
if (getState() == INCOMPLETE && getBuilder() == null) {
- Iterator iterator = getChildren();
- while (iterator.hasNext()) {
- OMNode node = (OMNode) iterator.next();
+ for (Iterator<OMNode> iterator = getChildren(); iterator.hasNext(); ) {
+ OMNode node = iterator.next();
if (!node.isComplete()) {
return;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj Sun Jan 31 21:45:39 2016
@@ -26,6 +26,7 @@ import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLStreamReaderConfiguration;
import org.apache.axiom.om.QNameAwareOMDataSource;
@@ -458,8 +459,7 @@ public aspect AxiomSourcedElementSupport
// Remove the entire subtree and replace with
// new datasource. There maybe a more performant way to do this.
OMDataSource oldDS = this.dataSource;
- Iterator it = getChildren();
- while(it.hasNext()) {
+ for (Iterator<OMNode> it = getChildren(); it.hasNext(); ) {
it.next();
it.remove();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/HeaderIterator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/HeaderIterator.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/HeaderIterator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/HeaderIterator.java Sun Jan 31 21:45:39 2016
@@ -25,7 +25,7 @@ import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
/** An Iterator which walks the header list as needed, potentially filtering as we traverse. */
-public class HeaderIterator implements Iterator {
+public class HeaderIterator implements Iterator<SOAPHeaderBlock> {
SOAPHeaderBlock current;
boolean advance = false;
Checker checker;
@@ -76,7 +76,7 @@ public class HeaderIterator implements I
return false;
}
- public Object next() {
+ public SOAPHeaderBlock next() {
SOAPHeaderBlock ret = current;
if (ret != null) {
advance = true;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java?rev=1727862&r1=1727861&r2=1727862&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java Sun Jan 31 21:45:39 2016
@@ -50,7 +50,7 @@ public class SOAP12BuilderHelper extends
private boolean subCodeProcessing = false;
private boolean reasonProcessing = false;
private boolean processingDetailElements = false;
- private Vector detailElementNames;
+ private Vector<String> detailElementNames;
public Class<? extends AxiomElement> handleEvent(XMLStreamReader parser,
OMElement parent,
@@ -214,7 +214,7 @@ public class SOAP12BuilderHelper extends
SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
elementType = AxiomElement.class;
processingDetailElements = true;
- detailElementNames = new Vector();
+ detailElementNames = new Vector<String>();
detailElementNames.add(parser.getLocalName());
} else {