You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/05/28 17:36:42 UTC
svn commit: r1796512 - in /axis/axis2/java/rampart/trunk/modules:
rampart-core/src/main/java/org/apache/rampart/util/
rampart-trust/src/main/java/org/apache/rahas/
rampart-trust/src/main/java/org/apache/rahas/impl/
rampart-trust/src/test/java/org/apach...
Author: veithen
Date: Sun May 28 17:36:42 2017
New Revision: 1796512
URL: http://svn.apache.org/viewvc?rev=1796512&view=rev
Log:
Use the proper way to iterate over children with a given name.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcherConfig.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1796512&r1=1796511&r2=1796512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java Sun May 28 17:36:42 2017
@@ -151,9 +151,9 @@ public class Axis2Util {
for (Iterator iter = processedHeaderQNames.iterator(); iter
.hasNext();) {
QName name = (QName) iter.next();
- Iterator omKids = header.getChildrenWithName(name);
+ Iterator<SOAPHeaderBlock> omKids = header.getHeaderBlocksWithName(name);
if(omKids.hasNext()) {
- ((SOAPHeaderBlock)omKids.next()).setProcessed();
+ omKids.next().setProcessed();
}
}
@@ -264,9 +264,9 @@ public class Axis2Util {
for (Iterator iter = processedHeaderQNames.iterator(); iter
.hasNext();) {
QName name = (QName) iter.next();
- Iterator omKids = header.getChildrenWithName(name);
+ Iterator<SOAPHeaderBlock> omKids = header.getHeaderBlocksWithName(name);
if(omKids.hasNext()) {
- ((SOAPHeaderBlock)omKids.next()).setProcessed();
+ omKids.next().setProcessed();
}
}
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcherConfig.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcherConfig.java?rev=1796512&r1=1796511&r2=1796512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcherConfig.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcherConfig.java Sun May 28 17:36:42 2017
@@ -101,10 +101,10 @@ public class TokenRequestDispatcherConfi
private static void handleIssuers(OMElement configElem,
TokenRequestDispatcherConfig conf) throws TrustException {
- for (Iterator issuerElems = configElem.getChildrenWithName(ISSUER);
+ for (Iterator<OMElement> issuerElems = configElem.getChildrenWithName(ISSUER);
issuerElems.hasNext();) {
- OMElement element = (OMElement) issuerElems.next();
+ OMElement element = issuerElems.next();
//get the class attr
String issuerClass = element.getAttributeValue(CLASS_ATTR);
@@ -124,9 +124,9 @@ public class TokenRequestDispatcherConfi
processConfiguration(element, conf, issuerClass);
//Process token types
- for (Iterator tokenTypes = element.getChildrenWithName(TOKEN_TYPE);
+ for (Iterator<OMElement> tokenTypes = element.getChildrenWithName(TOKEN_TYPE);
tokenTypes.hasNext();) {
- OMElement type = (OMElement) tokenTypes.next();
+ OMElement type = tokenTypes.next();
String value = type.getText();
if (value == null || value.trim().length() == 0) {
throw new TrustException("invalidTokenTypeDefinition",
@@ -147,10 +147,10 @@ public class TokenRequestDispatcherConfi
private static void handleValidators(OMElement configElem,
TokenRequestDispatcherConfig conf) throws TrustException {
- for (Iterator validatorElems = configElem.getChildrenWithName(VALIDATOR);
+ for (Iterator<OMElement> validatorElems = configElem.getChildrenWithName(VALIDATOR);
validatorElems.hasNext();) {
- OMElement element = (OMElement) validatorElems.next();
+ OMElement element = validatorElems.next();
//get the class attr
String validatorClass = element.getAttributeValue(CLASS_ATTR);
@@ -170,9 +170,9 @@ public class TokenRequestDispatcherConfi
processConfiguration(element, conf, validatorClass);
//Process token types
- for (Iterator tokenTypes = element.getChildrenWithName(TOKEN_TYPE);
+ for (Iterator<OMElement> tokenTypes = element.getChildrenWithName(TOKEN_TYPE);
tokenTypes.hasNext();) {
- OMElement type = (OMElement) tokenTypes.next();
+ OMElement type = tokenTypes.next();
String value = type.getText();
if (value == null || value.trim().length() == 0) {
throw new TrustException("invalidTokenTypeDefinition",
@@ -193,10 +193,10 @@ public class TokenRequestDispatcherConfi
private static void handleRenewers(OMElement configElem,
TokenRequestDispatcherConfig conf) throws TrustException {
- for (Iterator renewerElems = configElem.getChildrenWithName(RENEWER);
+ for (Iterator<OMElement> renewerElems = configElem.getChildrenWithName(RENEWER);
renewerElems.hasNext();) {
- OMElement element = (OMElement) renewerElems.next();
+ OMElement element = renewerElems.next();
//get the class attr
String renewerClass = element.getAttributeValue(CLASS_ATTR);
@@ -216,9 +216,9 @@ public class TokenRequestDispatcherConfi
processConfiguration(element, conf, renewerClass);
//Process token types
- for (Iterator tokenTypes = element.getChildrenWithName(TOKEN_TYPE);
+ for (Iterator<OMElement> tokenTypes = element.getChildrenWithName(TOKEN_TYPE);
tokenTypes.hasNext();) {
- OMElement type = (OMElement) tokenTypes.next();
+ OMElement type = tokenTypes.next();
String value = type.getText();
if (value == null || value.trim().length() == 0) {
throw new TrustException("invalidTokenTypeDefinition",
@@ -240,9 +240,9 @@ public class TokenRequestDispatcherConfi
TokenRequestDispatcherConfig conf,
String implClass) {
- for (Iterator configs = element.getChildrenWithName(CONFIGURATION_ELEMENT);
+ for (Iterator<OMElement> configs = element.getChildrenWithName(CONFIGURATION_ELEMENT);
configs.hasNext();) {
- OMElement configEle = (OMElement) configs.next();
+ OMElement configEle = configs.next();
String configType =
configEle.getAttribute(new QName("type")).getAttributeValue().trim();
if (configType.equalsIgnoreCase("file")) { //Process configuration file information
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?rev=1796512&r1=1796511&r2=1796512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java Sun May 28 17:36:42 2017
@@ -235,9 +235,9 @@ public class SAMLTokenIssuerConfig exten
*/
if (trustedServices != null) {
//Now process the trusted services
- Iterator servicesIter = trustedServices.getChildrenWithName(SERVICE);
+ Iterator<OMElement> servicesIter = trustedServices.getChildrenWithName(SERVICE);
while (servicesIter.hasNext()) {
- OMElement service = (OMElement) servicesIter.next();
+ OMElement service = servicesIter.next();
OMAttribute aliasAttr = service.getAttribute(ALIAS);
if (aliasAttr == null) {
//The certificate alias is a must
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java?rev=1796512&r1=1796511&r2=1796512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/java/org/apache/rahas/test/util/TestUtil.java Sun May 28 17:36:42 2017
@@ -311,9 +311,9 @@ public class TestUtil {
for (Iterator iter = processedHeaderQNames.iterator(); iter
.hasNext();) {
QName name = (QName) iter.next();
- Iterator omKids = header.getChildrenWithName(name);
+ Iterator<SOAPHeaderBlock> omKids = header.getHeaderBlocksWithName(name);
if(omKids.hasNext()) {
- ((SOAPHeaderBlock)omKids.next()).setProcessed();
+ omKids.next().setProcessed();
}
}
@@ -417,9 +417,9 @@ public class TestUtil {
for (Iterator iter = processedHeaderQNames.iterator(); iter
.hasNext();) {
QName name = (QName) iter.next();
- Iterator omKids = header.getChildrenWithName(name);
+ Iterator<SOAPHeaderBlock> omKids = header.getHeaderBlocksWithName(name);
if(omKids.hasNext()) {
- ((SOAPHeaderBlock)omKids.next()).setProcessed();
+ omKids.next().setProcessed();
}
}