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 da...@apache.org on 2008/12/08 23:01:37 UTC
svn commit: r724507 [2/3] - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/engine/
kernel/src/org/apache/axis2/addressing/i18n/
kernel/src/org/apache/axis2/context/
kernel/src/org/apache/axis2/context/externalize/ kernel/sr...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Mon Dec 8 14:01:35 2008
@@ -19,6 +19,14 @@
package org.apache.axis2.description;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.OperationClient;
@@ -36,13 +44,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Set;
-
public abstract class AxisOperation extends AxisDescription
implements WSDLConstants {
@@ -63,18 +64,18 @@
private MessageReceiver messageReceiver;
- private HashMap moduleConfigmap;
+ private HashMap<String, ModuleConfiguration> moduleConfigmap;
// To store deploy-time module refs
- private ArrayList modulerefs;
+ private ArrayList<String> modulerefs;
- private ArrayList faultMessages;
+ private ArrayList<AxisMessage> faultMessages;
private QName name;
- private ArrayList wsamappingList;
+ private ArrayList<String> wsamappingList;
private String outputAction;
- private LinkedHashMap faultActions = new LinkedHashMap();
+ private LinkedHashMap<String, String> faultActions = new LinkedHashMap<String, String>();
private String soapAction;
@@ -82,9 +83,9 @@
/** Default constructor */
public AxisOperation() {
mepURI = WSDL2Constants.MEP_URI_IN_OUT;
- modulerefs = new ArrayList();
- moduleConfigmap = new HashMap();
- faultMessages = new ArrayList();
+ modulerefs = new ArrayList<String>();
+ moduleConfigmap = new HashMap<String, ModuleConfiguration>();
+ faultMessages = new ArrayList<AxisMessage>();
//setup a temporary name
QName tmpName = new QName(this.getClass().getName() + "_" + UUIDGenerator.getUUID());
this.setName(tmpName);
@@ -164,9 +165,9 @@
phaseResolver.disengageModuleFromOperationChain(module, this);
//removing operations added at the time of module engagemnt
- HashMap moduleOperations = module.getOperations();
+ HashMap<QName, AxisOperation> moduleOperations = module.getOperations();
if (moduleOperations != null) {
- Iterator moduleOperations_itr = moduleOperations.values().iterator();
+ Iterator<AxisOperation> moduleOperations_itr = moduleOperations.values().iterator();
while (moduleOperations_itr.hasNext()) {
AxisOperation operation = (AxisOperation)moduleOperations_itr.next();
service.removeOperation(operation.getName());
@@ -360,7 +361,7 @@
return (ModuleConfiguration)moduleConfigmap.get(moduleName);
}
- public ArrayList getModuleRefs() {
+ public ArrayList<String> getModuleRefs() {
return modulerefs;
}
@@ -380,7 +381,7 @@
return style;
}
- public ArrayList getWSAMappingList() {
+ public ArrayList<String> getWSAMappingList() {
return wsamappingList;
}
@@ -437,7 +438,7 @@
}
}
- public void setWsamappingList(ArrayList wsamappingList) {
+ public void setWsamappingList(ArrayList<String> wsamappingList) {
this.wsamappingList = wsamappingList;
}
@@ -454,7 +455,7 @@
return this.name;
}
- public ArrayList getFaultMessages() {
+ public ArrayList<AxisMessage> getFaultMessages() {
return faultMessages;
}
@@ -512,7 +513,7 @@
}
public String[] getFaultActionNames() {
- Set keys = faultActions.keySet();
+ Set<String> keys = faultActions.keySet();
String[] faultActionNames = new String[keys.size()];
faultActionNames = (String[])keys.toArray(faultActionNames);
return faultActionNames;
@@ -520,7 +521,7 @@
public String getFaultAction() {
String result = null;
- Iterator iter = faultActions.values().iterator();
+ Iterator<String> iter = faultActions.values().iterator();
if (iter.hasNext()) {
result = (String)iter.next();
}
@@ -532,8 +533,8 @@
*
* @return an Iterator of all the AxisMessages we deal with
*/
- public Iterator getMessages() {
- return getChildren();
+ public Iterator<AxisMessage> getMessages() {
+ return (Iterator<AxisMessage>)getChildren();
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Mon Dec 8 14:01:35 2008
@@ -93,14 +93,14 @@
public static final String INCLUDE_TAG = "include";
public static final String SCHEMA_LOCATION = "schemaLocation";
- private Map endpointMap = new HashMap();
+ private Map<String, AxisEndpoint> endpointMap = new HashMap<String, AxisEndpoint>();
/*
* This is a map between the QName of the element of a message specified in
* the WSDL and an Operation. It enables SOAP Body-based dispatching for
* doc-literal bindings.
*/
- private Map messageElementQNameToOperationMap = new HashMap();
+ private Map<QName, AxisOperation> messageElementQNameToOperationMap = new HashMap<QName, AxisOperation>();
private int nsCount = 0;
private static final Log log = LogFactory.getLog(AxisService.class);
@@ -108,7 +108,7 @@
// Maps httpLocations to corresponding operations. Used to dispatch rest
// messages.
- private HashMap httpLocationDispatcherMap = null;
+ private HashMap<String, AxisOperation> httpLocationDispatcherMap = null;
// A map of (String alias, AxisOperation operation). The aliases might
// include: SOAPAction,
@@ -125,25 +125,25 @@
// "foo" is not unique across different operations:
// operation 1: action = foo, name = bar
// operation 2: action = bar, name = foo
- private HashMap operationsAliasesMap = null;
+ private HashMap<String, AxisOperation> operationsAliasesMap = null;
// Collection of aliases that are invalid for this service because they are
// duplicated across
// multiple operations under this service.
- private List invalidOperationsAliases = null;
+ private List<String> invalidOperationsAliases = null;
// private HashMap operations = new HashMap();
// to store module ref at deploy time parsing
- private ArrayList moduleRefs = null;
+ private ArrayList<String> moduleRefs = null;
// to keep the time that last update time of the service
private long lastupdate;
- private HashMap moduleConfigmap;
+ private HashMap<String, ModuleConfiguration> moduleConfigmap;
private String name;
private ClassLoader serviceClassLoader;
// to keep the XMLScheam getting either from WSDL or java2wsdl
- private ArrayList schemaList;
+ private ArrayList<XmlSchema> schemaList;
// private XmlSchema schema;
// wsdl is there for this service or not (in side META-INF)
@@ -153,7 +153,7 @@
private String scope;
// to store default message receivers
- private HashMap messageReceivers;
+ private HashMap<String, MessageReceiver> messageReceivers;
// to set the handler chain available in phase info
private boolean useDefaultChains = true;
@@ -173,7 +173,7 @@
private String schematargetNamespacePrefix = Java2WSDLConstants.SCHEMA_NAMESPACE_PRFIX;
private boolean enableAllTransports = true;
- private List exposedTransports = new ArrayList();
+ private List<String> exposedTransports = new ArrayList<String>();
// To keep reference to ServiceLifeCycle instance , if the user has
// specified in services.xml
@@ -238,7 +238,7 @@
// Data Locators for WS-Mex Support
private HashMap dataLocators;
- private HashMap dataLocatorClassNames;
+ private HashMap<String, String> dataLocatorClassNames;
private AxisDataLocatorImpl defaultDataLocator;
// Define search sequence for datalocator based on Data Locator types.
LocatorType[] availableDataLocatorTypes = new LocatorType[] {
@@ -330,8 +330,8 @@
moduleRefs = new ArrayList();
schemaList = new ArrayList();
serviceClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController
- .doPrivileged(new PrivilegedAction() {
- public Object run() {
+ .doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -531,14 +531,14 @@
* if a problem occurs
*/
void addModuleOperations(AxisModule module) throws AxisFault {
- HashMap map = module.getOperations();
- Collection col = map.values();
+ HashMap<QName, AxisOperation> map = module.getOperations();
+ Collection<AxisOperation> col = map.values();
PhaseResolver phaseResolver = new PhaseResolver(getAxisConfiguration());
- for (Iterator iterator = col.iterator(); iterator.hasNext();) {
+ for (Iterator<AxisOperation> iterator = col.iterator(); iterator.hasNext();) {
AxisOperation axisOperation = copyOperation((AxisOperation) iterator
.next());
if (this.getOperation(axisOperation.getName()) == null) {
- ArrayList wsamappings = axisOperation.getWSAMappingList();
+ ArrayList<String> wsamappings = axisOperation.getWSAMappingList();
if (wsamappings != null) {
for (int j = 0, size = wsamappings.size(); j < size; j++) {
String mapping = (String) wsamappings.get(j);
@@ -645,7 +645,7 @@
mapActionToOperation(action, axisOperation);
}
- ArrayList wsamappings = axisOperation.getWSAMappingList();
+ ArrayList<String> wsamappings = axisOperation.getWSAMappingList();
if (wsamappings != null) {
for (int j = 0, size = wsamappings.size(); j < size; j++) {
String mapping = (String) wsamappings.get(j);
@@ -693,7 +693,7 @@
operation.setMessageReceiver(axisOperation.getMessageReceiver());
operation.setName(axisOperation.getName());
- Iterator parameters = axisOperation.getParameters().iterator();
+ Iterator<Parameter> parameters = axisOperation.getParameters().iterator();
while (parameters.hasNext()) {
Parameter parameter = (Parameter) parameters.next();
@@ -747,7 +747,7 @@
// adding module operations
addModuleOperations(axisModule);
- Iterator operations = getOperations();
+ Iterator<AxisOperation> operations = getOperations();
while (operations.hasNext()) {
AxisOperation axisOperation = (AxisOperation) operations.next();
axisOperation.engageModule(axisModule, engager);
@@ -941,9 +941,9 @@
if (axisConfig == null) {
return null;
}
- ArrayList eprList = new ArrayList();
+ ArrayList<String> eprList = new ArrayList<String>();
if (enableAllTransports) {
- for (Iterator transports = axisConfig.getTransportsIn().values()
+ for (Iterator<TransportInDescription> transports = axisConfig.getTransportsIn().values()
.iterator(); transports.hasNext();) {
TransportInDescription transportIn = (TransportInDescription) transports
.next();
@@ -970,7 +970,7 @@
}
}
} else {
- List trs = this.exposedTransports;
+ List<String> trs = this.exposedTransports;
for (int i = 0; i < trs.size(); i++) {
String trsName = (String) trs.get(i);
TransportInDescription transportIn = axisConfig
@@ -1227,7 +1227,7 @@
// call the populator
populateSchemaMappings();
Map schemaMappingtable = getSchemaMappingTable();
- ArrayList schemas = getSchema();
+ ArrayList<XmlSchema> schemas = getSchema();
// a name is present - try to pump the requested schema
if (!"".equals(xsd)) {
@@ -1264,7 +1264,7 @@
} else {
// user specified no name and there is only one schema
// so pump that out
- ArrayList list = getSchema();
+ ArrayList<XmlSchema> list = getSchema();
if (list.size() > 0) {
XmlSchema schema = getSchema(0);
if (schema != null) {
@@ -1592,9 +1592,9 @@
/**
* Gets the control operation which are added by module like RM.
*/
- public ArrayList getControlOperations() {
- Iterator op_itr = getOperations();
- ArrayList operationList = new ArrayList();
+ public ArrayList<AxisOperation> getControlOperations() {
+ Iterator<AxisOperation> op_itr = getOperations();
+ ArrayList<AxisOperation> operationList = new ArrayList<AxisOperation>();
while (op_itr.hasNext()) {
AxisOperation operation = (AxisOperation) op_itr.next();
@@ -1627,7 +1627,7 @@
return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
- public ArrayList getModules() {
+ public ArrayList<String> getModules() {
return moduleRefs;
}
@@ -1786,7 +1786,7 @@
* @return Returns HashMap
*/
public Iterator<AxisOperation> getOperations() {
- return getChildren();
+ return (Iterator<AxisOperation>) getChildren();
}
/*
@@ -1798,9 +1798,9 @@
/**
* Gets only the published operations.
*/
- public ArrayList getPublishedOperations() {
- Iterator op_itr = getOperations();
- ArrayList operationList = new ArrayList();
+ public ArrayList<AxisOperation> getPublishedOperations() {
+ Iterator<AxisOperation> op_itr = getOperations();
+ ArrayList<AxisOperation> operationList = new ArrayList<AxisOperation>();
while (op_itr.hasNext()) {
AxisOperation operation = (AxisOperation) op_itr.next();
@@ -1855,7 +1855,7 @@
this.name = name;
}
- public ArrayList getSchema() {
+ public ArrayList<XmlSchema> getSchema() {
return schemaList;
}
@@ -1868,8 +1868,8 @@
}
}
- public void addSchema(Collection schemas) {
- Iterator iterator = schemas.iterator();
+ public void addSchema(Collection<XmlSchema> schemas) {
+ Iterator<XmlSchema> iterator = schemas.iterator();
while (iterator.hasNext()) {
XmlSchema schema = (XmlSchema) iterator.next();
schemaList.add(schema);
@@ -2002,7 +2002,7 @@
eprs = calculateEPRs();
}
- public List getExposedTransports() {
+ public List<String> getExposedTransports() {
return this.exposedTransports;
}
@@ -2059,9 +2059,9 @@
* the module in question
*/
private void removeModuleOperations(AxisModule module) {
- HashMap moduleOperations = module.getOperations();
+ HashMap<QName, AxisOperation> moduleOperations = module.getOperations();
if (moduleOperations != null) {
- for (Iterator modOpsIter = moduleOperations.values().iterator(); modOpsIter
+ for (Iterator<AxisOperation> modOpsIter = moduleOperations.values().iterator(); modOpsIter
.hasNext();) {
AxisOperation operation = (AxisOperation) modOpsIter.next();
removeOperation(operation.getName());
@@ -2182,7 +2182,7 @@
AxisConfiguration axisConfig) throws AxisFault {
try {
- HashMap messageReciverMap = new HashMap();
+ HashMap<String, MessageReceiver> messageReciverMap = new HashMap<String, MessageReceiver>();
Class inOnlyMessageReceiver = Loader
.loadClass("org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver");
MessageReceiver messageReceiver = (MessageReceiver) inOnlyMessageReceiver
@@ -2281,7 +2281,7 @@
*/
public static AxisService createService(String implClass,
String serviceName, AxisConfiguration axisConfiguration,
- Map messageReceiverClassMap, String targetNamespace,
+ Map<String, MessageReceiver> messageReceiverClassMap, String targetNamespace,
ClassLoader loader, SchemaGenerator schemaGenerator,
AxisService axisService) throws AxisFault {
Parameter parameter = new Parameter(Constants.SERVICE_CLASS, implClass);
@@ -2369,7 +2369,7 @@
AxisOperation operation = getOperation(opName);
if (operation != null) {
removeChild(opName);
- ArrayList mappingList = operation.getWSAMappingList();
+ ArrayList<String> mappingList = operation.getWSAMappingList();
if (mappingList != null) {
for (int i = 0; i < mappingList.size(); i++) {
String actionMapping = (String) mappingList.get(i);
@@ -2386,7 +2386,7 @@
* @return a Map of prefix (String) to namespace URI (String)
* @deprecated please use getNamespaceMap()
*/
- public Map getNameSpacesMap() {
+ public Map<String, String> getNameSpacesMap() {
return namespaceMap;
}
@@ -3001,7 +3001,7 @@
}
// TODO : Explain what goes in this map!
- public Map getEndpoints() {
+ public Map<String, AxisEndpoint> getEndpoints() {
return endpointMap;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java Mon Dec 8 14:01:35 2008
@@ -34,10 +34,10 @@
//to check whether user has put WWW dir or not
private boolean foundWebResources;
// to store module ref at deploy time parsing
- private ArrayList modulesList = new ArrayList();
+ private ArrayList<String> modulesList = new ArrayList<String>();
// to store modeule configuration info
- private HashMap moduleConfigmap;
+ private HashMap<String, ModuleConfiguration> moduleConfigmap;
// class loader
private ClassLoader serviceGroupClassLoader;
@@ -46,7 +46,7 @@
private String serviceGroupName;
public AxisServiceGroup() {
- moduleConfigmap = new HashMap();
+ moduleConfigmap = new HashMap<String, ModuleConfiguration>();
}
public AxisServiceGroup(AxisConfiguration axisDescription) {
@@ -61,7 +61,7 @@
*/
public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
if (moduleConfigmap == null) {
- moduleConfigmap = new HashMap();
+ moduleConfigmap = new HashMap<String, ModuleConfiguration>();
}
moduleConfigmap.put(moduleConfiguration.getModuleName(), moduleConfiguration);
@@ -86,7 +86,7 @@
AxisConfiguration axisConfig = getAxisConfiguration();
if (axisConfig != null) {
- for (Iterator iterator = getEngagedModules().iterator(); iterator.hasNext();) {
+ for (Iterator<AxisModule> iterator = getEngagedModules().iterator(); iterator.hasNext();) {
Object o = iterator.next();
AxisModule axisModule;
if (o instanceof AxisModule) {
@@ -129,14 +129,14 @@
* @throws AxisFault if there is a problem
*/
protected void onEngage(AxisModule module, AxisDescription engager) throws AxisFault {
- for (Iterator serviceIter = getServices(); serviceIter.hasNext();) {
+ for (Iterator<AxisService> serviceIter = getServices(); serviceIter.hasNext();) {
AxisService axisService = (AxisService) serviceIter.next();
axisService.engageModule(module, engager);
}
}
public void onDisengage(AxisModule module) throws AxisFault {
- for (Iterator serviceIter = getServices(); serviceIter.hasNext();) {
+ for (Iterator<AxisService> serviceIter = getServices(); serviceIter.hasNext();) {
AxisService axisService = (AxisService) serviceIter.next();
axisService.disengageModule(module);
}
@@ -156,7 +156,7 @@
return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
- public ArrayList getModuleRefs() {
+ public ArrayList<String> getModuleRefs() {
return modulesList;
}
@@ -175,8 +175,8 @@
return serviceGroupName;
}
- public Iterator getServices() {
- return getChildren();
+ public Iterator<AxisService> getServices() {
+ return (Iterator<AxisService>)getChildren();
}
public void setAxisDescription(AxisConfiguration axisDescription) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java Mon Dec 8 14:01:35 2008
@@ -31,13 +31,13 @@
/**
* Field list
*/
- protected final List list;
+ protected final List<HandlerDescription> list;
/**
* Constructor FlowImpl
*/
public Flow() {
- list = new ArrayList();
+ list = new ArrayList<HandlerDescription>();
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java Mon Dec 8 14:01:35 2008
@@ -124,7 +124,7 @@
}
}
- public ArrayList getParameters() {
+ public ArrayList<Parameter> getParameters() {
return parameterInclude.getParameters();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java Mon Dec 8 14:01:35 2008
@@ -83,7 +83,7 @@
public void addFaultMessageContext(MessageContext msgContext, OperationContext opContext)
throws AxisFault {
- HashMap mep = opContext.getMessageContexts();
+ HashMap<String, MessageContext> mep = opContext.getMessageContexts();
MessageContext faultMessageCtxt = (MessageContext) mep.get(MESSAGE_LABEL_FAULT_VALUE);
if (faultMessageCtxt != null) {
throw new AxisFault(Messages.getMessage("mepcompleted"));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java Mon Dec 8 14:01:35 2008
@@ -75,7 +75,7 @@
return parameterInclude.getParameter(name);
}
- public ArrayList getParameters() {
+ public ArrayList<Parameter> getParameters() {
return parameterInclude.getParameters();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Mon Dec 8 14:01:35 2008
@@ -19,6 +19,10 @@
package org.apache.axis2.description;
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -45,9 +49,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.util.HashMap;
-
public class OutInAxisOperation extends TwoChannelAxisOperation {
private static final Log log = LogFactory.getLog(OutInAxisOperation.class);
@@ -67,7 +68,7 @@
public void addMessageContext(MessageContext msgContext,
OperationContext opContext) throws AxisFault {
- HashMap mep = opContext.getMessageContexts();
+ HashMap<String, MessageContext> mep = opContext.getMessageContexts();
MessageContext immsgContext = (MessageContext) mep
.get(MESSAGE_LABEL_IN_VALUE);
MessageContext outmsgContext = (MessageContext) mep
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterInclude.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterInclude.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterInclude.java Mon Dec 8 14:01:35 2008
@@ -54,7 +54,7 @@
*
* @return Returns ArrayList.
*/
- ArrayList getParameters();
+ ArrayList<Parameter> getParameters();
/**
* Checks whether the parameter is locked at any level.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java Mon Dec 8 14:01:35 2008
@@ -85,13 +85,13 @@
/**
* Field parmeters
*/
- protected final HashMap parameters;
+ protected final HashMap<String, Parameter> parameters;
/**
* Constructor ParameterIncludeImpl.
*/
public ParameterIncludeImpl() {
- parameters = new HashMap();
+ parameters = new HashMap<String, Parameter>();
}
/**
@@ -179,11 +179,11 @@
return (Parameter) parameters.get(name);
}
- public ArrayList getParameters() {
- Collection col = parameters.values();
- ArrayList para_list = new ArrayList();
+ public ArrayList<Parameter> getParameters() {
+ Collection<Parameter> col = parameters.values();
+ ArrayList<Parameter> para_list = new ArrayList<Parameter>();
- for (Iterator iterator = col.iterator(); iterator.hasNext();) {
+ for (Iterator<Parameter> iterator = col.iterator(); iterator.hasNext();) {
Parameter parameter = (Parameter) iterator.next();
para_list.add(parameter);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java Mon Dec 8 14:01:35 2008
@@ -79,7 +79,7 @@
private AxisDescription description;
- private Hashtable wrapperElements = new Hashtable();
+ private Hashtable<String, Wrapper> wrapperElements = new Hashtable<String, Wrapper>();
public PolicyInclude() {
reg = new PolicyRegistryImpl();
@@ -192,7 +192,7 @@
private void calculatePolicy() {
Policy result = null;
- Iterator iterator = wrapperElements.values().iterator();
+ Iterator<Wrapper> iterator = wrapperElements.values().iterator();
while (iterator.hasNext()) {
Object policyElement = ((Wrapper) iterator.next()).getValue();
@@ -250,7 +250,7 @@
*/
public Policy getPolicy() {
if (description != null) {
- ArrayList policyList = new ArrayList(description.getPolicySubject()
+ ArrayList<PolicyComponent> policyList = new ArrayList<PolicyComponent>(description.getPolicySubject()
.getAttachedPolicyComponents());
return PolicyUtil.getMergedPolicy(policyList, description);
}
@@ -284,16 +284,16 @@
*/
public ArrayList getPolicyElements() {
if (description != null) {
- return new ArrayList(description.getPolicySubject()
+ return new ArrayList<PolicyComponent>(description.getPolicySubject()
.getAttachedPolicyComponents());
}
ArrayList policyElementsList = new ArrayList();
- Iterator policyElementIterator = wrapperElements.values().iterator();
+ Iterator<Wrapper> policyElementIterator = wrapperElements.values().iterator();
while (policyElementIterator.hasNext()) {
policyElementsList
- .add(((Wrapper) policyElementIterator.next()).getValue());
+ .add(policyElementIterator.next().getValue());
}
return policyElementsList;
}
@@ -307,7 +307,7 @@
*/
public ArrayList getPolicyElements(int type) {
ArrayList policyElementList = new ArrayList();
- Iterator wrapperElementIterator = wrapperElements.values().iterator();
+ Iterator<Wrapper> wrapperElementIterator = wrapperElements.values().iterator();
Wrapper wrapper;
while (wrapperElementIterator.hasNext()) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicySubject.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicySubject.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicySubject.java Mon Dec 8 14:01:35 2008
@@ -35,7 +35,7 @@
private boolean updated = false;
private Date lastUpdatedTime = new Date();
- private HashMap attachedPolicyComponents = new HashMap();
+ private HashMap<String, PolicyComponent> attachedPolicyComponents = new HashMap<String, PolicyComponent>();
public void attachPolicy(Policy policy) {
String key = policy.getName();
@@ -54,8 +54,8 @@
setLastUpdatedTime(new Date());
}
- public void attachPolicyComponents(List policyComponents) {
- for (Iterator iterator = policyComponents.iterator(); iterator
+ public void attachPolicyComponents(List<PolicyComponent> policyComponents) {
+ for (Iterator<PolicyComponent> iterator = policyComponents.iterator(); iterator
.hasNext();) {
attachPolicyComponent((PolicyComponent) iterator.next());
}
@@ -88,7 +88,7 @@
}
- public Collection getAttachedPolicyComponents() {
+ public Collection<PolicyComponent> getAttachedPolicyComponents() {
return attachedPolicyComponents.values();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java Mon Dec 8 14:01:35 2008
@@ -20,14 +20,14 @@
package org.apache.axis2.description;
+import java.util.ArrayList;
+
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.transport.TransportListener;
-import java.util.ArrayList;
-
/**
* Represents an incoming transport deployed in Axis2.
*/
@@ -118,7 +118,7 @@
return paramInclude.getParameter(name);
}
- public ArrayList getParameters() {
+ public ArrayList<Parameter> getParameters() {
return paramInclude.getParameters();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java Mon Dec 8 14:01:35 2008
@@ -118,7 +118,7 @@
return paramInclude.getParameter(name);
}
- public ArrayList getParameters() {
+ public ArrayList<Parameter> getParameters() {
return paramInclude.getParameters();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java Mon Dec 8 14:01:35 2008
@@ -96,7 +96,7 @@
public void addFaultMessageContext(MessageContext msgContext, OperationContext opContext)
throws AxisFault {
- HashMap mep = opContext.getMessageContexts();
+ HashMap<String, MessageContext> mep = opContext.getMessageContexts();
MessageContext faultMessageCtxt = (MessageContext) mep.get(MESSAGE_LABEL_FAULT_VALUE);
if (faultMessageCtxt != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java Mon Dec 8 14:01:35 2008
@@ -42,7 +42,7 @@
public static final String WSDL_PORT = "WSDL_PORT";
- private ArrayList axisServices = null;
+ private ArrayList<AxisService> axisServices = null;
/**
* Class constructor.
@@ -51,17 +51,17 @@
*/
public WSDL11ToAllAxisServicesBuilder(InputStream in) {
super(in);
- axisServices = new ArrayList(); // create an empty ArrayList
+ axisServices = new ArrayList<AxisService>(); // create an empty ArrayList
}
public WSDL11ToAllAxisServicesBuilder(Definition def) {
super(def, null, null);
- axisServices = new ArrayList(); // create an empty ArrayList
+ axisServices = new ArrayList<AxisService>(); // create an empty ArrayList
}
public WSDL11ToAllAxisServicesBuilder(Definition def, String portName) {
super(def, null, portName);
- axisServices = new ArrayList(); // create an empty ArrayList
+ axisServices = new ArrayList<AxisService>(); // create an empty ArrayList
}
@@ -75,7 +75,7 @@
* The name of the AxisService is modified from the service name to the port name.
* @throws AxisFault
*/
- public List populateAllServices() throws AxisFault {
+ public List<AxisService> populateAllServices() throws AxisFault {
try {
if (log.isDebugEnabled()) {
log.debug("Entry: populateAllServices");
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java Mon Dec 8 14:01:35 2008
@@ -37,7 +37,7 @@
protected static final Log log =
LogFactory.getLog(WSDL20ToAllAxisServicesBuilder.class);
- private ArrayList axisServices = null;
+ private ArrayList<AxisService> axisServices = null;
/**
* Class constructor.
@@ -46,12 +46,12 @@
*/
public WSDL20ToAllAxisServicesBuilder(InputStream in) {
super(in, null, null);
- axisServices = new ArrayList(); // create an empty ArrayList
+ axisServices = new ArrayList<AxisService>(); // create an empty ArrayList
}
public WSDL20ToAllAxisServicesBuilder(String wsdlUri, String endpointName) throws WSDLException {
super(wsdlUri, null, endpointName);
- axisServices = new ArrayList(); // create an empty ArrayList
+ axisServices = new ArrayList<AxisService>(); // create an empty ArrayList
}
/**
@@ -68,7 +68,7 @@
* pair. The format of the name is "<wsdl service name>#<wsdl endpoint name>"
* @throws AxisFault
*/
- public List populateAllServices() throws AxisFault {
+ public List<AxisService> populateAllServices() throws AxisFault {
try {
if (log.isDebugEnabled()) {
log.debug("Entry: populateAllServices");
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java Mon Dec 8 14:01:35 2008
@@ -127,7 +127,7 @@
String localName = axisOperation.getName()
.getLocalPart();
AxisBindingOperation bindingOp = null;
- for (Iterator iterator = axisBinding.getChildren(); iterator
+ for (Iterator<AxisBindingOperation> iterator = axisBinding.getChildren(); iterator
.hasNext();) {
bindingOp = (AxisBindingOperation) iterator.next();
if (localName.equals(bindingOp.getName().getLocalPart())) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Mon Dec 8 14:01:35 2008
@@ -19,6 +19,20 @@
package org.apache.axis2.engine;
+import java.io.File;
+import java.net.URL;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.builder.unknowncontent.UnknownContentBuilder;
@@ -29,7 +43,16 @@
import org.apache.axis2.deployment.ModuleDeployer;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisEndpoint;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.ModuleConfiguration;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.phaseresolver.PhaseMetadata;
@@ -40,18 +63,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.net.URL;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* Class AxisConfiguration
*/
@@ -61,66 +72,66 @@
/*
* To store configured data locators
*/
- private HashMap dataLocators = new HashMap();
- private HashMap dataLocatorClassNames = new HashMap();
+ private HashMap<String, AxisDataLocator> dataLocators = new HashMap<String, AxisDataLocator>();
+ private HashMap<String, String> dataLocatorClassNames = new HashMap<String, String>();
/**
* This is a Map of String name -> AxisModule for all available Modules.
*/
- private final HashMap allModules = new HashMap();
+ private final HashMap<String, AxisModule> allModules = new HashMap<String, AxisModule>();
// To store mapping between default version and module name
- private final HashMap nameToversionMap = new HashMap();
+ private final HashMap<String, String> nameToversionMap = new HashMap<String, String>();
// private final HashMap serviceGroups = new HashMap();
- private final HashMap transportsIn = new HashMap();
+ private final HashMap<String, TransportInDescription> transportsIn = new HashMap<String, TransportInDescription>();
- private final HashMap transportsOut = new HashMap();
+ private final HashMap<String, TransportOutDescription> transportsOut = new HashMap<String, TransportOutDescription>();
- private final HashMap policySupportedModules = new HashMap();
+ private final HashMap<String, List<AxisModule>> policySupportedModules = new HashMap<String, List<AxisModule>>();
/**
* Stores the QNames of local policy assertions
*/
- private final ArrayList localPolicyAssertions = new ArrayList();
+ private final ArrayList<QName> localPolicyAssertions = new ArrayList<QName>();
// to store AxisObserver Objects
- private ArrayList observersList = null;
+ private ArrayList<AxisObserver> observersList = null;
private URL axis2Repository = null;
- private Map allServices = new ConcurrentHashMap();
- private Map allEndpoints = new ConcurrentHashMap();
+ private Map<String, AxisService> allServices = new ConcurrentHashMap<String, AxisService>();
+ private Map<String, AxisService> allEndpoints = new ConcurrentHashMap<String, AxisService>();
/**
* Stores the module specified in the server.xml at the document parsing time.
*/
- private List globalModuleList;
+ private List<String> globalModuleList;
- private Hashtable faultyModules;
+ private Hashtable<String, String> faultyModules;
/**
* To store faulty services
*/
- private Hashtable faultyServices;
+ private Hashtable<String, String> faultyServices;
- private ArrayList inFaultPhases;
+ private List<Phase> inFaultPhases;
- private ArrayList inPhasesUptoAndIncludingPostDispatch;
+ private List<Phase> inPhasesUptoAndIncludingPostDispatch;
- private HashMap messageReceivers;
+ private HashMap<String, MessageReceiver> messageReceivers;
- private HashMap messageBuilders;
+ private HashMap<String, Builder> messageBuilders;
- private HashMap messageFormatters;
+ private HashMap<String, MessageFormatter> messageFormatters;
private ClassLoader moduleClassLoader;
- private HashMap moduleConfigmap;
+ private HashMap<String, ModuleConfiguration> moduleConfigmap;
- private ArrayList outFaultPhases;
+ private List<Phase> outFaultPhases;
- private ArrayList outPhases;
+ private List<Phase> outPhases;
protected PhasesInfo phasesinfo;
@@ -131,7 +142,7 @@
//To keep track of whether the system has started or not
private boolean start;
- private ArrayList targetResolvers;
+ private ArrayList<TargetResolver> targetResolvers;
private ClusterManager clusterManager;
@@ -141,21 +152,21 @@
* Constructor AxisConfiguration.
*/
public AxisConfiguration() {
- moduleConfigmap = new HashMap();
- globalModuleList = new ArrayList();
- messageReceivers = new HashMap();
- messageBuilders = new HashMap();
- messageFormatters = new HashMap();
- outPhases = new ArrayList();
- inFaultPhases = new ArrayList();
- outFaultPhases = new ArrayList();
- faultyServices = new Hashtable();
- faultyModules = new Hashtable();
- observersList = new ArrayList();
- inPhasesUptoAndIncludingPostDispatch = new ArrayList();
+ moduleConfigmap = new HashMap<String, ModuleConfiguration>();
+ globalModuleList = new ArrayList<String>();
+ messageReceivers = new HashMap<String, MessageReceiver>();
+ messageBuilders = new HashMap<String, Builder>();
+ messageFormatters = new HashMap<String, MessageFormatter>();
+ outPhases = new ArrayList<Phase>();
+ inFaultPhases = new ArrayList<Phase>();
+ outFaultPhases = new ArrayList<Phase>();
+ faultyServices = new Hashtable<String, String>();
+ faultyModules = new Hashtable<String, String>();
+ observersList = new ArrayList<AxisObserver>();
+ inPhasesUptoAndIncludingPostDispatch = new ArrayList<Phase>();
systemClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController
- .doPrivileged(new PrivilegedAction() {
- public Object run() {
+ .doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -163,7 +174,7 @@
moduleClassLoader = systemClassLoader;
this.phasesinfo = new PhasesInfo();
- targetResolvers = new ArrayList();
+ targetResolvers = new ArrayList<TargetResolver>();
}
public void addMessageReceiver(String mepURL,
@@ -302,7 +313,7 @@
notifyObservers(AxisEvent.SERVICE_DEPLOY, axisServiceGroup);
AxisService axisService;
- Iterator services = axisServiceGroup.getServices();
+ Iterator<AxisService> services = axisServiceGroup.getServices();
while (services.hasNext()) {
axisService = (AxisService) services.next();
if (axisService.getSchemaTargetNamespace() == null) {
@@ -313,31 +324,31 @@
while (services.hasNext()) {
axisService = (AxisService) services.next();
if (axisService.isUseDefaultChains()) {
- Iterator operations = axisService.getOperations();
+ Iterator<AxisOperation> operations = axisService.getOperations();
while (operations.hasNext()) {
AxisOperation operation = (AxisOperation) operations.next();
phasesinfo.setOperationPhases(operation);
}
}
}
- Iterator enModule = getEngagedModules().iterator();
+ Iterator<AxisModule> enModule = getEngagedModules().iterator();
while (enModule.hasNext()) {
axisServiceGroup.engageModule((AxisModule) enModule.next());
}
services = axisServiceGroup.getServices();
- ArrayList servicesIAdded = new ArrayList();
+ ArrayList<AxisService> servicesIAdded = new ArrayList<AxisService>();
while (services.hasNext()) {
axisService = (AxisService) services.next();
processEndpoints(axisService, axisService.getAxisConfiguration());
- Map endpoints = axisService.getEndpoints();
+ Map<String, AxisEndpoint> endpoints = axisService.getEndpoints();
String serviceName = axisService.getName();
try {
addToAllServicesMap(axisService);
} catch (AxisFault axisFault) {
// Whoops, must have been a duplicate! If we had a problem here, we have to
// remove all the ones we added...
- for (Iterator i = servicesIAdded.iterator(); i.hasNext();) {
+ for (Iterator<AxisService> i = servicesIAdded.iterator(); i.hasNext();) {
AxisService service = (AxisService) i.next();
allServices.remove(service.getName());
}
@@ -346,7 +357,7 @@
}
servicesIAdded.add(axisService);
if (endpoints != null) {
- Iterator endpointNameIter = endpoints.keySet().iterator();
+ Iterator<String> endpointNameIter = endpoints.keySet().iterator();
while (endpointNameIter.hasNext()) {
String endpointName = (String) endpointNameIter.next();
if (log.isDebugEnabled()) {
@@ -401,11 +412,11 @@
serviceGroupName));
}
- Iterator services = axisServiceGroup.getServices();
+ Iterator<AxisService> services = axisServiceGroup.getServices();
boolean isClientSide = false;
while (services.hasNext()) {
AxisService axisService = (AxisService) services.next();
- Object value = allServices.remove(axisService.getName());
+ allServices.remove(axisService.getName());
if (!axisService.isClientSide()) {
notifyObservers(AxisEvent.SERVICE_REMOVE, axisService);
} else {
@@ -416,7 +427,7 @@
String serviceName = axisService.getName();
String key = null;
- for (Iterator iter = axisService.getEndpoints().keySet().iterator(); iter.hasNext();){
+ for (Iterator<String> iter = axisService.getEndpoints().keySet().iterator(); iter.hasNext();){
key = serviceName + "." + (String)iter.next();
this.allEndpoints.remove(key);
}
@@ -512,7 +523,7 @@
}
public void onEngage(AxisModule module, AxisDescription engager) throws AxisFault {
- Iterator servicegroups = getServiceGroups();
+ Iterator<AxisServiceGroup> servicegroups = getServiceGroups();
while (servicegroups.hasNext()) {
AxisServiceGroup serviceGroup = (AxisServiceGroup) servicegroups.next();
serviceGroup.engageModule(module, engager);
@@ -529,7 +540,7 @@
PhaseResolver phaseResolver = new PhaseResolver(this);
phaseResolver.disengageModuleFromGlobalChains(module);
- Iterator serviceGroups = getServiceGroups();
+ Iterator<AxisServiceGroup> serviceGroups = getServiceGroups();
while (serviceGroups.hasNext()) {
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) serviceGroups.next();
axisServiceGroup.disengageModule(module);
@@ -615,21 +626,21 @@
* @throws AxisFault if an individual engageModule() fails
*/
public void engageGlobalModules() throws AxisFault {
- for (Iterator i = globalModuleList.iterator(); i.hasNext();) {
+ for (Iterator<String> i = globalModuleList.iterator(); i.hasNext();) {
engageModule((String) i.next());
}
}
- public Hashtable getFaultyModules() {
+ public Hashtable<String, String> getFaultyModules() {
return faultyModules;
}
- public Hashtable getFaultyServices() {
+ public Hashtable<String, String> getFaultyServices() {
return faultyServices;
}
public void removeFaultyService(String key) {
- Iterator itr = faultyServices.keySet().iterator();
+ Iterator<String> itr = faultyServices.keySet().iterator();
while (itr.hasNext()) {
String fullFileName = (String) itr.next();
if (fullFileName.indexOf(key) > 0) {
@@ -640,18 +651,18 @@
}
// to get the out flow correpodning to the global out flow;
- public ArrayList getOutFlowPhases() {
+ public List<Phase> getOutFlowPhases() {
return this.outPhases;
}
/**
* @return Returns ArrayList.
*/
- public ArrayList getInFaultFlowPhases() {
+ public List<Phase> getInFaultFlowPhases() {
return inFaultPhases;
}
- public ArrayList getInFlowPhases() {
+ public List<Phase> getInFlowPhases() {
return inPhasesUptoAndIncludingPostDispatch;
}
@@ -664,7 +675,7 @@
* @return the configured message builder implementation class name against
* the given content type.
*/
- public Builder getMessageBuilder(String contentType) {
+ public Builder getMessageBuilder(String contentType) {
Builder builder = null;
if (messageBuilders.isEmpty()) {
return null;
@@ -676,19 +687,19 @@
.toLowerCase());
}
if (builder == null) {
- Iterator iterator = messageBuilders.entrySet().iterator();
+ Iterator<Entry<String, Builder>> iterator = messageBuilders.entrySet().iterator();
while (iterator.hasNext() && builder == null) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String key = (String) entry.getKey();
+ Entry<String, Builder> entry = iterator.next();
+ String key = entry.getKey();
if (contentType.matches(key)) {
- builder = (Builder) entry.getValue();
+ builder = entry.getValue();
}
}
}
}
return builder;
}
-
+
public Builder getMessageBuilder(String contentType, boolean defaultBuilder) {
Builder builder = getMessageBuilder(contentType);
if (builder ==null & defaultBuilder){
@@ -696,12 +707,11 @@
}
return builder;
}
-
/**
- * @param contentType
- * @return the configured message formatter implementation class name
- * against the given content type.
- */
+ * @param contentType
+ * @return the configured message formatter implementation class name
+ * against the given content type.
+ */
public MessageFormatter getMessageFormatter(String contentType) {
return (MessageFormatter) messageFormatters.get(contentType);
}
@@ -777,7 +787,7 @@
/**
* @return Returns HashMap.
*/
- public HashMap getModules() {
+ public HashMap<String, AxisModule> getModules() {
return allModules;
}
@@ -787,14 +797,14 @@
* @return the global module list. BE CAREFUL, this list is mutable.
* @deprecated please use addGlobalModule()
*/
- public List getGlobalModules() {
+ public List<String> getGlobalModules() {
return globalModuleList;
}
/**
* @return Returns ArrayList.
*/
- public ArrayList getOutFaultFlowPhases() {
+ public List<Phase> getOutFaultFlowPhases() {
return outFaultPhases;
}
@@ -863,16 +873,16 @@
return (AxisServiceGroup) getChild(serviceNameAndGroupString);
}
- public Iterator getServiceGroups() {
+ public Iterator<AxisServiceGroup> getServiceGroups() {
// return serviceGroups.values().iterator();
- return getChildren();
+ return (Iterator<AxisServiceGroup>) getChildren();
}
// To get all the services in the system
- public HashMap getServices() {
- HashMap hashMap = new HashMap(this.allServices.size());
- Object key;
- for (Iterator iter = this.allServices.keySet().iterator(); iter.hasNext();){
+ public HashMap<String, AxisService> getServices() {
+ HashMap<String, AxisService> hashMap = new HashMap<String, AxisService>(this.allServices.size());
+ String key;
+ for (Iterator<String> iter = this.allServices.keySet().iterator(); iter.hasNext();){
key = iter.next();
hashMap.put(key, this.allServices.get(key));
}
@@ -893,11 +903,11 @@
return (TransportOutDescription) transportsOut.get(name);
}
- public HashMap getTransportsIn() {
+ public HashMap<String, TransportInDescription> getTransportsIn() {
return transportsIn;
}
- public HashMap getTransportsOut() {
+ public HashMap<String, TransportOutDescription> getTransportsOut() {
return transportsOut;
}
@@ -934,19 +944,19 @@
return isEngaged;
}
- public void setGlobalOutPhase(ArrayList outPhases) {
+ public void setGlobalOutPhase(List<Phase> outPhases) {
this.outPhases = outPhases;
}
/**
* @param list
*/
- public void setInFaultPhases(ArrayList list) {
+ public void setInFaultPhases(List<Phase> list) {
inFaultPhases = list;
}
public void setInPhasesUptoAndIncludingPostDispatch(
- ArrayList inPhasesUptoAndIncludingPostDispatch) {
+ List<Phase> inPhasesUptoAndIncludingPostDispatch) {
this.inPhasesUptoAndIncludingPostDispatch = inPhasesUptoAndIncludingPostDispatch;
}
@@ -957,7 +967,7 @@
/**
* @param list
*/
- public void setOutFaultPhases(ArrayList list) {
+ public void setOutFaultPhases(List<Phase> list) {
outFaultPhases = list;
}
@@ -1037,8 +1047,8 @@
notifyObservers(AxisEvent.SERVICE_START, service);
}
- public List getModulesForPolicyNamesapce(String namesapce) {
- return (List) policySupportedModules.get(namesapce);
+ public List<AxisModule> getModulesForPolicyNamesapce(String namesapce) {
+ return policySupportedModules.get(namesapce);
}
public void registerModulePolicySupport(AxisModule axisModule) {
@@ -1048,15 +1058,15 @@
return;
}
- List modulesList;
+ List<AxisModule> modulesList;
for (int i = 0; i < namespaces.length; i++) {
- modulesList = (List) policySupportedModules.get(namespaces[i]);
+ modulesList = policySupportedModules.get(namespaces[i]);
if (modulesList != null) {
modulesList.add(axisModule);
} else {
- modulesList = new ArrayList();
+ modulesList = new ArrayList<AxisModule>();
modulesList.add(axisModule);
policySupportedModules.put(namespaces[i], modulesList);
}
@@ -1075,7 +1085,7 @@
}
}
- public ArrayList getObserversList() {
+ public ArrayList<AxisObserver> getObserversList() {
return observersList;
}
@@ -1099,7 +1109,7 @@
}
return new TargetResolver() {
public void resolveTarget(MessageContext messageContext) {
- Iterator iter = targetResolvers.iterator();
+ Iterator<TargetResolver> iter = targetResolvers.iterator();
while (iter.hasNext()) {
TargetResolver tr = (TargetResolver) iter.next();
tr.resolveTarget(messageContext);
@@ -1116,7 +1126,7 @@
this.localPolicyAssertions.add(name);
}
- public List getLocalPolicyAssertions() {
+ public List<QName> getLocalPolicyAssertions() {
return this.localPolicyAssertions;
}
@@ -1218,34 +1228,34 @@
switch (flow) {
case PhaseMetadata.IN_FLOW : {
- List phaseList = phasesinfo.getINPhases();
+ List<Phase> phaseList = phasesinfo.getINPhases();
phaseList = findAndInsertPhase(d, phaseList);
if (phaseList != null) {
- phasesinfo.setINPhases((ArrayList)phaseList);
+ phasesinfo.setINPhases(phaseList);
}
break;
}
case PhaseMetadata.OUT_FLOW : {
- List phaseList = phasesinfo.getOUTPhases();
+ List<Phase> phaseList = phasesinfo.getOUTPhases();
phaseList = findAndInsertPhase(d, phaseList);
if (phaseList != null) {
- phasesinfo.setOUTPhases((ArrayList)phaseList);
+ phasesinfo.setOUTPhases(phaseList);
}
break;
}
case PhaseMetadata.FAULT_OUT_FLOW : {
- List phaseList = phasesinfo.getOutFaultPhaseList();
+ List<Phase> phaseList = phasesinfo.getOutFaultPhaseList();
phaseList = findAndInsertPhase(d, phaseList);
if (phaseList != null) {
- phasesinfo.setOUT_FaultPhases((ArrayList)phaseList);
+ phasesinfo.setOUT_FaultPhases(phaseList);
}
break;
}
case PhaseMetadata.FAULT_IN_FLOW : {
- List phaseList = phasesinfo.getIN_FaultPhases();
+ List<Phase> phaseList = phasesinfo.getIN_FaultPhases();
phaseList = findAndInsertPhase(d, phaseList);
if (phaseList != null) {
- phasesinfo.setIN_FaultPhases((ArrayList)phaseList);
+ phasesinfo.setIN_FaultPhases(phaseList);
}
break;
}
@@ -1259,10 +1269,10 @@
* @return
* @throws AxisFault
*/
- private List findAndInsertPhase(Deployable d, List phaseList) throws AxisFault {
- DeployableChain ec = new DeployableChain();
+ private List<Phase> findAndInsertPhase(Deployable d, List<Phase> phaseList) throws AxisFault {
+ DeployableChain<Phase> ec = new DeployableChain<Phase>();
String last = null;
- for (Iterator i = phaseList.iterator(); i.hasNext();) {
+ for (Iterator<Phase> i = phaseList.iterator(); i.hasNext();) {
Phase phase = (Phase)i.next();
String name = phase.getName();
Deployable existing = new Deployable(name);
@@ -1301,7 +1311,7 @@
private void processEndpoints(AxisService axisService,
AxisConfiguration axisConfiguration) throws AxisFault {
- Map enspoints = axisService.getEndpoints();
+ Map<String, AxisEndpoint> enspoints = axisService.getEndpoints();
if (enspoints == null || enspoints.size() == 0) {
org.apache.axis2.deployment.util.Utils.addEndpointsToService(
axisService, axisConfiguration);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Mon Dec 8 14:01:35 2008
@@ -20,6 +20,12 @@
package org.apache.axis2.engine;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.soap.RolePlayer;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -43,11 +49,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* There is one engine for the Server and the Client. the send() and receive()
* Methods are the basic operations the Sync, Async messageing are build on top.
@@ -63,7 +64,7 @@
private static boolean NOT_RESUMING_EXECUTION = false;
private static void checkMustUnderstand(MessageContext msgContext) throws AxisFault {
- List unprocessed = null;
+ List<QName> unprocessed = null;
SOAPEnvelope envelope = msgContext.getEnvelope();
if (envelope.getHeader() == null) {
return;
@@ -84,7 +85,7 @@
}
if(isReceiverMustUnderstandProcessor(msgContext)){
if(unprocessed == null){
- unprocessed = new ArrayList();
+ unprocessed = new ArrayList<QName>();
}
if(!unprocessed.contains(headerName)){
unprocessed.add(headerName);
@@ -141,7 +142,7 @@
log.trace(msgContext.getLogIDString() + " receive:" + msgContext.getMessageID());
}
ConfigurationContext confContext = msgContext.getConfigurationContext();
- ArrayList preCalculatedPhases;
+ List<Phase> preCalculatedPhases;
if (msgContext.isFault() || msgContext.isProcessingFault()) {
preCalculatedPhases = confContext.getAxisConfiguration().getInFaultFlowPhases();
msgContext.setFLOW(MessageContext.IN_FAULT_FLOW);
@@ -152,7 +153,9 @@
// Set the initial execution chain in the MessageContext to a *copy* of what
// we got above. This allows individual message processing to change the chain without
// affecting later messages.
- msgContext.setExecutionChain((ArrayList) preCalculatedPhases.clone());
+ ArrayList<Handler> executionChain = new ArrayList<Handler>();
+ executionChain.addAll(preCalculatedPhases);
+ msgContext.setExecutionChain(executionChain);
try {
InvocationResponse pi = invoke(msgContext, NOT_RESUMING_EXECUTION);
@@ -274,7 +277,7 @@
}
private static void flowComplete(MessageContext msgContext) {
- Iterator invokedPhaseIterator = msgContext.getExecutedPhases();
+ Iterator<Handler> invokedPhaseIterator = msgContext.getExecutedPhases();
while (invokedPhaseIterator.hasNext()) {
Handler currentHandler = ((Handler) invokedPhaseIterator.next());
@@ -498,8 +501,9 @@
}
}
- msgContext.setExecutionChain((ArrayList) msgContext.getConfigurationContext()
- .getAxisConfiguration().getOutFaultFlowPhases().clone());
+ ArrayList<Handler> executionChain = new ArrayList<Handler>(msgContext.getConfigurationContext()
+ .getAxisConfiguration().getOutFaultFlowPhases());
+ msgContext.setExecutionChain(executionChain);
msgContext.setFLOW(MessageContext.OUT_FAULT_FLOW);
InvocationResponse pi = invoke(msgContext, NOT_RESUMING_EXECUTION);
@@ -560,8 +564,9 @@
}
}
- msgContext.setExecutionChain((ArrayList) msgContext.getConfigurationContext()
- .getAxisConfiguration().getOutFaultFlowPhases().clone());
+ ArrayList<Handler> executionChain = new ArrayList<Handler>(msgContext.getConfigurationContext()
+ .getAxisConfiguration().getOutFaultFlowPhases());
+ msgContext.setExecutionChain(executionChain);
msgContext.setFLOW(MessageContext.OUT_FAULT_FLOW);
InvocationResponse pi = invoke(msgContext, NOT_RESUMING_EXECUTION);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java Mon Dec 8 14:01:35 2008
@@ -113,7 +113,7 @@
*/
public static void initService(ServiceGroupContext serviceGroupContext) throws AxisFault {
AxisServiceGroup serviceGroup = serviceGroupContext.getDescription();
- Iterator serviceItr = serviceGroup.getServices();
+ Iterator<AxisService> serviceItr = serviceGroup.getServices();
while (serviceItr.hasNext()) {
AxisService axisService = (AxisService) serviceItr.next();
ServiceContext serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Deployable.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Deployable.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Deployable.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Deployable.java Mon Dec 8 14:01:35 2008
@@ -30,8 +30,8 @@
public class Deployable {
private String name;
private String phase;
- private Set successors;
- private Set predecessors;
+ private Set<String> successors;
+ private Set<String> predecessors;
boolean first;
boolean last;
@@ -53,23 +53,23 @@
public void addSuccessor(String name) {
if (successors == null) {
- successors = new HashSet();
+ successors = new HashSet<String>();
}
successors.add(name);
}
public void addPredecessor(String name) {
if (predecessors == null) {
- predecessors = new HashSet();
+ predecessors = new HashSet<String>();
}
predecessors.add(name);
}
- public Set getPredecessors() {
+ public Set<String> getPredecessors() {
return predecessors;
}
- public Set getSuccessors() {
+ public Set<String> getSuccessors() {
return successors;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java Mon Dec 8 14:01:35 2008
@@ -20,7 +20,6 @@
package org.apache.axis2.engine;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -32,18 +31,18 @@
* deploy() them in, then call rebuild() which will set up a chain, correctly ordered according
* to the constraints in the Deployables.
*/
-public class DeployableChain {
+public class DeployableChain<T> {
/** The actual things (handlers or phases) */
- List chain = new ArrayList();
+ List<Object> chain = new ArrayList<Object>();
Deployable first;
Deployable last;
/** A Map of name -> List (of Strings). Each List contains the key's successors */
- Map activeConstraints = new LinkedHashMap();
+ Map<String, Set<String>> activeConstraints = new LinkedHashMap<String, Set<String>>();
/** A Map of name -> Deployable for all deployed items */
- private Map deployed = new LinkedHashMap();
+ private Map<String, Deployable> deployed = new LinkedHashMap<String, Deployable>();
/**
* Deploy a Deployable into this chain. Note that this does NOT order yet. The idea
@@ -56,8 +55,8 @@
*/
public void deploy(Deployable deployable) throws Exception {
String name = deployable.getName();
- Set mySuccessors = deployable.getSuccessors();
- Set myPredecessors = deployable.getPredecessors();
+ Set<String> mySuccessors = deployable.getSuccessors();
+ Set<String> myPredecessors = deployable.getPredecessors();
if (deployable.isFirst()) {
if (first != null) {
@@ -106,9 +105,9 @@
}
if (mySuccessors != null && !mySuccessors.isEmpty()) {
- Set successors = (Set)activeConstraints.get(name);
+ Set<String> successors = activeConstraints.get(name);
if (successors == null) {
- successors = new LinkedHashSet();
+ successors = new LinkedHashSet<String>();
activeConstraints.put(name, successors);
}
successors.addAll(mySuccessors);
@@ -139,14 +138,14 @@
* @return an index >=0 or -1 if there was a dependency cycle
* @throws Exception if there's a cyclic dependency
*/
- private int getMinIndex(String name, Set remaining, Set seen) throws Exception {
+ private int getMinIndex(String name, Set<String> remaining, Set<String> seen) throws Exception {
if (seen.contains(name)) {
// We return -1 here instead of throwing the Exception so we can build a better
// error message below.
return -1;
}
- Collection successors = (Collection)activeConstraints.get(name);
+ Set<String> successors = activeConstraints.get(name);
if (successors == null || successors.isEmpty()) {
// Never put anything after the thing marked "last"...
int index = (last == null) ? chain.size() : chain.size() - 1;
@@ -199,7 +198,7 @@
public void rebuild() throws Exception {
chain.clear();
- Set keys = new LinkedHashSet();
+ Set<String> keys = new LinkedHashSet<String>();
keys.addAll(deployed.keySet());
// First goes first.
@@ -210,7 +209,7 @@
// Last goes next, and everything else will get inserted before it if it exists.
if (last != null) {
- Collection afterLast = (Collection)activeConstraints.get(last.getName());
+ Set<String> afterLast = activeConstraints.get(last.getName());
if (afterLast != null) {
throw new Exception("Can't have anything which goes after '" + last.getName() +
"', which has been declared last.");
@@ -221,7 +220,7 @@
while (!keys.isEmpty()) {
String name = (String)keys.iterator().next();
- getMinIndex(name, keys, new LinkedHashSet());
+ getMinIndex(name, keys, new LinkedHashSet<String>());
}
// Now we've got a chain of names. Convert to actual things before we return.
@@ -238,9 +237,9 @@
* @param after name of the Deployable that must come later
*/
public void addRelationship(String before, String after) {
- Set successors = (Set)activeConstraints.get(before);
+ Set<String> successors = activeConstraints.get(before);
if (successors == null) {
- successors = new LinkedHashSet();
+ successors = new LinkedHashSet<String>();
activeConstraints.put(before, successors);
}
successors.add(after);
@@ -251,8 +250,8 @@
*
* @return a List of target objects in the correct order
*/
- public List getChain() {
+ public List<T> getChain() {
// todo - should this call rebuild() automatically (if dirty flag is set)?
- return chain;
+ return (List<T>) chain;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java Mon Dec 8 14:01:35 2008
@@ -73,7 +73,7 @@
// If we're configured to do so, check the service for a single op...
if (operation == null &&
JavaUtils.isTrue(service.getParameterValue(AxisService.SUPPORT_SINGLE_OP))) {
- Iterator ops = service.getOperations();
+ Iterator<AxisOperation> ops = service.getOperations();
// If there's exactly one, that's the one we want. If there's more, forget it.
if (ops.hasNext()) {
operation = (AxisOperation)ops.next();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java Mon Dec 8 14:01:35 2008
@@ -49,7 +49,7 @@
}
private ConfigurationContext configctx;
- private HashMap startedTransports = new HashMap();
+ private HashMap<String, TransportListener> startedTransports = new HashMap<String, TransportListener>();
private boolean stopped;
public void init(ConfigurationContext configCtx) {
@@ -77,7 +77,7 @@
throw new AxisFault(Messages.getMessage("servicenotfoundinthesystem", serviceName));
}
if (service.isEnableAllTransports()) {
- Iterator itr_st = startedTransports.values().iterator();
+ Iterator<TransportListener> itr_st = startedTransports.values().iterator();
while (itr_st.hasNext()) {
TransportListener transportListener = (TransportListener)itr_st.next();
EndpointReference[] epRsForService =
@@ -145,9 +145,9 @@
}
// Stop the transport senders
- HashMap outTransports = configctx.getAxisConfiguration().getTransportsOut();
+ HashMap<String, TransportOutDescription> outTransports = configctx.getAxisConfiguration().getTransportsOut();
if (outTransports.size() > 0) {
- Iterator trsItr = outTransports.values().iterator();
+ Iterator<TransportOutDescription> trsItr = outTransports.values().iterator();
while (trsItr.hasNext()) {
TransportOutDescription outDescription = (TransportOutDescription)trsItr.next();
TransportSender sender = outDescription.getSender();
@@ -158,9 +158,9 @@
}
// Shut down the modules
- HashMap modules = configctx.getAxisConfiguration().getModules();
+ HashMap<String, AxisModule> modules = configctx.getAxisConfiguration().getModules();
if (modules != null) {
- Iterator moduleitr = modules.values().iterator();
+ Iterator<AxisModule> moduleitr = modules.values().iterator();
while (moduleitr.hasNext()) {
AxisModule axisModule = (AxisModule)moduleitr.next();
Module module = axisModule.getModule();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java Mon Dec 8 14:01:35 2008
@@ -50,7 +50,7 @@
/**
* Field handlers
*/
- private List handlers;
+ private List<Handler> handlers;
/**
* A handler has been marked as present in both the first phase and the last phase
@@ -85,7 +85,7 @@
* @param phaseName the name for this Phase
*/
public Phase(String phaseName) {
- handlers = new CopyOnWriteArrayList();
+ handlers = new CopyOnWriteArrayList<Handler>();
this.phaseName = phaseName;
}
@@ -116,7 +116,7 @@
* @throws PhaseException if there is a problem
*/
public void addHandler(HandlerDescription handlerDesc) throws PhaseException {
- Iterator handlers_itr = getHandlers().iterator();
+ Iterator<Handler> handlers_itr = getHandlers().iterator();
while (handlers_itr.hasNext()) {
Handler hand = (Handler) handlers_itr.next();
@@ -381,7 +381,7 @@
*
* @return Returns an ArrayList of Handlers
*/
- public List getHandlers() {
+ public List<Handler> getHandlers() {
return handlers;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java Mon Dec 8 14:01:35 2008
@@ -70,7 +70,7 @@
* @see #doPrivileged(PrivilegedAction,AccessControlContext)
* @see #doPrivileged(PrivilegedExceptionAction)
*/
- public static Object doPrivileged(PrivilegedAction action) {
+ public static <T> T doPrivileged(PrivilegedAction<T> action) {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
return (action.run());
@@ -100,7 +100,7 @@
* @see #doPrivileged(PrivilegedAction)
* @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
*/
- public static Object doPrivileged(PrivilegedAction action, AccessControlContext context) {
+ public static <T> T doPrivileged(PrivilegedAction<T> action, AccessControlContext context) {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
return action.run();
@@ -124,7 +124,7 @@
* @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
* @see #doPrivileged(PrivilegedAction)
*/
- public static Object doPrivileged(PrivilegedExceptionAction action)
+ public static <T> T doPrivileged(PrivilegedExceptionAction<T> action)
throws PrivilegedActionException {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
@@ -163,7 +163,7 @@
* @see #doPrivileged(PrivilegedAction)
* @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
*/
- public static Object doPrivileged(PrivilegedExceptionAction action,
+ public static <T> T doPrivileged(PrivilegedExceptionAction<T> action,
AccessControlContext context)
throws PrivilegedActionException {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java Mon Dec 8 14:01:35 2008
@@ -203,9 +203,9 @@
* @param handler
* @param phaseList
*/
- private void removeHandlerfromaPhase(HandlerDescription handler, ArrayList phaseList) {
+ private void removeHandlerfromaPhase(HandlerDescription handler, List<Phase> phaseList) {
String phaseName = handler.getRules().getPhaseName();
- Iterator phaseItr = phaseList.iterator();
+ Iterator<Phase> phaseItr = phaseList.iterator();
while (phaseItr.hasNext()) {
Phase phase = (Phase) phaseItr.next();
if (phase.getPhaseName().equals(phaseName)) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java Mon Dec 8 14:01:35 2008
@@ -197,8 +197,8 @@
* @throws InvocationTargetException
*/
static private ClassLoader getTCL() throws IllegalAccessException, InvocationTargetException {
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
+ return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java Mon Dec 8 14:01:35 2008
@@ -45,8 +45,8 @@
String prop = null;
try {
// need doPriv to get system prop with J2S enabled
- prop = (String) AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
+ prop = (String) AccessController.doPrivileged(new PrivilegedAction<String>() {
+ public String run() {
return System.getProperty("Axis2.prohibitDebugLogging");
}
});