You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ve...@apache.org on 2010/01/23 15:42:25 UTC
svn commit: r902410 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
DescriptionBuilder.java ServiceBuilder.java ServiceDeployer.java
ServiceGroupBuilder.java repository/util/ArchiveReader.java
Author: veithen
Date: Sat Jan 23 14:42:24 2010
New Revision: 902410
URL: http://svn.apache.org/viewvc?rev=902410&view=rev
Log:
Usage of generic collections and Java 5 style loops in ServiceDeployer and related classes.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=902410&r1=902409&r2=902410&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Sat Jan 23 14:42:24 2010
@@ -128,9 +128,9 @@
* services.xml.
*
*/
- protected HashMap processMessageReceivers(OMElement messageReceivers)
+ protected HashMap<String,MessageReceiver> processMessageReceivers(OMElement messageReceivers)
throws DeploymentException {
- HashMap mr_mep = new HashMap();
+ HashMap<String,MessageReceiver> mr_mep = new HashMap<String,MessageReceiver>();
Iterator msgReceivers = messageReceivers.getChildrenWithName(new QName(
TAG_MESSAGE_RECEIVER));
while (msgReceivers.hasNext()) {
@@ -138,9 +138,9 @@
final OMElement tempMsgReceiver = msgReceiver;
MessageReceiver receiver = null;
try {
- receiver = (MessageReceiver) org.apache.axis2.java.security.AccessController
- .doPrivileged(new PrivilegedExceptionAction() {
- public Object run()
+ receiver = org.apache.axis2.java.security.AccessController
+ .doPrivileged(new PrivilegedExceptionAction<MessageReceiver>() {
+ public MessageReceiver run()
throws org.apache.axis2.deployment.DeploymentException {
return loadMessageReceiver(
Thread.currentThread().getContextClassLoader(),
@@ -161,9 +161,9 @@
* services.xml.
*
*/
- protected HashMap processMessageReceivers(ClassLoader loader,
+ protected HashMap<String,MessageReceiver> processMessageReceivers(ClassLoader loader,
OMElement element) throws DeploymentException {
- HashMap meps = new HashMap();
+ HashMap<String,MessageReceiver> meps = new HashMap<String,MessageReceiver>();
Iterator iterator = element.getChildrenWithName(new QName(
TAG_MESSAGE_RECEIVER));
while (iterator.hasNext()) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=902410&r1=902409&r2=902410&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Sat Jan 23 14:42:24 2010
@@ -42,8 +42,6 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -58,7 +56,7 @@
public class ServiceBuilder extends DescriptionBuilder {
private static final Log log = LogFactory.getLog(ServiceBuilder.class);
private AxisService service;
- private HashMap wsdlServiceMap = new HashMap();
+ private HashMap<String,AxisService> wsdlServiceMap = new HashMap<String,AxisService>();
public ServiceBuilder(ConfigurationContext configCtx, AxisService service) {
this.service = service;
@@ -103,7 +101,7 @@
// then use that as the service name
if (serviceNameatt != null) {
if (!"".equals(serviceNameatt.getAttributeValue().trim())) {
- AxisService wsdlService = (AxisService) wsdlServiceMap
+ AxisService wsdlService = wsdlServiceMap
.get(serviceNameatt.getAttributeValue());
if (wsdlService != null) {
wsdlService.setClassLoader(service.getClassLoader());
@@ -240,7 +238,7 @@
Iterator mappingIterator = schemaElement
.getChildrenWithName(new QName(MAPPING));
if (mappingIterator != null) {
- Map pkg2nsMap = new Hashtable();
+ Map<String,String> pkg2nsMap = new Hashtable<String,String>();
while (mappingIterator.hasNext()) {
OMElement mappingElement = (OMElement) mappingIterator
.next();
@@ -277,25 +275,22 @@
OMElement messageReceiver = service_element
.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVERS));
if (messageReceiver != null) {
- HashMap mrs = processMessageReceivers(service.getClassLoader(),
+ HashMap<String,MessageReceiver> mrs = processMessageReceivers(service.getClassLoader(),
messageReceiver);
- Iterator keys = mrs.keySet().iterator();
- while (keys.hasNext()) {
- String key = (String) keys.next();
- service.addMessageReceiver(key, (MessageReceiver) mrs
- .get(key));
+ for (Map.Entry<String,MessageReceiver> entry : mrs.entrySet()) {
+ service.addMessageReceiver(entry.getKey(), entry.getValue());
}
}
// Removing exclude operations
OMElement excludeOperations = service_element
.getFirstChildWithName(new QName(TAG_EXCLUDE_OPERATIONS));
- ArrayList excludeops = null;
+ ArrayList<String> excludeops = null;
if (excludeOperations != null) {
excludeops = processExcludeOperations(excludeOperations);
}
if (excludeops == null) {
- excludeops = new ArrayList();
+ excludeops = new ArrayList<String>();
}
Utils.addExcludeMethods(excludeops);
@@ -337,7 +332,7 @@
if (transports != null) {
Iterator transport_itr = transports
.getChildrenWithName(new QName(TAG_TRANSPORT));
- ArrayList trs = new ArrayList();
+ ArrayList<String> trs = new ArrayList<String>();
while (transport_itr.hasNext()) {
OMElement trsEle = (OMElement) transport_itr.next();
String transportName = trsEle.getText().trim();
@@ -409,8 +404,7 @@
}
}
- for (int i = 0; i < excludeops.size(); i++) {
- String opName = (String) excludeops.get(i);
+ for (String opName : excludeops) {
service.removeOperation(new QName(opName));
}
@@ -566,12 +560,12 @@
* operations TODO: Why not just return the AxisOperations
* themselves??
*/
- private ArrayList getNonRPCMethods(AxisService axisService) {
- ArrayList excludeOperations = new ArrayList();
- Iterator operatins = axisService.getOperations();
+ private ArrayList<String> getNonRPCMethods(AxisService axisService) {
+ ArrayList<String> excludeOperations = new ArrayList<String>();
+ Iterator<AxisOperation> operatins = axisService.getOperations();
if (operatins.hasNext()) {
while (operatins.hasNext()) {
- AxisOperation axisOperation = (AxisOperation) operatins.next();
+ AxisOperation axisOperation = operatins.next();
if (axisOperation.getMessageReceiver() == null) {
continue;
}
@@ -601,8 +595,8 @@
* @return an ArrayList of the String contents of the <operation>
* elements
*/
- private ArrayList processExcludeOperations(OMElement excludeOperations) {
- ArrayList exOps = new ArrayList();
+ private ArrayList<String> processExcludeOperations(OMElement excludeOperations) {
+ ArrayList<String> exOps = new ArrayList<String>();
Iterator excludeOp_itr = excludeOperations
.getChildrenWithName(new QName(TAG_OPERATION));
while (excludeOp_itr.hasNext()) {
@@ -708,9 +702,9 @@
}
}
- private ArrayList processOperations(Iterator operationsIterator)
+ private ArrayList<AxisOperation> processOperations(Iterator operationsIterator)
throws AxisFault {
- ArrayList operations = new ArrayList();
+ ArrayList<AxisOperation> operations = new ArrayList<AxisOperation>();
while (operationsIterator.hasNext()) {
OMElement operation = (OMElement) operationsIterator.next();
// getting operation name
@@ -910,7 +904,7 @@
}
- public void setWsdlServiceMap(HashMap wsdlServiceMap) {
+ public void setWsdlServiceMap(HashMap<String,AxisService> wsdlServiceMap) {
this.wsdlServiceMap = wsdlServiceMap;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=902410&r1=902409&r2=902410&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Sat Jan 23 14:42:24 2010
@@ -66,21 +66,19 @@
axisConfig.getServiceClassLoader(),
(File)axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
axisConfig.isChildFirstClassLoading());
- HashMap wsdlservice = archiveReader.processWSDLs(deploymentFileData);
+ HashMap<String,AxisService> wsdlservice = archiveReader.processWSDLs(deploymentFileData);
if (wsdlservice != null && wsdlservice.size() > 0) {
- Iterator services = wsdlservice.values().iterator();
- while (services.hasNext()) {
- AxisService service = (AxisService) services.next();
- Iterator operations = service.getOperations();
+ for (AxisService service : wsdlservice.values()) {
+ Iterator<AxisOperation> operations = service.getOperations();
while (operations.hasNext()) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
+ AxisOperation axisOperation = operations.next();
axisConfig.getPhasesInfo().setOperationPhases(axisOperation);
}
}
}
AxisServiceGroup serviceGroup = new AxisServiceGroup(axisConfig);
serviceGroup.setServiceGroupClassLoader(deploymentFileData.getClassLoader());
- ArrayList serviceList = archiveReader.processServiceGroup(
+ ArrayList<AxisService> serviceList = archiveReader.processServiceGroup(
deploymentFileData.getAbsolutePath(), deploymentFileData,
serviceGroup, isDirectory, wsdlservice,
configCtx);
@@ -93,8 +91,7 @@
if (!"".equals(serviceHierarchy)) {
serviceGroup.setServiceGroupName(serviceHierarchy
+ serviceGroup.getServiceGroupName());
- for (Object o : serviceList) {
- AxisService axisService = (AxisService) o;
+ for (AxisService axisService : serviceList) {
axisService.setName(serviceHierarchy + axisService.getName());
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=902410&r1=902409&r2=902410&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Sat Jan 23 14:42:24 2010
@@ -37,9 +37,9 @@
public class ServiceGroupBuilder extends DescriptionBuilder {
private OMElement serviceElement;
- private HashMap wsdlServices;
+ private HashMap<String,AxisService> wsdlServices;
- public ServiceGroupBuilder(OMElement service, HashMap wsdlServices,
+ public ServiceGroupBuilder(OMElement service, HashMap<String,AxisService> wsdlServices,
ConfigurationContext configCtx) {
this.serviceElement = service;
this.wsdlServices = wsdlServices;
@@ -49,7 +49,7 @@
public ArrayList<AxisService> populateServiceGroup(AxisServiceGroup axisServiceGroup)
throws DeploymentException {
- ArrayList serviceList = new ArrayList();
+ ArrayList<AxisService> serviceList = new ArrayList<AxisService>();
try {
@@ -84,7 +84,7 @@
throw new DeploymentException(
Messages.getMessage(DeploymentErrorMsgs.SERVICE_NAME_ERROR));
} else {
- AxisService axisService = (AxisService) wsdlServices.get(serviceName);
+ AxisService axisService = wsdlServices.get(serviceName);
if (axisService == null) {
axisService = new AxisService(serviceName);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=902410&r1=902409&r2=902410&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Sat Jan 23 14:42:24 2010
@@ -80,10 +80,10 @@
AxisService axisService = null;
String serviceName = DescriptionBuilder.getShortFileName(currentFile.getName());
if (serviceName != null) {
- axisService = (AxisService) wsdlServices.get(serviceName);
+ axisService = wsdlServices.get(serviceName);
}
if (axisService == null) {
- axisService = (AxisService) wsdlServices.get(
+ axisService = wsdlServices.get(
DescriptionBuilder.getShortFileName(currentFile.getName()));
}
if (axisService == null) {
@@ -358,8 +358,7 @@
out.toByteArray()),
entry.getName());
if (services != null) {
- for (int i = 0; i < services.size(); i++) {
- AxisService axisService = (AxisService) services.get(i);
+ for (AxisService axisService : services) {
if (axisService != null) {
servicesMap.put(axisService.getName(), axisService);
}
@@ -469,8 +468,7 @@
in2, file1.toURI().toString());
if (services != null) {
- for (int j = 0; j < services.size(); j++) {
- AxisService axisService = (AxisService) services.get(j);
+ for (AxisService axisService : services) {
if (axisService != null) {
servicesMap.put(axisService.getName(), axisService);
}