You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/01/07 17:29:38 UTC
svn commit: r1896816 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl: soap/SOAPElement.java store/DetailXobj.java store/DomImpl.java store/Saaj.java store/SoapElementXobj.java store/SoapPartDom.java
Author: fanningpj
Date: Fri Jan 7 17:29:38 2022
New Revision: 1896816
URL: http://svn.apache.org/viewvc?rev=1896816&view=rev
Log:
use more generics internally
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saaj.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java?rev=1896816&r1=1896815&r2=1896816&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java Fri Jan 7 17:29:38 2022
@@ -174,7 +174,7 @@ public interface SOAPElement extends Nod
* value of each attribute.
* @return an iterator over the names of the attributes
*/
- public abstract Iterator getAllAttributes();
+ public abstract Iterator<Name> getAllAttributes();
/**
* Returns the URI of the namespace that has the given
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java?rev=1896816&r1=1896815&r2=1896816&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java Fri Jan 7 17:29:38 2022
@@ -35,7 +35,7 @@ class DetailXobj extends SoapFaultElemen
return DomImpl.detail_addDetailEntry(this, name);
}
- public Iterator getDetailEntries() {
+ public Iterator<DetailEntry> getDetailEntries() {
return DomImpl.detail_getDetailEntries(this);
}
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java?rev=1896816&r1=1896815&r2=1896816&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java Fri Jan 7 17:29:38 2022
@@ -3260,17 +3260,17 @@ public final class DomImpl {
return syncWrap(d, p -> p.locale()._saaj.soapElement_removeNamespaceDeclaration(se, prefix));
}
- public static Iterator _soapElement_getAllAttributes(Dom d) {
+ public static Iterator<Name> _soapElement_getAllAttributes(Dom d) {
SOAPElement se = (SOAPElement) d;
return syncWrap(d, p -> p.locale()._saaj.soapElement_getAllAttributes(se));
}
- public static Iterator _soapElement_getChildElements(Dom d) {
+ public static Iterator<SOAPElement> _soapElement_getChildElements(Dom d) {
SOAPElement se = (SOAPElement) d;
return syncWrap(d, p -> p.locale()._saaj.soapElement_getChildElements(se));
}
- public static Iterator _soapElement_getNamespacePrefixes(Dom d) {
+ public static Iterator<String> _soapElement_getNamespacePrefixes(Dom d) {
SOAPElement se = (SOAPElement) d;
return syncWrap(d, p -> p.locale()._saaj.soapElement_getNamespacePrefixes(se));
}
@@ -3320,7 +3320,7 @@ public final class DomImpl {
return syncWrap(d, p -> p.locale()._saaj.soapElement_getAttributeValue(se, name));
}
- public static Iterator _soapElement_getChildElements(Dom d, Name name) {
+ public static Iterator<SOAPElement> _soapElement_getChildElements(Dom d, Name name) {
SOAPElement se = (SOAPElement) d;
return syncWrap(d, p -> p.locale()._saaj.soapElement_getChildElements(se, name));
}
@@ -3335,7 +3335,7 @@ public final class DomImpl {
return syncWrap(d, p -> p.locale()._saaj.soapElement_getNamespaceURI(se, prefix));
}
- public static Iterator _soapElement_getVisibleNamespacePrefixes(Dom d) {
+ public static Iterator<String> _soapElement_getVisibleNamespacePrefixes(Dom d) {
SOAPElement se = (SOAPElement) d;
return syncWrap(d, p -> p.locale()._saaj.soapElement_getVisibleNamespacePrefixes(se));
}
@@ -3555,7 +3555,7 @@ public final class DomImpl {
return syncWrap(d, p -> p.locale()._saaj.detail_addDetailEntry(detail, name));
}
- public static Iterator detail_getDetailEntries(Dom d) {
+ public static Iterator<DetailEntry> detail_getDetailEntries(Dom d) {
Detail detail = (Detail) d;
return syncWrap(d, p -> p.locale()._saaj.detail_getDetailEntries(detail));
}
@@ -3609,12 +3609,12 @@ public final class DomImpl {
syncWrapVoid(d, p -> p.locale()._saaj.soapPart_setMimeHeader(sp, name, value));
}
- public static Iterator _soapPart_getMatchingMimeHeaders(Dom d, String[] names) {
+ public static Iterator<MimeHeader> _soapPart_getMatchingMimeHeaders(Dom d, String[] names) {
SOAPPart sp = (SOAPPart) d;
return syncWrap(d, p -> p.locale()._saaj.soapPart_getMatchingMimeHeaders(sp, names));
}
- public static Iterator _soapPart_getNonMatchingMimeHeaders(Dom d, String[] names) {
+ public static Iterator<MimeHeader> _soapPart_getNonMatchingMimeHeaders(Dom d, String[] names) {
SOAPPart sp = (SOAPPart) d;
return syncWrap(d, p -> p.locale()._saaj.soapPart_getNonMatchingMimeHeaders(sp, names));
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saaj.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saaj.java?rev=1896816&r1=1896815&r2=1896816&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saaj.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saaj.java Fri Jan 7 17:29:38 2022
@@ -15,32 +15,27 @@
package org.apache.xmlbeans.impl.store;
-import javax.xml.namespace.QName;
-
-import java.util.Iterator;
-import java.util.Locale;
-
-
-import javax.xml.transform.Source;
-
import org.apache.xmlbeans.impl.soap.Detail;
import org.apache.xmlbeans.impl.soap.DetailEntry;
-import org.apache.xmlbeans.impl.soap.MimeHeaders;
+import org.apache.xmlbeans.impl.soap.MimeHeader;
import org.apache.xmlbeans.impl.soap.Name;
import org.apache.xmlbeans.impl.soap.SOAPBody;
import org.apache.xmlbeans.impl.soap.SOAPBodyElement;
import org.apache.xmlbeans.impl.soap.SOAPElement;
import org.apache.xmlbeans.impl.soap.SOAPEnvelope;
import org.apache.xmlbeans.impl.soap.SOAPException;
-import org.apache.xmlbeans.impl.soap.SOAPFactory;
import org.apache.xmlbeans.impl.soap.SOAPFault;
import org.apache.xmlbeans.impl.soap.SOAPHeader;
import org.apache.xmlbeans.impl.soap.SOAPHeaderElement;
import org.apache.xmlbeans.impl.soap.SOAPPart;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
+import org.w3c.dom.Node;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import java.util.Iterator;
+import java.util.Locale;
public interface Saaj
{
@@ -70,9 +65,9 @@ public interface Saaj
String soapElement_getEncodingStyle ( SOAPElement soapElement );
void soapElement_setEncodingStyle ( SOAPElement soapElement, String encodingStyle );
boolean soapElement_removeNamespaceDeclaration ( SOAPElement soapElement, String prefix );
- Iterator soapElement_getAllAttributes ( SOAPElement soapElement );
- Iterator soapElement_getChildElements ( SOAPElement parent );
- Iterator soapElement_getNamespacePrefixes ( SOAPElement soapElement );
+ Iterator<Name> soapElement_getAllAttributes ( SOAPElement soapElement );
+ Iterator<SOAPElement> soapElement_getChildElements ( SOAPElement parent );
+ Iterator<String> soapElement_getNamespacePrefixes ( SOAPElement soapElement );
SOAPElement soapElement_addAttribute ( SOAPElement soapElement, Name name, String value ) throws SOAPException;
SOAPElement soapElement_addChildElement ( SOAPElement parent, SOAPElement oldChild ) throws SOAPException;
SOAPElement soapElement_addChildElement ( SOAPElement soapElement, Name name ) throws SOAPException;
@@ -104,15 +99,15 @@ public interface Saaj
void soapPart_removeAllMimeHeaders ( SOAPPart soapPart );
void soapPart_removeMimeHeader ( SOAPPart soapPart, String name );
- Iterator soapPart_getAllMimeHeaders ( SOAPPart soapPart );
+ Iterator<MimeHeader> soapPart_getAllMimeHeaders (SOAPPart soapPart );
SOAPEnvelope soapPart_getEnvelope ( SOAPPart soapPart );
Source soapPart_getContent ( SOAPPart soapPart );
void soapPart_setContent ( SOAPPart soapPart, Source source );
String[] soapPart_getMimeHeader ( SOAPPart soapPart, String name );
void soapPart_addMimeHeader ( SOAPPart soapPart, String name, String value );
void soapPart_setMimeHeader ( SOAPPart soapPart, String name, String value );
- Iterator soapPart_getMatchingMimeHeaders ( SOAPPart soapPart, String[] names );
- Iterator soapPart_getNonMatchingMimeHeaders ( SOAPPart soapPart, String[] names );
+ Iterator<MimeHeader> soapPart_getMatchingMimeHeaders ( SOAPPart soapPart, String[] names );
+ Iterator<MimeHeader> soapPart_getNonMatchingMimeHeaders ( SOAPPart soapPart, String[] names );
boolean soapBody_hasFault ( SOAPBody soapBody );
SOAPFault soapBody_addFault ( SOAPBody soapBody ) throws SOAPException;
@@ -143,5 +138,5 @@ public interface Saaj
boolean soapText_isComment ( org.apache.xmlbeans.impl.soap.Text text );
DetailEntry detail_addDetailEntry ( Detail detail, Name name );
- Iterator detail_getDetailEntries ( Detail detail );
+ Iterator<DetailEntry> detail_getDetailEntries ( Detail detail );
}
\ No newline at end of file
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java?rev=1896816&r1=1896815&r2=1896816&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java Fri Jan 7 17:29:38 2022
@@ -71,15 +71,15 @@ class SoapElementXobj extends ElementXob
return DomImpl._soapElement_removeNamespaceDeclaration(this, prefix);
}
- public Iterator getAllAttributes() {
+ public Iterator<Name> getAllAttributes() {
return DomImpl._soapElement_getAllAttributes(this);
}
- public Iterator getChildElements() {
+ public Iterator<SOAPElement> getChildElements() {
return DomImpl._soapElement_getChildElements(this);
}
- public Iterator getNamespacePrefixes() {
+ public Iterator<String> getNamespacePrefixes() {
return DomImpl._soapElement_getNamespacePrefixes(this);
}
@@ -119,7 +119,7 @@ class SoapElementXobj extends ElementXob
return DomImpl._soapElement_getAttributeValue(this, name);
}
- public Iterator getChildElements(Name name) {
+ public Iterator<SOAPElement> getChildElements(Name name) {
return DomImpl._soapElement_getChildElements(this, name);
}
@@ -131,7 +131,7 @@ class SoapElementXobj extends ElementXob
return DomImpl._soapElement_getNamespaceURI(this, prefix);
}
- public Iterator getVisibleNamespacePrefixes() {
+ public Iterator<String> getVisibleNamespacePrefixes() {
return DomImpl._soapElement_getVisibleNamespacePrefixes(this);
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java?rev=1896816&r1=1896815&r2=1896816&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java Fri Jan 7 17:29:38 2022
@@ -15,6 +15,7 @@
package org.apache.xmlbeans.impl.store;
+import org.apache.xmlbeans.impl.soap.MimeHeader;
import org.apache.xmlbeans.impl.soap.SOAPEnvelope;
import org.apache.xmlbeans.impl.soap.SOAPPart;
import org.w3c.dom.*;
@@ -350,7 +351,7 @@ class SoapPartDom extends SOAPPart imple
DomImpl._soapPart_removeMimeHeader(this, name);
}
- public Iterator getAllMimeHeaders() {
+ public Iterator<MimeHeader> getAllMimeHeaders() {
return DomImpl._soapPart_getAllMimeHeaders(this);
}
@@ -378,11 +379,11 @@ class SoapPartDom extends SOAPPart imple
DomImpl._soapPart_setMimeHeader(this, name, value);
}
- public Iterator getMatchingMimeHeaders(String[] names) {
+ public Iterator<MimeHeader> getMatchingMimeHeaders(String[] names) {
return DomImpl._soapPart_getMatchingMimeHeaders(this, names);
}
- public Iterator getNonMatchingMimeHeaders(String[] names) {
+ public Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names) {
return DomImpl._soapPart_getNonMatchingMimeHeaders(this, names);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org