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 16:45:13 UTC
svn commit: r1796508 - in /axis/axis2/java/core/trunk/modules:
adb/src/org/apache/axis2/databinding/typemapping/
adb/src/org/apache/axis2/databinding/utils/
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/...
Author: veithen
Date: Sun May 28 16:45:13 2017
New Revision: 1796508
URL: http://svn.apache.org/viewvc?rev=1796508&view=rev
Log:
Use the correct return type of getChildrenWithName.
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/AddressingIdentityServiceTest.java
axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/om/Metadata.java
axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java
axis/axis2/java/core/trunk/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiServiceGroupBuilder.java
axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointFactory.java
axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointsConfigurationFactory.java
Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Sun May 28 16:45:13 2017
@@ -173,7 +173,7 @@ public class SimpleTypeMapper {
}
public static ArrayList getArrayList(OMElement element, String localName) {
- Iterator childitr = element.getChildrenWithName(new QName(localName));
+ Iterator<OMElement> childitr = element.getChildrenWithName(new QName(localName));
ArrayList list = new ArrayList();
while (childitr.hasNext()) {
Object o = childitr.next();
@@ -183,10 +183,10 @@ public class SimpleTypeMapper {
}
public static HashSet getHashSet(OMElement element, String localName) {
- Iterator childitr = element.getChildrenWithName(new QName(localName));
+ Iterator<OMElement> childitr = element.getChildrenWithName(new QName(localName));
final HashSet list = new HashSet();
while (childitr.hasNext()) {
- OMElement o = (OMElement) childitr.next();
+ OMElement o = childitr.next();
list.add(o.getText());
}
return list;
Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sun May 28 16:45:13 2017
@@ -1710,7 +1710,7 @@ public class BeanUtil {
* Fix for AXIS2-5090. Use siblings with same QName instead of look for
* children because list elements available on same level.
*/
- Iterator parts = omElement.getParent().getChildrenWithName(partName);
+ Iterator<OMElement> parts = omElement.getParent().getChildrenWithName(partName);
return processGenericsElement(parameter, omElement, helper, parts,
objectSupplier, generictype);
}
Modified: axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Sun May 28 16:45:13 2017
@@ -568,7 +568,7 @@ public class AddressingOutHandler extend
if (multipleHeaders) {
if (replaceHeaders) {
QName qname = new QName(addressingNamespace, name, WSA_DEFAULT_PREFIX);
- Iterator iterator = header.getChildrenWithName(qname);
+ Iterator<OMElement> iterator = header.getChildrenWithName(qname);
while (iterator.hasNext()) {
iterator.next();
iterator.remove();
Modified: axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ axis/axis2/java/core/trunk/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Sun May 28 16:45:13 2017
@@ -21,6 +21,7 @@ package org.apache.axis2.handlers.addres
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -303,7 +304,7 @@ public class AddressingOutHandlerTest ex
assertEquals("http://whatever.org", defaultEnvelope.getHeader()
.getFirstChildWithName(Final.QNAME_WSA_TO).getText());
- Iterator iterator =
+ Iterator<OMElement> iterator =
defaultEnvelope.getHeader().getChildrenWithName(Final.QNAME_WSA_RELATES_TO);
int i = 0;
while (iterator.hasNext()) {
@@ -346,7 +347,7 @@ public class AddressingOutHandlerTest ex
assertEquals("http://whatever.org", defaultEnvelope.getHeader()
.getFirstChildWithName(Final.QNAME_WSA_TO).getText());
- Iterator iterator =
+ Iterator<OMElement> iterator =
defaultEnvelope.getHeader().getChildrenWithName(Final.QNAME_WSA_RELATES_TO);
int i = 0;
while (iterator.hasNext()) {
@@ -384,7 +385,7 @@ public class AddressingOutHandlerTest ex
assertEquals("http://oldEPR.org", defaultEnvelope.getHeader()
.getFirstChildWithName(Final.QNAME_WSA_TO).getText());
- Iterator iterator =
+ Iterator<OMElement> iterator =
defaultEnvelope.getHeader().getChildrenWithName(Final.QNAME_WSA_RELATES_TO);
int i = 0;
while (iterator.hasNext()) {
Modified: axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java Sun May 28 16:45:13 2017
@@ -155,7 +155,7 @@ public class CorbaDeployer extends Abstr
throws DeploymentException {
try {
// Processing service level parameters
- Iterator itr = service_element.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = service_element.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, service, service.getParent());
// process service description
@@ -242,9 +242,9 @@ public class CorbaDeployer extends Abstr
ArrayList excludeops = null;
if (excludeOperations != null) {
excludeops = new ArrayList();
- Iterator excludeOp_itr = excludeOperations.getChildrenWithName(new QName(TAG_OPERATION));
+ Iterator<OMElement> excludeOp_itr = excludeOperations.getChildrenWithName(new QName(TAG_OPERATION));
while (excludeOp_itr.hasNext()) {
- OMElement opName = (OMElement) excludeOp_itr.next();
+ OMElement opName = excludeOp_itr.next();
excludeops.add(opName.getText().trim());
}
}
@@ -253,9 +253,9 @@ public class CorbaDeployer extends Abstr
}
// processing service-wide modules which required to engage globally
- Iterator moduleRefs = service_element.getChildrenWithName(new QName(TAG_MODULE));
+ Iterator<OMElement> moduleRefs = service_element.getChildrenWithName(new QName(TAG_MODULE));
while (moduleRefs.hasNext()) {
- OMElement moduleref = (OMElement) moduleRefs.next();
+ OMElement moduleref = moduleRefs.next();
OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE));
String refName = moduleRefAttribute.getAttributeValue();
axisConfig.addGlobalModuleRef(refName);
@@ -287,10 +287,10 @@ public class CorbaDeployer extends Abstr
// processing transports
OMElement transports = service_element.getFirstChildWithName(new QName(TAG_TRANSPORTS));
if (transports != null) {
- Iterator transport_itr = transports.getChildrenWithName(new QName(TAG_TRANSPORT));
+ Iterator<OMElement> transport_itr = transports.getChildrenWithName(new QName(TAG_TRANSPORT));
ArrayList trs = new ArrayList();
while (transport_itr.hasNext()) {
- OMElement trsEle = (OMElement) transport_itr.next();
+ OMElement trsEle = transport_itr.next();
String tarnsportName = trsEle.getText().trim();
trs.add(tarnsportName);
}
@@ -333,9 +333,9 @@ public class CorbaDeployer extends Abstr
protected HashMap processMessageReceivers(ClassLoader loader, OMElement element) throws DeploymentException {
HashMap meps = new HashMap();
- Iterator iterator = element.getChildrenWithName(new QName(TAG_MESSAGE_RECEIVER));
+ Iterator<OMElement> iterator = element.getChildrenWithName(new QName(TAG_MESSAGE_RECEIVER));
while (iterator.hasNext()) {
- OMElement receiverElement = (OMElement) iterator.next();
+ OMElement receiverElement = iterator.next();
OMAttribute receiverName = receiverElement.getAttribute(new QName(TAG_CLASS_NAME));
String className = receiverName.getAttributeValue();
MessageReceiver receiver = loadMessageReceiver(loader, className);
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java Sun May 28 16:45:13 2017
@@ -740,9 +740,9 @@ class XMLSpineImpl implements XMLSpine {
return null;
}
QName qName = new QName(namespace, localPart);
- Iterator it = om.getChildrenWithName(qName);
+ Iterator<OMElement> it = om.getChildrenWithName(qName);
if (it != null && it.hasNext()) {
- return (OMElement)it.next();
+ return it.next();
}
return null;
}
Modified: axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java Sun May 28 16:45:13 2017
@@ -35,8 +35,8 @@ public final class JSONUtil {
Object value = service.getParameterValue("xmlToJsonNamespaceMap");
if (value != null) {
if (value instanceof OMElement && ((OMElement)value).getLocalName().equals("mappings")) {
- for (Iterator it = ((OMElement)value).getChildrenWithName(new QName("mapping")); it.hasNext(); ) {
- OMElement mapping = (OMElement)it.next();
+ for (Iterator<OMElement> it = ((OMElement)value).getChildrenWithName(new QName("mapping")); it.hasNext(); ) {
+ OMElement mapping = it.next();
ns2jnsMap.put(mapping.getAttributeValue(new QName("xmlNamespace")),
mapping.getAttributeValue(new QName("jsonNamespace")));
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java Sun May 28 16:45:13 2017
@@ -119,11 +119,11 @@ public class AxisDataLocatorImpl impleme
* caching ServiceData for Axis2 Data Locators
*/
private void cachingServiceData(OMElement e) {
- Iterator i = e.getChildrenWithName(new QName(
+ Iterator<OMElement> i = e.getChildrenWithName(new QName(
DRConstants.SERVICE_DATA.DATA));
String saveKey = "";
while (i.hasNext()) {
- ServiceData data = new ServiceData((OMElement) i.next());
+ ServiceData data = new ServiceData(i.next());
saveKey = data.getDialect();
String identifier = data.getIdentifier();
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Sun May 28 16:45:13 2017
@@ -95,7 +95,7 @@ public class AxisConfigBuilder extends D
}
// processing Parameters
// Processing service level parameters
- Iterator itr = config_element.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = config_element.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, axisConfig, axisConfig);
@@ -111,19 +111,19 @@ public class AxisConfigBuilder extends D
}
}
// Process Module refs
- Iterator moduleitr =
+ Iterator<OMElement> moduleitr =
config_element.getChildrenWithName(new QName(DeploymentConstants.TAG_MODULE));
processModuleRefs(moduleitr, axisConfig);
// Processing Transport Senders
- Iterator trs_senders =
+ Iterator<OMElement> trs_senders =
config_element.getChildrenWithName(new QName(TAG_TRANSPORT_SENDER));
processTransportSenders(trs_senders);
// Processing Transport Receivers
- Iterator trs_Reivers =
+ Iterator<OMElement> trs_Reivers =
config_element.getChildrenWithName(new QName(TAG_TRANSPORT_RECEIVER));
processTransportReceivers(trs_Reivers);
@@ -139,22 +139,22 @@ public class AxisConfigBuilder extends D
processThreadContextMigrators(axisConfig, threadContextMigrators);
// Process Observers
- Iterator obs_ittr = config_element.getChildrenWithName(new QName(TAG_LISTENER));
+ Iterator<OMElement> obs_ittr = config_element.getChildrenWithName(new QName(TAG_LISTENER));
processObservers(obs_ittr);
// Processing Phase orders
- Iterator phaseorders = config_element.getChildrenWithName(new QName(TAG_PHASE_ORDER));
+ Iterator<OMElement> phaseorders = config_element.getChildrenWithName(new QName(TAG_PHASE_ORDER));
processPhaseOrders(phaseorders);
- Iterator moduleConfigs =
+ Iterator<OMElement> moduleConfigs =
config_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processModuleConfig(moduleConfigs, axisConfig, axisConfig);
// processing <wsp:Policy> .. </..> elements
- Iterator policyElements = PolicyUtil.getPolicyChildren(config_element);
+ Iterator<OMElement> policyElements = PolicyUtil.getPolicyChildren(config_element);
if (policyElements != null && policyElements.hasNext()) {
processPolicyElements(policyElements,
@@ -162,7 +162,7 @@ public class AxisConfigBuilder extends D
}
// processing <wsp:PolicyReference> .. </..> elements
- Iterator policyRefElements = PolicyUtil.getPolicyRefChildren(config_element);
+ Iterator<OMElement> policyRefElements = PolicyUtil.getPolicyRefChildren(config_element);
if (policyRefElements != null && policyRefElements.hasNext()) {
processPolicyRefElements(policyElements,
@@ -187,7 +187,7 @@ public class AxisConfigBuilder extends D
OMElement transactionElement = config_element.getFirstChildWithName(new QName(TAG_TRANSACTION));
if (transactionElement != null) {
ParameterInclude transactionParameters = new ParameterIncludeImpl();
- Iterator parameters = transactionElement.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> parameters = transactionElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, transactionParameters, null);
TransactionConfiguration txcfg = null;
@@ -270,7 +270,7 @@ public class AxisConfigBuilder extends D
}
}
//Processing deployers.
- Iterator deployerItr = config_element.getChildrenWithName(new QName(DEPLOYER));
+ Iterator<OMElement> deployerItr = config_element.getChildrenWithName(new QName(DEPLOYER));
if (deployerItr != null) {
processDeployers(deployerItr);
}
@@ -290,9 +290,9 @@ public class AxisConfigBuilder extends D
private void processTargetResolvers(AxisConfiguration axisConfig, OMElement targetResolvers) {
if (targetResolvers != null) {
- Iterator iterator = targetResolvers.getChildrenWithName(new QName(TAG_TARGET_RESOLVER));
+ Iterator<OMElement> iterator = targetResolvers.getChildrenWithName(new QName(TAG_TARGET_RESOLVER));
while (iterator.hasNext()) {
- OMElement targetResolver = (OMElement) iterator.next();
+ OMElement targetResolver = iterator.next();
OMAttribute classNameAttribute =
targetResolver.getAttribute(new QName(TAG_CLASS_NAME));
String className = classNameAttribute.getAttributeValue();
@@ -313,9 +313,9 @@ public class AxisConfigBuilder extends D
private void processThreadContextMigrators(AxisConfiguration axisConfig, OMElement targetResolvers) {
if (targetResolvers != null) {
- Iterator iterator = targetResolvers.getChildrenWithName(new QName(TAG_THREAD_CONTEXT_MIGRATOR));
+ Iterator<OMElement> iterator = targetResolvers.getChildrenWithName(new QName(TAG_THREAD_CONTEXT_MIGRATOR));
while (iterator.hasNext()) {
- OMElement threadContextMigrator = (OMElement) iterator.next();
+ OMElement threadContextMigrator = iterator.next();
OMAttribute listIdAttribute =
threadContextMigrator.getAttribute(new QName(TAG_LIST_ID));
String listId = listIdAttribute.getAttributeValue();
@@ -358,9 +358,9 @@ public class AxisConfigBuilder extends D
if (soaproleconfigElement != null) {
final boolean isUltimateReceiever = JavaUtils.isTrue(soaproleconfigElement.getAttributeValue(new QName(Constants.SOAP_ROLE_IS_ULTIMATE_RECEIVER_ATTRIBUTE)), true);
ArrayList roles = new ArrayList();
- Iterator iterator = soaproleconfigElement.getChildrenWithName(new QName(Constants.SOAP_ROLE_ELEMENT));
+ Iterator<OMElement> iterator = soaproleconfigElement.getChildrenWithName(new QName(Constants.SOAP_ROLE_ELEMENT));
while (iterator.hasNext()) {
- OMElement roleElement = (OMElement) iterator.next();
+ OMElement roleElement = iterator.next();
roles.add(roleElement.getText());
}
final List unmodifiableRoles = Collections.unmodifiableList(roles);
@@ -421,9 +421,9 @@ public class AxisConfigBuilder extends D
deployer.setDirectory(directory);
deployer.setExtension(extension);
- for (Iterator<?> itr = element.getChildrenWithName(new QName(
+ for (Iterator<OMElement> itr = element.getChildrenWithName(new QName(
TAG_SERVICE_BUILDER_EXTENSION)); itr.hasNext();) {
- OMElement serviceBuilderEle = (OMElement) itr.next();
+ OMElement serviceBuilderEle = itr.next();
String serviceBuilderClass = serviceBuilderEle.getAttributeValue(new QName(
TAG_CLASS_NAME));
String serviceBuilderName = serviceBuilderEle.getAttributeValue(new QName(
@@ -476,7 +476,7 @@ public class AxisConfigBuilder extends D
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
new ModuleConfiguration(module, parent);
- Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
config.addModuleConfig(moduleConfiguration);
@@ -527,7 +527,7 @@ public class AxisConfigBuilder extends D
observer = (AxisObserver) observerclass.newInstance();
// processing Parameters
// Processing service level parameters
- Iterator itr = observerelement.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = observerelement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, observer, axisConfig);
// initialization
try {
@@ -546,10 +546,10 @@ public class AxisConfigBuilder extends D
private ArrayList processPhaseList(OMElement phaseOrders) throws DeploymentException {
ArrayList phaselist = new ArrayList();
- Iterator phases = phaseOrders.getChildrenWithName(new QName(TAG_PHASE));
+ Iterator<OMElement> phases = phaseOrders.getChildrenWithName(new QName(TAG_PHASE));
while (phases.hasNext()) {
- OMElement phaseelement = (OMElement) phases.next();
+ OMElement phaseelement = phases.next();
String phaseName =
phaseelement.getAttribute(new QName(ATTRIBUTE_NAME)).getAttributeValue();
String phaseClass = phaseelement.getAttributeValue(new QName(TAG_CLASS_NAME));
@@ -564,10 +564,10 @@ public class AxisConfigBuilder extends D
phase.setName(phaseName);
- Iterator handlers = phaseelement.getChildrenWithName(new QName(TAG_HANDLER));
+ Iterator<OMElement> handlers = phaseelement.getChildrenWithName(new QName(TAG_HANDLER));
while (handlers.hasNext()) {
- OMElement omElement = (OMElement) handlers.next();
+ OMElement omElement = handlers.next();
HandlerDescription handler = processHandler(omElement, axisConfig, phaseName);
handler.getRules().setPhaseName(phaseName);
@@ -616,9 +616,9 @@ public class AxisConfigBuilder extends D
private void processDefaultModuleVersions(OMElement defaultVersions)
throws DeploymentException {
- Iterator moduleVersions = defaultVersions.getChildrenWithName(new QName(TAG_MODULE));
+ Iterator<OMElement> moduleVersions = defaultVersions.getChildrenWithName(new QName(TAG_MODULE));
while (moduleVersions.hasNext()) {
- OMElement omElement = (OMElement) moduleVersions.next();
+ OMElement omElement = moduleVersions.next();
String name = omElement.getAttributeValue(new QName(ATTRIBUTE_NAME));
if (name == null) {
throw new DeploymentException(Messages.getMessage("modulenamecannotbenull"));
@@ -670,7 +670,7 @@ public class AxisConfigBuilder extends D
}
}
try {
- Iterator itr = transport.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = transport.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, transportIN, axisConfig);
// adding to axis2 config
axisConfig.addTransportIn(transportIN);
@@ -717,7 +717,7 @@ public class AxisConfigBuilder extends D
// process Parameters
// processing Parameters
// Processing service level parameters
- Iterator itr = transport.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = transport.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, transportout, axisConfig);
// adding to axis2 config
@@ -760,11 +760,11 @@ public class AxisConfigBuilder extends D
axisConfig.addDataLocatorClassNames(DRConstants.GLOBAL_LEVEL,
className);
}
- Iterator iterator = dataLocatorElement.getChildrenWithName(new QName(
+ Iterator<OMElement> iterator = dataLocatorElement.getChildrenWithName(new QName(
DRConstants.DIALECT_LOCATOR_ELEMENT));
while (iterator.hasNext()) {
- OMElement locatorElement = (OMElement) iterator.next();
+ OMElement locatorElement = iterator.next();
OMAttribute dialect = locatorElement.getAttribute(new QName(
DRConstants.DIALECT_ATTRIBUTE));
OMAttribute dialectclass = locatorElement.getAttribute(new QName(
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java Sun May 28 16:45:13 2017
@@ -130,9 +130,9 @@ public class ClusterBuilder extends Desc
return;
}
- for (Iterator iter = lbEle.getChildrenWithName(new QName("applicationDomain"));
+ for (Iterator<OMElement> iter = lbEle.getChildrenWithName(new QName("applicationDomain"));
iter.hasNext();) {
- OMElement omElement = (OMElement) iter.next();
+ OMElement omElement = iter.next();
String domainName = omElement.getAttributeValue(new QName("name")).trim();
String handlerClass = omElement.getAttributeValue(new QName("agent")).trim();
String descAttrib = omElement.getAttributeValue(new QName("description"));
@@ -265,9 +265,9 @@ public class ClusterBuilder extends Desc
replicationEle.getFirstChildWithName(new QName(TAG_DEFAULTS));
if (defaultsEle != null) {
List<String> defaults = new ArrayList<String>();
- for (Iterator iter = defaultsEle.getChildrenWithName(new QName(TAG_EXCLUDE));
+ for (Iterator<OMElement> iter = defaultsEle.getChildrenWithName(new QName(TAG_EXCLUDE));
iter.hasNext();) {
- OMElement excludeEle = (OMElement) iter.next();
+ OMElement excludeEle = iter.next();
OMAttribute nameAtt = excludeEle.getAttribute(new QName(ATTRIBUTE_NAME));
defaults.add(nameAtt.getAttributeValue());
}
@@ -275,15 +275,15 @@ public class ClusterBuilder extends Desc
}
// Process specifics
- for (Iterator iter = replicationEle.getChildrenWithName(new QName(TAG_CONTEXT));
+ for (Iterator<OMElement> iter = replicationEle.getChildrenWithName(new QName(TAG_CONTEXT));
iter.hasNext();) {
- OMElement contextEle = (OMElement) iter.next();
+ OMElement contextEle = iter.next();
String ctxClassName =
contextEle.getAttribute(new QName(ATTRIBUTE_CLASS)).getAttributeValue();
List<String> excludes = new ArrayList<String>();
- for (Iterator iter2 = contextEle.getChildrenWithName(new QName(TAG_EXCLUDE));
+ for (Iterator<OMElement> iter2 = contextEle.getChildrenWithName(new QName(TAG_EXCLUDE));
iter2.hasNext();) {
- OMElement excludeEle = (OMElement) iter2.next();
+ OMElement excludeEle = iter2.next();
OMAttribute nameAtt = excludeEle.getAttribute(new QName(ATTRIBUTE_NAME));
excludes.add(nameAtt.getAttributeValue());
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Sun May 28 16:45:13 2017
@@ -131,10 +131,10 @@ public class DescriptionBuilder implemen
protected HashMap<String,MessageReceiver> processMessageReceivers(OMElement messageReceivers)
throws DeploymentException {
HashMap<String,MessageReceiver> mr_mep = new HashMap<String,MessageReceiver>();
- Iterator msgReceivers = messageReceivers.getChildrenWithName(new QName(
+ Iterator<OMElement> msgReceivers = messageReceivers.getChildrenWithName(new QName(
TAG_MESSAGE_RECEIVER));
while (msgReceivers.hasNext()) {
- OMElement msgReceiver = (OMElement) msgReceivers.next();
+ OMElement msgReceiver = msgReceivers.next();
final OMElement tempMsgReceiver = msgReceiver;
MessageReceiver receiver = null;
try {
@@ -164,10 +164,10 @@ public class DescriptionBuilder implemen
protected HashMap<String,MessageReceiver> processMessageReceivers(ClassLoader loader,
OMElement element) throws DeploymentException {
HashMap<String,MessageReceiver> meps = new HashMap<String,MessageReceiver>();
- Iterator iterator = element.getChildrenWithName(new QName(
+ Iterator<OMElement> iterator = element.getChildrenWithName(new QName(
TAG_MESSAGE_RECEIVER));
while (iterator.hasNext()) {
- OMElement receiverElement = (OMElement) iterator.next();
+ OMElement receiverElement = iterator.next();
MessageReceiver receiver = loadMessageReceiver(loader,
receiverElement);
OMAttribute mepAtt = receiverElement
@@ -216,10 +216,10 @@ public class DescriptionBuilder implemen
protected HashMap processMessageBuilders(OMElement messageBuildersElement)
throws DeploymentException {
HashMap builderSelector = new HashMap();
- Iterator msgBuilders = messageBuildersElement
+ Iterator<OMElement> msgBuilders = messageBuildersElement
.getChildrenWithName(new QName(TAG_MESSAGE_BUILDER));
while (msgBuilders.hasNext()) {
- OMElement msgBuilderElement = (OMElement) msgBuilders.next();
+ OMElement msgBuilderElement = msgBuilders.next();
OMAttribute builderName = msgBuilderElement.getAttribute(new QName(TAG_CLASS_NAME));
String className = builderName.getAttributeValue();
Class builderClass = null;
@@ -254,10 +254,10 @@ public class DescriptionBuilder implemen
protected HashMap processMessageFormatters(OMElement messageFormattersElement)
throws DeploymentException {
HashMap messageFormatters = new HashMap();
- Iterator msgFormatters = messageFormattersElement
+ Iterator<OMElement> msgFormatters = messageFormattersElement
.getChildrenWithName(new QName(TAG_MESSAGE_FORMATTER));
while (msgFormatters.hasNext()) {
- OMElement msgFormatterElement = (OMElement) msgFormatters.next();
+ OMElement msgFormatterElement = msgFormatters.next();
OMElement tempMsgFormatter = msgFormatterElement;
OMAttribute formatterName = tempMsgFormatter.getAttribute(new QName(TAG_CLASS_NAME));
String className = formatterName.getAttributeValue();
@@ -327,11 +327,11 @@ public class DescriptionBuilder implemen
return flow;
}
- Iterator handlers = flowelement.getChildrenWithName(new QName(
+ Iterator<OMElement> handlers = flowelement.getChildrenWithName(new QName(
TAG_HANDLER));
while (handlers.hasNext()) {
- OMElement handlerElement = (OMElement) handlers.next();
+ OMElement handlerElement = handlers.next();
flow.addHandler(processHandler(handlerElement, parent));
}
@@ -459,7 +459,7 @@ public class DescriptionBuilder implemen
}
}
- Iterator parameters = handler_element
+ Iterator<OMElement> parameters = handler_element
.getChildrenWithName(new QName(TAG_PARAMETER));
try {
@@ -586,11 +586,11 @@ public class DescriptionBuilder implemen
*/
protected void processActionMappings(OMElement operation,
AxisOperation op_descrip) {
- Iterator mappingIterator = operation.getChildrenWithName(new QName(
+ Iterator<OMElement> mappingIterator = operation.getChildrenWithName(new QName(
Constants.ACTION_MAPPING));
ArrayList mappingList = new ArrayList();
while (mappingIterator.hasNext()) {
- OMElement mappingElement = (OMElement) mappingIterator.next();
+ OMElement mappingElement = mappingIterator.next();
String inputActionString = mappingElement.getText().trim();
if (log.isTraceEnabled()) {
log.trace("Input Action Mapping found: " + inputActionString);
@@ -614,10 +614,10 @@ public class DescriptionBuilder implemen
}
op_descrip.setOutputAction(outputActionString);
}
- Iterator faultActionsIterator = operation
+ Iterator<OMElement> faultActionsIterator = operation
.getChildrenWithName(new QName(Constants.FAULT_ACTION_MAPPING));
while (faultActionsIterator.hasNext()) {
- OMElement faultMappingElement = (OMElement) faultActionsIterator
+ OMElement faultMappingElement = faultActionsIterator
.next();
String faultActionString = faultMappingElement.getText().trim();
String faultActionName = faultMappingElement
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Sun May 28 16:45:13 2017
@@ -105,7 +105,7 @@ public class ModuleBuilder extends Descr
OMAttribute moduleClassAtt = moduleElement.getAttribute(new QName(TAG_CLASS_NAME));
// processing Parameters
// Processing service level parameters
- Iterator<?> itr = moduleElement.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = moduleElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, module, module.getParent());
@@ -222,7 +222,7 @@ public class ModuleBuilder extends Descr
}
// processing Operations
- Iterator<?> op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
+ Iterator<OMElement> op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
List<AxisOperation> operations = processOperations(op_itr);
for (AxisOperation op : operations) {
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Sun May 28 16:45:13 2017
@@ -121,7 +121,7 @@ public class ServiceBuilder extends Desc
}
}
- Iterator itr = service_element.getChildrenWithName(new QName(
+ Iterator<OMElement> itr = service_element.getChildrenWithName(new QName(
TAG_PARAMETER));
processParameters(itr, service, service.getParent());
@@ -240,13 +240,12 @@ public class ServiceBuilder extends Desc
// when this is doing AxisService.getSchemaTargetNamespace will
// be overridden
// This will be <mapping/> with @namespace and @package
- Iterator mappingIterator = schemaElement
+ Iterator<OMElement> mappingIterator = schemaElement
.getChildrenWithName(new QName(MAPPING));
if (mappingIterator != null) {
Map<String,String> pkg2nsMap = new Hashtable<String,String>();
while (mappingIterator.hasNext()) {
- OMElement mappingElement = (OMElement) mappingIterator
- .next();
+ OMElement mappingElement = mappingIterator.next();
OMAttribute namespaceAttribute = mappingElement
.getAttribute(new QName(ATTRIBUTE_NAMESPACE));
OMAttribute packageAttribute = mappingElement
@@ -323,7 +322,7 @@ public class ServiceBuilder extends Desc
}
// processing service-wide modules which required to engage globally
- Iterator moduleRefs = service_element
+ Iterator<OMElement> moduleRefs = service_element
.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs);
@@ -332,11 +331,11 @@ public class ServiceBuilder extends Desc
OMElement transports = service_element
.getFirstChildWithName(new QName(TAG_TRANSPORTS));
if (transports != null) {
- Iterator transport_itr = transports
+ Iterator<OMElement> transport_itr = transports
.getChildrenWithName(new QName(TAG_TRANSPORT));
ArrayList<String> trs = new ArrayList<String>();
while (transport_itr.hasNext()) {
- OMElement trsEle = (OMElement) transport_itr.next();
+ OMElement trsEle = transport_itr.next();
String transportName = trsEle.getText().trim();
if (axisConfig.getTransportIn(transportName) == null) {
log.warn("Service [ " + service.getName()
@@ -357,7 +356,7 @@ public class ServiceBuilder extends Desc
service.setExposedTransports(trs);
}
// processing operations
- Iterator operationsIterator = service_element
+ Iterator<OMElement> operationsIterator = service_element
.getChildrenWithName(new QName(TAG_OPERATION));
ArrayList ops = processOperations(operationsIterator);
@@ -421,7 +420,7 @@ public class ServiceBuilder extends Desc
// Need to call the same logic towice
setDefaultMessageReceivers();
- Iterator moduleConfigs = service_element
+ Iterator<OMElement> moduleConfigs = service_element
.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, service, service);
@@ -490,14 +489,14 @@ public class ServiceBuilder extends Desc
* OMElement for the packageMappingElement
*/
private void processTypeMappings(OMElement packageMappingElement) {
- Iterator elementItr = packageMappingElement
+ Iterator<OMElement> elementItr = packageMappingElement
.getChildrenWithName(new QName(TAG_MAPPING));
TypeTable typeTable = service.getTypeTable();
if (typeTable == null) {
typeTable = new TypeTable();
}
while (elementItr.hasNext()) {
- OMElement mappingElement = (OMElement) elementItr.next();
+ OMElement mappingElement = elementItr.next();
String packageName = mappingElement.getAttributeValue(new QName(
TAG_PACKAGE_NAME));
String qName = mappingElement
@@ -608,10 +607,10 @@ public class ServiceBuilder extends Desc
*/
private ArrayList<String> processExcludeOperations(OMElement excludeOperations) {
ArrayList<String> exOps = new ArrayList<String>();
- Iterator excludeOp_itr = excludeOperations
+ Iterator<OMElement> excludeOp_itr = excludeOperations
.getChildrenWithName(new QName(TAG_OPERATION));
while (excludeOp_itr.hasNext()) {
- OMElement opName = (OMElement) excludeOp_itr.next();
+ OMElement opName = excludeOp_itr.next();
exOps.add(opName.getText().trim());
}
return exOps;
@@ -632,18 +631,18 @@ public class ServiceBuilder extends Desc
AxisMessage message = operation.getMessage(label
.getAttributeValue());
- Iterator parameters = messageElement.getChildrenWithName(new QName(
+ Iterator<OMElement> parameters = messageElement.getChildrenWithName(new QName(
TAG_PARAMETER));
// processing <wsp:Policy> .. </..> elements
- Iterator policyElements = PolicyUtil.getPolicyChildren(messageElement);
+ Iterator<OMElement> policyElements = PolicyUtil.getPolicyChildren(messageElement);
if (policyElements != null) {
processPolicyElements(policyElements, message.getPolicySubject());
}
// processing <wsp:PolicyReference> .. </..> elements
- Iterator policyRefElements = PolicyUtil.getPolicyRefChildren(messageElement);
+ Iterator<OMElement> policyRefElements = PolicyUtil.getPolicyRefChildren(messageElement);
if (policyRefElements != null) {
processPolicyRefElements(policyRefElements, message.getPolicySubject());
@@ -701,7 +700,7 @@ public class ServiceBuilder extends Desc
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration = new ModuleConfiguration(
module, parent);
- Iterator parameters = moduleConfig
+ Iterator<OMElement> parameters = moduleConfig
.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
@@ -807,7 +806,7 @@ public class ServiceBuilder extends Desc
}
// Operation Parameters
- Iterator parameters = operation.getChildrenWithName(new QName(
+ Iterator<OMElement> parameters = operation.getChildrenWithName(new QName(
TAG_PARAMETER));
processParameters(parameters, op_descrip, service);
// To process wsamapping;
@@ -830,13 +829,13 @@ public class ServiceBuilder extends Desc
}
// Process Module Refs
- Iterator modules = operation.getChildrenWithName(new QName(
+ Iterator<OMElement> modules = operation.getChildrenWithName(new QName(
TAG_MODULE));
processOperationModuleRefs(modules, op_descrip);
// processing Messages
- Iterator messages = operation.getChildrenWithName(new QName(
+ Iterator<OMElement> messages = operation.getChildrenWithName(new QName(
TAG_MESSAGE));
processMessages(messages, op_descrip);
@@ -847,7 +846,7 @@ public class ServiceBuilder extends Desc
info.setOperationPhases(op_descrip);
}
- Iterator moduleConfigs = operation.getChildrenWithName(new QName(
+ Iterator<OMElement> moduleConfigs = operation.getChildrenWithName(new QName(
TAG_MODULE_CONFIG));
processOperationModuleConfig(moduleConfigs, op_descrip, op_descrip);
// adding the operation
@@ -871,7 +870,7 @@ public class ServiceBuilder extends Desc
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration = new ModuleConfiguration(
module, parent);
- Iterator parameters = moduleConfig
+ Iterator<OMElement> parameters = moduleConfig
.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
@@ -893,11 +892,11 @@ public class ServiceBuilder extends Desc
service.addDataLocatorClassNames(DRConstants.SERVICE_LEVEL,
className);
}
- Iterator iterator = dataLocatorElement.getChildrenWithName(new QName(
+ Iterator<OMElement> iterator = dataLocatorElement.getChildrenWithName(new QName(
DRConstants.DIALECT_LOCATOR_ELEMENT));
while (iterator.hasNext()) {
- OMElement locatorElement = (OMElement) iterator.next();
+ OMElement locatorElement = iterator.next();
OMAttribute dialect = locatorElement.getAttribute(new QName(
DRConstants.DIALECT_ATTRIBUTE));
OMAttribute dialectclass = locatorElement.getAttribute(new QName(
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Sun May 28 16:45:13 2017
@@ -54,25 +54,25 @@ public class ServiceGroupBuilder extends
try {
// Processing service level parameters
- Iterator itr = serviceElement.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = serviceElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, axisServiceGroup, axisServiceGroup.getParent());
- Iterator moduleConfigs =
+ Iterator<OMElement> moduleConfigs =
serviceElement.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
axisServiceGroup);
// processing service-wide modules which required to engage globally
- Iterator moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
+ Iterator<OMElement> moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs, axisServiceGroup);
- Iterator serviceitr = serviceElement.getChildrenWithName(new QName(TAG_SERVICE));
+ Iterator<OMElement> serviceitr = serviceElement.getChildrenWithName(new QName(TAG_SERVICE));
while (serviceitr.hasNext()) {
- OMElement service = (OMElement) serviceitr.next();
+ OMElement service = serviceitr.next();
OMAttribute serviceNameatt = service.getAttribute(new QName(ATTRIBUTE_NAME));
if (serviceNameatt == null) {
throw new DeploymentException(
@@ -153,7 +153,7 @@ public class ServiceGroupBuilder extends
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
new ModuleConfiguration(module, parent);
- Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
axisService.addModuleConfig(moduleConfiguration);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java Sun May 28 16:45:13 2017
@@ -63,7 +63,7 @@ public class TransportDeployer extends A
element.build();
AxisConfigBuilder builder = new AxisConfigBuilder(axisConfig);
// Processing Transport Receivers
- Iterator trs_Reivers =
+ Iterator<OMElement> trs_Reivers =
element.getChildrenWithName(new QName(DeploymentConstants.TAG_TRANSPORT_RECEIVER));
ArrayList transportReceivers = builder.processTransportReceivers(trs_Reivers);
for (int i = 0; i < transportReceivers.size(); i++) {
@@ -76,7 +76,7 @@ public class TransportDeployer extends A
}
// Processing Transport Senders
- Iterator trs_senders =
+ Iterator<OMElement> trs_senders =
element.getChildrenWithName(new QName(DeploymentConstants.TAG_TRANSPORT_SENDER));
builder.processTransportSenders(trs_senders);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sun May 28 16:45:13 2017
@@ -786,11 +786,11 @@ public class Utils {
if (excludeBeanProperty != null) {
OMElement parameterElement = excludeBeanProperty
.getParameterElement();
- Iterator bneasItr = parameterElement.getChildrenWithName(new QName(
+ Iterator<OMElement> bneasItr = parameterElement.getChildrenWithName(new QName(
"bean"));
ExcludeInfo excludeInfo = new ExcludeInfo();
while (bneasItr.hasNext()) {
- OMElement bean = (OMElement)bneasItr.next();
+ OMElement bean = bneasItr.next();
String clazz = bean.getAttributeValue(new QName(
DeploymentConstants.TAG_CLASS_NAME));
String excludePropertees = bean.getAttributeValue(new QName(
@@ -1172,10 +1172,10 @@ public class Utils {
policyComponents.add(policyRef);
}
- for (Iterator policySubjects = appliesToElem
+ for (Iterator<OMElement> policySubjects = appliesToElem
.getChildrenWithName(new QName("policy-subject")); policySubjects
.hasNext();) {
- OMElement policySubject = (OMElement)policySubjects.next();
+ OMElement policySubject = policySubjects.next();
String identifier = policySubject.getAttributeValue(new QName(
"identifier"));
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java Sun May 28 16:45:13 2017
@@ -1310,10 +1310,10 @@ public class AxisService2WSDL11 implemen
OMElement definitionElement) {
QName bindingName = axisBinding.getName();
QName name = new QName("name");
- for (Iterator iterator = definitionElement
+ for (Iterator<OMElement> iterator = definitionElement
.getChildrenWithName(new QName(wsdl.getNamespaceURI(),
BINDING_LOCAL_NAME)); iterator.hasNext();) {
- OMElement element = (OMElement) iterator.next();
+ OMElement element = iterator.next();
String value = element.getAttributeValue(name);
if (bindingName.getLocalPart().equals(value)) {
return true;
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java Sun May 28 16:45:13 2017
@@ -164,13 +164,13 @@ public class ParameterIncludeImpl
* @throws AxisFault
*/
public void deserializeParameters(OMElement parameters) throws AxisFault {
- Iterator iterator =
+ Iterator<OMElement> iterator =
parameters.getChildrenWithName(new QName(DeploymentConstants.TAG_PARAMETER));
while (iterator.hasNext()) {
// this is to check whether some one has locked the parmeter at the top level
- OMElement parameterElement = (OMElement) iterator.next();
+ OMElement parameterElement = iterator.next();
Parameter parameter = new Parameter();
// setting parameterElement
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/AddressingIdentityServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/AddressingIdentityServiceTest.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/AddressingIdentityServiceTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/AddressingIdentityServiceTest.java Sun May 28 16:45:13 2017
@@ -224,8 +224,8 @@ public class AddressingIdentityServiceTe
private OMElement findPort(OMElement serviceElement, String portName) {
QName portQName = new QName(WSDLConstants.WSDL1_1_NAMESPACE, Java2WSDLConstants.PORT);
- for (@SuppressWarnings("rawtypes")Iterator portIter = serviceElement.getChildrenWithName(portQName); portIter.hasNext(); ) {
- OMElement portElement = (OMElement) portIter.next();
+ for (Iterator<OMElement> portIter = serviceElement.getChildrenWithName(portQName); portIter.hasNext(); ) {
+ OMElement portElement = portIter.next();
if (portName.equals(portElement.getAttributeValue(new QName("", Java2WSDLConstants.ATTRIBUTE_NAME)))) {
return portElement;
}
Modified: axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/om/Metadata.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/om/Metadata.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/om/Metadata.java (original)
+++ axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/om/Metadata.java Sun May 28 16:45:13 2017
@@ -166,13 +166,13 @@ public class Metadata extends MexOM impl
if (aFactory == null) {
aFactory = factory;
}
- Iterator mexSections = mexElement.getChildrenWithName(new QName(namespaceValue, MexConstants.SPEC.METADATA_SECTION));
+ Iterator<OMElement> mexSections = mexElement.getChildrenWithName(new QName(namespaceValue, MexConstants.SPEC.METADATA_SECTION));
if (mexSections == null){
throw new MexOMException("Metadata element does not contain MetadataSection element.");
}
while (mexSections.hasNext()){
- OMElement aSection = (OMElement) mexSections.next();
+ OMElement aSection = mexSections.next();
MetadataSection metadataSection = new MetadataSection(aFactory, namespaceValue);
addMetadatSection(metadataSection.fromOM(aSection));
}
Modified: axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/mex/src/org/apache/axis2/mex/util/MexUtil.java Sun May 28 16:45:13 2017
@@ -241,12 +241,12 @@ public class MexUtil {
return forms;
OMElement mexConfig = mexParm.getParameterElement();
- Iterator ite = mexConfig.getChildrenWithName(new QName(
+ Iterator<OMElement> ite = mexConfig.getChildrenWithName(new QName(
MexConstants.MEX_CONFIG.OUTPUT_FORM_PARM));
String dialectForm_configured = null;
String serviceForm_configured = null;
while (ite.hasNext()) {
- OMElement elem = (OMElement) ite.next();
+ OMElement elem = ite.next();
String form_value = elem.getAttributeValue(new QName(
MexConstants.MEX_CONFIG.FORMS_PARM));
String dialect_value = elem.getAttributeValue(new QName(
Modified: axis/axis2/java/core/trunk/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiServiceGroupBuilder.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiServiceGroupBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiServiceGroupBuilder.java Sun May 28 16:45:13 2017
@@ -60,25 +60,25 @@ public class OSGiServiceGroupBuilder ext
try {
// Processing service level parameters
- Iterator itr = serviceElement.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> itr = serviceElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, axisServiceGroup, axisServiceGroup.getParent());
- Iterator moduleConfigs =
+ Iterator<OMElement> moduleConfigs =
serviceElement.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
axisServiceGroup);
// processing service-wide modules which required to engage globally
- Iterator moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
+ Iterator<OMElement> moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs, axisServiceGroup);
- Iterator serviceitr = serviceElement.getChildrenWithName(new QName(TAG_SERVICE));
+ Iterator<OMElement> serviceitr = serviceElement.getChildrenWithName(new QName(TAG_SERVICE));
while (serviceitr.hasNext()) {
- OMElement service = (OMElement) serviceitr.next();
+ OMElement service = serviceitr.next();
OMAttribute serviceNameatt = service.getAttribute(new QName(ATTRIBUTE_NAME));
if (serviceNameatt == null) {
throw new DeploymentException(
Modified: axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java Sun May 28 16:45:13 2017
@@ -95,12 +95,12 @@ public class PingMessageReceiver extends
if (!serviceLevel && element != null) {
//Operations to be pinged has been specified in the ping request
- Iterator<?> elementIterator = pingRequestElement.getChildrenWithName(new QName(TAG_OPERATION));
+ Iterator<OMElement> elementIterator = pingRequestElement.getChildrenWithName(new QName(TAG_OPERATION));
ArrayList<AxisOperation> operationList = new ArrayList<AxisOperation>();
AxisOperation axisOperation;
while (elementIterator.hasNext()) {
- OMElement opElement = (OMElement) elementIterator.next();
+ OMElement opElement = elementIterator.next();
String operationName = opElement.getText();
axisOperation = inMessage.getAxisService().getOperation(new QName(operationName));
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Sun May 28 16:45:13 2017
@@ -21,6 +21,7 @@ package org.apache.axis2.saaj;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPVersion;
import org.w3c.dom.Document;
@@ -561,7 +562,7 @@ public class SOAPBodyImpl extends SOAPEl
return super.addTextNode(text);
}
- private Iterator getChildren(Iterator childIter) {
+ private Iterator getChildren(Iterator<? extends OMNode> childIter) {
Collection childElements = new ArrayList();
while (childIter.hasNext()) {
org.w3c.dom.Node domNode = (org.w3c.dom.Node)childIter.next();
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Sun May 28 16:45:13 2017
@@ -271,7 +271,7 @@ public class SOAPElementImpl<T extends O
*/
public Iterator getChildElements(Name name) {
QName qName = new QName(name.getURI(), name.getLocalName());
- Iterator childIter = omTarget.getChildrenWithName(qName);
+ Iterator<OMElement> childIter = omTarget.getChildrenWithName(qName);
Collection childElements = new ArrayList();
while (childIter.hasNext()) {
childElements.add(toSAAJNode((org.w3c.dom.Node)childIter.next()));
@@ -420,7 +420,7 @@ public class SOAPElementImpl<T extends O
}
public Iterator getChildElements(QName qname) {
- Iterator childIter = omTarget.getChildrenWithName(qname);
+ Iterator<OMElement> childIter = omTarget.getChildrenWithName(qname);
Collection childElements = new ArrayList();
while (childIter.hasNext()) {
childElements.add(toSAAJNode((org.w3c.dom.Node)childIter.next()));
Modified: axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointFactory.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointFactory.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointFactory.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointFactory.java Sun May 28 16:45:13 2017
@@ -60,10 +60,10 @@ public class URLEndpointFactory {
}
}
- Iterator it = messageBuilders.getChildrenWithName(
+ Iterator<OMElement> it = messageBuilders.getChildrenWithName(
new QName(URLEndpointsConfiguration.MESSAGE_BUILDER));
while(it.hasNext()) {
- OMElement builderElement = (OMElement) it.next();
+ OMElement builderElement = it.next();
OMAttribute contentTypeAttr = builderElement.getAttribute(
new QName(URLEndpointsConfiguration.CONTENT_TYPE));
@@ -90,10 +90,10 @@ public class URLEndpointFactory {
}
}
- Iterator paramItr = xml.getChildrenWithName(
+ Iterator<OMElement> paramItr = xml.getChildrenWithName(
new QName(URLEndpointsConfiguration.PARAMETER));
while (paramItr.hasNext()) {
- OMElement p = (OMElement) paramItr.next();
+ OMElement p = paramItr.next();
OMAttribute paramNameAttr = p.getAttribute(new QName(URLEndpointsConfiguration.NAME));
if (paramNameAttr == null) {
handleException("Parameter " + URLEndpointsConfiguration.NAME + " cannot be null");
Modified: axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointsConfigurationFactory.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointsConfigurationFactory.java?rev=1796508&r1=1796507&r2=1796508&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointsConfigurationFactory.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/endpoint/config/URLEndpointsConfigurationFactory.java Sun May 28 16:45:13 2017
@@ -37,11 +37,11 @@ public class URLEndpointsConfigurationFa
private static final Log log = LogFactory.getLog(URLEndpointsConfigurationFactory.class);
public URLEndpointsConfiguration create(OMElement element) throws AxisFault {
- Iterator iterator = element.getChildrenWithName(new QName(URLEndpointsConfiguration.ENDPOINT));
+ Iterator<OMElement> iterator = element.getChildrenWithName(new QName(URLEndpointsConfiguration.ENDPOINT));
URLEndpointsConfiguration configuration = new URLEndpointsConfiguration();
URLEndpointFactory fac = new URLEndpointFactory();
while (iterator.hasNext()) {
- OMElement endpoint = (OMElement) iterator.next();
+ OMElement endpoint = iterator.next();
URLEndpoint epr = fac.create(endpoint);
configuration.addEndpoint(epr);
@@ -63,11 +63,11 @@ public class URLEndpointsConfigurationFa
OMElement element = OMXMLBuilderFactory.createOMBuilder(is).getDocumentElement();
element.build();
- Iterator iterator = element.getChildrenWithName(new QName(URLEndpointsConfiguration.ENDPOINT));
+ Iterator<OMElement> iterator = element.getChildrenWithName(new QName(URLEndpointsConfiguration.ENDPOINT));
URLEndpointsConfiguration configuration = new URLEndpointsConfiguration();
URLEndpointFactory fac = new URLEndpointFactory();
while (iterator.hasNext()) {
- OMElement endpoint = (OMElement) iterator.next();
+ OMElement endpoint = iterator.next();
URLEndpoint epr = fac.create(endpoint);
configuration.addEndpoint(epr);