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 [1/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...
Author: davidillsley
Date: Mon Dec 8 14:01:35 2008
New Revision: 724507
URL: http://svn.apache.org/viewvc?rev=724507&view=rev
Log:
Some IDE warning cleanup (which helps understanding of these classes)
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/i18n/AddressingMessages.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.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
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/HandlerDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterInclude.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Deployable.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SessionUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Mon Dec 8 14:01:35 2008
@@ -19,8 +19,15 @@
package org.apache.axis2.engine;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.util.List;
+
+import javax.xml.stream.XMLStreamException;
+
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
@@ -43,11 +50,6 @@
import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.wsdl.WSDLConstants;
-import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.util.ArrayList;
-
public class FaultHandlingTest extends UtilServerBasedTestCase implements TestConstants {
protected String testResourceDir = "test-resources";
@@ -58,7 +60,7 @@
protected void setUp() throws Exception {
ConfigurationContext configurationContext = UtilServer.getConfigurationContext();
- ArrayList inPhasesUptoAndIncludingPostDispatch =
+ List inPhasesUptoAndIncludingPostDispatch =
configurationContext.getAxisConfiguration().getInFlowPhases();
Phase phaseOne = (Phase)inPhasesUptoAndIncludingPostDispatch.get(0);
phaseOne.addHandler(new FaultHandler());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java Mon Dec 8 14:01:35 2008
@@ -84,7 +84,7 @@
super.setUp();
testResults = new ArrayList();
- ArrayList globalInPhases =
+ List globalInPhases =
serverConfig.getAxisConfiguration().getInFlowPhases();
for (int i = 0; i < globalInPhases.size(); i++) {
Phase globalInPhase = (Phase)globalInPhases.get(i);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java Mon Dec 8 14:01:35 2008
@@ -19,8 +19,21 @@
package org.apache.axis2.engine;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
@@ -39,18 +52,6 @@
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.util.Utils;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
public class PausingHandlerExecutionTest extends UtilServerBasedTestCase implements TestConstants {
private static boolean initDone = false;
private static ArrayList testResults;
@@ -79,7 +80,7 @@
if (!initDone) {
initDone = true;
- ArrayList globalInPhases =
+ List globalInPhases =
UtilServer.getConfigurationContext().getAxisConfiguration().getInFlowPhases();
for (int i = 0; i < globalInPhases.size(); i++) {
Phase globalInPhase = (Phase)globalInPhases.get(i);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/i18n/AddressingMessages.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/i18n/AddressingMessages.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/i18n/AddressingMessages.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/i18n/AddressingMessages.java Mon Dec 8 14:01:35 2008
@@ -34,7 +34,7 @@
public class AddressingMessages {
//Only this changes from the original class
- private static Class thisClass = AddressingMessages.class;
+ private static Class<AddressingMessages> thisClass = AddressingMessages.class;
private static final String projectName = MessagesConstants.projectName;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java Mon Dec 8 14:01:35 2008
@@ -20,6 +20,12 @@
package org.apache.axis2.context;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.ClusterManager;
import org.apache.axis2.clustering.context.Replicator;
@@ -28,12 +34,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
/**
* This is the top most level of the Context hierarchy and is a bag of properties.
*/
@@ -53,8 +53,8 @@
protected long lastTouchedTime;
protected transient AbstractContext parent;
- protected transient Map properties;
- private transient Map propertyDifferences;
+ protected transient Map<String, Object> properties;
+ private transient Map<String, Object> propertyDifferences;
protected AbstractContext(AbstractContext parent) {
this.parent = parent;
@@ -93,7 +93,7 @@
* @deprecated Use {@link #getPropertyNames()}, {@link #getProperty(String)},
* {@link #setProperty(String, Object)} & {@link #removeProperty(String)}instead.
*/
- public Map getProperties() {
+ public Map<String, Object> getProperties() {
initPropertiesMap();
return properties;
}
@@ -104,15 +104,15 @@
*
* @return Iterator over a collection of keys
*/
- public Iterator getPropertyNames() {
+ public Iterator<String> getPropertyNames() {
initPropertiesMap();
- HashSet copyKeySet = null;
+ HashSet<String> copyKeySet = null;
// Lock the table in a try/catch so it will always be unlocked in the finally block
try {
- ((HashMapUpdateLockable) properties).lockForUpdate();
- copyKeySet = new HashSet(properties.keySet());
+ ((HashMapUpdateLockable<String, Object>) properties).lockForUpdate();
+ copyKeySet = new HashSet<String>(properties.keySet());
} finally {
- ((HashMapUpdateLockable) properties).unlockForUpdate();
+ ((HashMapUpdateLockable<String, Object>) properties).unlockForUpdate();
}
return (copyKeySet != null) ? copyKeySet.iterator() : null;
}
@@ -197,7 +197,7 @@
synchronized(this) {
// Lazizly create propertyDifferences map
if (propertyDifferences == null) {
- propertyDifferences = new HashMap(DEFAULT_MAP_SIZE);
+ propertyDifferences = new HashMap<String, Object>(DEFAULT_MAP_SIZE);
}
propertyDifferences.put(key, new PropertyDifference(key, value, isRemoved));
}
@@ -276,9 +276,9 @@
*
* @return The property differences
*/
- public synchronized Map getPropertyDifferences() {
+ public synchronized Map<String, Object> getPropertyDifferences() {
if (propertyDifferences == null) {
- propertyDifferences = new HashMap(DEFAULT_MAP_SIZE);
+ propertyDifferences = new HashMap<String, Object>(DEFAULT_MAP_SIZE);
}
return propertyDifferences;
}
@@ -309,7 +309,7 @@
*
* @param properties
*/
- public void setProperties(Map properties) {
+ public void setProperties(Map<String, Object> properties) {
if (properties == null) {
this.properties = null;
} else {
@@ -321,9 +321,9 @@
if (this.properties != properties) {
if (DEBUG_ENABLED) {
- for (Iterator iterator = properties.entrySet().iterator();
+ for (Iterator<Entry<String, Object>> iterator = properties.entrySet().iterator();
iterator.hasNext();) {
- Entry entry = (Entry) iterator.next();
+ Entry<String, Object> entry = iterator.next();
debugPropertySet((String) entry.getKey(), entry.getValue());
}
@@ -332,7 +332,7 @@
// The Map we got argument is probably NOT an instance of the Concurrent
// map we use to store properties, so create a new one using the values from the
// argument map.
- this.properties = new HashMapUpdateLockable(properties);
+ this.properties = new HashMapUpdateLockable<String, Object>(properties);
}
}
}
@@ -343,12 +343,12 @@
*
* @param props The table of properties to copy
*/
- public void mergeProperties(Map props) {
+ public void mergeProperties(Map<String, Object> props) {
if (props != null) {
initPropertiesMap();
- for (Iterator iterator = props.keySet().iterator();
+ for (Iterator<String> iterator = props.keySet().iterator();
iterator.hasNext();) {
- Object key = iterator.next();
+ String key = iterator.next();
Object value = props.get(key);
this.properties.put(key, value);
if (DEBUG_ENABLED) {
@@ -428,7 +428,7 @@
// This needs to be a concurrent collection to prevent ConcurrentModificationExcpetions
// for async-on-the-wire. It was originally:
// properties = new HashMap(DEFAULT_MAP_SIZE);
- properties = new HashMapUpdateLockable(DEFAULT_MAP_SIZE);
+ properties = new HashMapUpdateLockable<String, Object>(DEFAULT_MAP_SIZE);
}
}
}
@@ -438,7 +438,7 @@
* will block if the collection is locked. They will be released when the collection is unlocked.
* Methods that do not update the collection will not be blocked.
*/
-class HashMapUpdateLockable extends HashMap {
+class HashMapUpdateLockable<K, V> extends HashMap<K, V> {
// Used for synchronization during update locking. Also indicates if the table is locked.
// Initially, it is not locked.
@@ -451,7 +451,7 @@
super(size);
}
- HashMapUpdateLockable(Map map) {
+ HashMapUpdateLockable(Map<K, V> map) {
super(map);
}
@@ -459,7 +459,7 @@
* Similar to super method but will block if collection is locked.
* @see java.util.HashMap#put(java.lang.Object, java.lang.Object)
*/
- public Object put(Object key, Object value) {
+ public V put(K key, V value) {
checkUpdateLock(true);
return super.put(key, value);
}
@@ -468,7 +468,7 @@
* Similar to super method but will block if collection is locked.
* @see java.util.HashMap#putAll(java.util.Map)
*/
- public void putAll(Map map) {
+ public void putAll(Map<? extends K, ? extends V> map) {
checkUpdateLock(true);
super.putAll(map);
}
@@ -477,7 +477,7 @@
* Similar to super method but will block if collection is locked.
* @see java.util.HashMap#remove(java.lang.Object)
*/
- public Object remove(Object key) {
+ public V remove(Object key) {
checkUpdateLock(true);
return super.remove(key);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Mon Dec 8 14:01:35 2008
@@ -68,9 +68,9 @@
private static final Log log = LogFactory.getLog(ConfigurationContext.class);
/** Map containing <code>MessageID</code> to <code>OperationContext</code> mapping. */
- private final ConcurrentHashMap operationContextMap = new ConcurrentHashMap();
- private final Hashtable serviceGroupContextMap = new Hashtable();
- private Hashtable applicationSessionServiceGroupContexts = new Hashtable();
+ private final ConcurrentHashMap<String, OperationContext> operationContextMap = new ConcurrentHashMap<String, OperationContext>();
+ private final Hashtable<String, ServiceGroupContext> serviceGroupContextMap = new Hashtable<String, ServiceGroupContext>();
+ private Hashtable<String, ServiceGroupContext> applicationSessionServiceGroupContexts = new Hashtable<String, ServiceGroupContext>();
private AxisConfiguration axisConfiguration;
private ThreadFactory threadPool;
//To keep TransportManager instance
@@ -84,7 +84,7 @@
private String servicePath;
private String cachedServicePath = null;
- protected List contextListeners;
+ protected List<ContextListener> contextListeners;
/**
* Constructor
@@ -180,7 +180,7 @@
*/
public void addContextListener(ContextListener contextListener) {
if (contextListeners == null) {
- contextListeners = new ArrayList();
+ contextListeners = new ArrayList<ContextListener>();
}
contextListeners.add(contextListener);
}
@@ -331,8 +331,8 @@
if (log.isDebugEnabled()) {
log.debug("registerOperationContext (" + override + "): " +
mepContext + " with key: " + messageID);
- HashMap msgContextMap = mepContext.getMessageContexts();
- Iterator msgContextIterator = msgContextMap.values().iterator();
+ HashMap<String, MessageContext> msgContextMap = mepContext.getMessageContexts();
+ Iterator<MessageContext> msgContextIterator = msgContextMap.values().iterator();
while (msgContextIterator.hasNext()) {
MessageContext msgContext = (MessageContext)msgContextIterator.next();
log.debug("msgContext: " + msgContext + " action: " + msgContext.getWSAAction());
@@ -384,7 +384,7 @@
public void addServiceGroupContextIntoApplicationScopeTable
(ServiceGroupContext serviceGroupContext) {
if (applicationSessionServiceGroupContexts == null) {
- applicationSessionServiceGroupContexts = new Hashtable();
+ applicationSessionServiceGroupContexts = new Hashtable<String, ServiceGroupContext>();
}
applicationSessionServiceGroupContexts.put(
serviceGroupContext.getDescription().getServiceGroupName(), serviceGroupContext);
@@ -444,7 +444,7 @@
// group name is not necessarily a prereq
// but if the group name is non-null, then it has to match
- Iterator it = operationContextMap.values().iterator();
+ Iterator<OperationContext> it = operationContextMap.values().iterator();
while (it.hasNext()) {
OperationContext value = (OperationContext)it.next();
@@ -603,7 +603,7 @@
* @return The ServiceGroupContexts
* @deprecated Use {@link #getServiceGroupContextIDs} & {@link #getServiceGroupContext(String)}
*/
- public Hashtable getServiceGroupContexts() {
+ public Hashtable<String, ServiceGroupContext> getServiceGroupContexts() {
return serviceGroupContextMap;
}
@@ -665,7 +665,7 @@
long currentTime = new Date().getTime();
synchronized (serviceGroupContextMap) {
- for (Iterator sgCtxtMapKeyIter = serviceGroupContextMap.keySet().iterator();
+ for (Iterator<String> sgCtxtMapKeyIter = serviceGroupContextMap.keySet().iterator();
sgCtxtMapKeyIter.hasNext();) {
String sgCtxtId = (String)sgCtxtMapKeyIter.next();
ServiceGroupContext serviceGroupContext =
@@ -702,7 +702,7 @@
if (serviceGroupContext == null) {
return;
}
- Iterator serviceContextIter = serviceGroupContext.getServiceContexts();
+ Iterator<ServiceContext> serviceContextIter = serviceGroupContext.getServiceContexts();
if (serviceContextIter == null) {
return;
}
@@ -755,8 +755,8 @@
Constants.Configuration.ARTIFACTS_TEMP_DIR);
if (tempFile == null) {
String property = (String)AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ new PrivilegedAction<String>() {
+ public String run() {
return System.getProperty("java.io.tmpdir");
}
}
@@ -768,16 +768,16 @@
private void deleteTempFiles(final File dir) {
Boolean isDir = (Boolean)AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ new PrivilegedAction<Boolean>() {
+ public Boolean run() {
return dir.isDirectory();
}
}
);
if (isDir) {
String[] children = (String[])AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ new PrivilegedAction<String[]>() {
+ public String[] run() {
return dir.list();
}
}
@@ -787,7 +787,7 @@
}
}
AccessController.doPrivileged(
- new PrivilegedAction() {
+ new PrivilegedAction<Object>() {
public Object run() {
dir.delete();
return null;
@@ -904,8 +904,8 @@
return;
}
- ArrayList toBeRemovedList = new ArrayList();
- Iterator serviceGroupContexts = serviceGroupContextMap.values().iterator();
+ ArrayList<String> toBeRemovedList = new ArrayList<String>();
+ Iterator<ServiceGroupContext> serviceGroupContexts = serviceGroupContextMap.values().iterator();
while (serviceGroupContexts.hasNext()) {
ServiceGroupContext serviceGroupContext =
(ServiceGroupContext)serviceGroupContexts.next();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java Mon Dec 8 14:01:35 2008
@@ -265,7 +265,7 @@
} else {
fileName = axisModule.getName();
}
- configuration.getFaultyModules().put(fileName, faultyModule.get(axisModule));
+ configuration.getFaultyModules().put(fileName, faultyModule.get(axisModule).toString());
//removing from original list
configuration.removeModule(axisModule.getName(), axisModule.getName());
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Mon Dec 8 14:01:35 2008
@@ -152,7 +152,7 @@
/**
* A place to store the current MessageContext
*/
- public static ThreadLocal currentMessageContext = new ThreadLocal();
+ public static ThreadLocal<MessageContext> currentMessageContext = new ThreadLocal<MessageContext>();
public static MessageContext getCurrentMessageContext() {
return (MessageContext) currentMessageContext.get();
@@ -276,12 +276,12 @@
/**
* @serial The chain of Handlers/Phases for processing this message
*/
- private ArrayList executionChain;
+ private ArrayList<Handler> executionChain;
/**
* @serial The chain of executed Handlers/Phases from processing
*/
- private LinkedList executedPhases;
+ private LinkedList<Handler> executedPhases;
/**
* @serial Flag to indicate if we are doing REST
@@ -412,7 +412,7 @@
* Note that this list is not explicitly saved by the MessageContext, but
* rather through the SelfManagedDataManager interface implemented by handlers
*/
- private transient LinkedHashMap selfManagedDataMap = null;
+ private transient LinkedHashMap<String, Object> selfManagedDataMap = null;
//-------------------------------------------------------------------------
// MetaData for data to be restored in activate() after readExternal()
@@ -435,19 +435,19 @@
* is available, so we have to hold the data from readExternal until
* activate is called.
*/
- private transient ArrayList selfManagedDataListHolder = null;
+ private transient ArrayList<SelfManagedDataHolder> selfManagedDataListHolder = null;
/**
* The ordered list of metadata for handlers/phases
* used during re-constitution of the message context
*/
- private transient ArrayList metaExecutionChain = null;
+ private transient ArrayList<MetaDataEntry> metaExecutionChain = null;
/**
* The ordered list of metadata for executed phases
* used during re-constitution of the message context
*/
- private transient LinkedList metaExecuted = null;
+ private transient LinkedList<MetaDataEntry> metaExecuted = null;
/**
* Index into the executuion chain of the currently executing handler
@@ -621,7 +621,7 @@
return envelope;
}
- public ArrayList getExecutionChain() {
+ public ArrayList<Handler> getExecutionChain() {
if (LoggingControl.debugLoggingAllowed) {
checkActivateWarning("getExecutionChain");
}
@@ -636,7 +636,7 @@
*/
public void addExecutedPhase(Handler phase) {
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<Handler>();
}
executedPhases.addFirst(phase);
}
@@ -655,12 +655,12 @@
*
* @return An Iterator over the LIFO data structure.
*/
- public Iterator getExecutedPhases() {
+ public Iterator<Handler> getExecutedPhases() {
if (LoggingControl.debugLoggingAllowed) {
checkActivateWarning("getExecutedPhases");
}
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<Handler>();
}
return executedPhases.iterator();
}
@@ -673,7 +673,7 @@
*/
public void resetExecutedPhases() {
executedPhasesReset = true;
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<Handler>();
}
/**
@@ -994,8 +994,8 @@
* @return An unmodifiable map containing the combination of all available
* properties or an empty map.
*/
- public Map getProperties() {
- final Map resultMap = new HashMap();
+ public Map<String, Object> getProperties() {
+ final Map<String, Object> resultMap = new HashMap<String, Object>();
// My own context hierarchy may not all be present. So look for whatever
// nearest level is present and add the properties
@@ -1325,7 +1325,7 @@
*
* @param executionChain
*/
- public void setExecutionChain(ArrayList executionChain) {
+ public void setExecutionChain(ArrayList<Handler> executionChain) {
this.executionChain = executionChain;
currentHandlerIndex = -1;
currentPhaseIndex = 0;
@@ -1808,7 +1808,7 @@
*/
public void setSelfManagedData(Class clazz, Object key, Object value) {
if (selfManagedDataMap == null) {
- selfManagedDataMap = new LinkedHashMap();
+ selfManagedDataMap = new LinkedHashMap<String, Object>();
}
// make sure we have a unique key and a delimiter so we can
@@ -1864,13 +1864,13 @@
* @param map users should pass null as this is just a holder for the recursion
* @return a list of unigue object instances
*/
- private ArrayList flattenPhaseListToHandlers(ArrayList list, LinkedHashMap map) {
+ private ArrayList<Handler> flattenPhaseListToHandlers(ArrayList<Handler> list, LinkedHashMap<String, Handler> map) {
if (map == null) {
- map = new LinkedHashMap();
+ map = new LinkedHashMap<String, Handler>();
}
- Iterator it = list.iterator();
+ Iterator<Handler> it = list.iterator();
while (it.hasNext()) {
Handler handler = (Handler) it.next();
@@ -1890,7 +1890,7 @@
}
if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
- Iterator it2 = map.keySet().iterator();
+ Iterator<String> it2 = map.keySet().iterator();
while (it2.hasNext()) {
Object key = it2.next();
Handler value = (Handler) map.get(key);
@@ -1901,7 +1901,7 @@
}
- return new ArrayList(map.values());
+ return new ArrayList<Handler>(map.values());
}
@@ -1913,13 +1913,13 @@
* @param map users should pass null as this is just a holder for the recursion
* @return a list of unigue object instances
*/
- private ArrayList flattenHandlerList(List list, LinkedHashMap map) {
+ private ArrayList<Handler> flattenHandlerList(List<Handler> list, LinkedHashMap<String, Handler> map) {
if (map == null) {
- map = new LinkedHashMap();
+ map = new LinkedHashMap<String, Handler>();
}
- Iterator it = list.iterator();
+ Iterator<Handler> it = list.iterator();
while (it.hasNext()) {
Handler handler = (Handler) it.next();
@@ -1941,7 +1941,7 @@
}
}
- return new ArrayList(map.values());
+ return new ArrayList<Handler>(map.values());
}
@@ -1971,10 +1971,10 @@
}
// let's create a temporary list with the handlers
- ArrayList flatExecChain = flattenPhaseListToHandlers(executionChain, null);
+ ArrayList<Handler> flatExecChain = flattenPhaseListToHandlers(executionChain, null);
//ArrayList selfManagedDataHolderList = serializeSelfManagedDataHelper(flatExecChain.iterator(), new ArrayList());
- ArrayList selfManagedDataHolderList = serializeSelfManagedDataHelper(flatExecChain);
+ ArrayList<SelfManagedDataHolder> selfManagedDataHolderList = serializeSelfManagedDataHelper(flatExecChain);
if (selfManagedDataHolderList.size() == 0) {
out.writeBoolean(ExternalizeConstants.EMPTY_OBJECT);
@@ -2016,9 +2016,9 @@
* @param handlers
* @return ArrayList
*/
- private ArrayList serializeSelfManagedDataHelper(ArrayList handlers) {
- ArrayList selfManagedDataHolderList = new ArrayList();
- Iterator it = handlers.iterator();
+ private ArrayList<SelfManagedDataHolder> serializeSelfManagedDataHelper(ArrayList<Handler> handlers) {
+ ArrayList<SelfManagedDataHolder> selfManagedDataHolderList = new ArrayList<SelfManagedDataHolder>();
+ Iterator<Handler> it = handlers.iterator();
try {
while (it.hasNext()) {
@@ -2090,7 +2090,7 @@
* @param qNameAsString The QName in string form
* @return SelfManagedDataManager handler
*/
- private SelfManagedDataManager deserialize_getHandlerFromExecutionChain(Iterator it,
+ private SelfManagedDataManager deserialize_getHandlerFromExecutionChain(Iterator<Handler> it,
String classname,
String qNameAsString) {
SelfManagedDataManager handler_toreturn = null;
@@ -2309,7 +2309,7 @@
// match the current index with the actual saved list
int nextIndex = 0;
- Iterator i = executionChain.iterator();
+ Iterator<Handler> i = executionChain.iterator();
while (i.hasNext()) {
Object obj = i.next();
@@ -2416,7 +2416,7 @@
int execNextIndex = 0;
- Iterator iterator = executedPhases.iterator();
+ Iterator<Handler> iterator = executedPhases.iterator();
while (iterator.hasNext()) {
Object obj = iterator.next();
@@ -2911,7 +2911,7 @@
}
// setup the list
- metaExecutionChain = new ArrayList();
+ metaExecutionChain = new ArrayList<MetaDataEntry>();
// process the objects
boolean keepGoing = true;
@@ -3058,7 +3058,7 @@
}
// setup the list
- metaExecuted = new LinkedList();
+ metaExecuted = new LinkedList<MetaDataEntry>();
// process the objects
boolean keepGoing = true;
@@ -3365,13 +3365,13 @@
selfManagedDataHandlerCount = in.readInt();
if (selfManagedDataListHolder == null) {
- selfManagedDataListHolder = new ArrayList();
+ selfManagedDataListHolder = new ArrayList<SelfManagedDataHolder>();
} else {
selfManagedDataListHolder.clear();
}
for (int i = 0; i < selfManagedDataHandlerCount; i++) {
- selfManagedDataListHolder.add(in.readObject());
+ selfManagedDataListHolder.add((SelfManagedDataHolder) in.readObject());
}
}
@@ -3623,7 +3623,7 @@
}
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<Handler>();
}
@@ -3851,7 +3851,7 @@
}
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<Handler>();
}
//-------------------------------------------------------
@@ -3869,34 +3869,34 @@
* @param metaDataEntries ArrayList of MetaDataEntry objects
* @return ArrayList of Handlers based on our list of handlers from the reconstituted deserialized list, and the existing handlers in the AxisConfiguration object. May return null.
*/
- private ArrayList restoreHandlerList(ArrayList metaDataEntries) {
+ private ArrayList<Handler> restoreHandlerList(ArrayList<MetaDataEntry> metaDataEntries) {
AxisConfiguration axisConfig = configurationContext.getAxisConfiguration();
- ArrayList existingHandlers = null;
+ List<Handler> existingHandlers = new ArrayList<Handler>();
// TODO: I'm using clone for the ArrayList returned from axisConfig object.
// Does it do a deep clone of the Handlers held there? Does it matter?
switch (FLOW) {
case IN_FLOW:
- existingHandlers = (ArrayList) axisConfig.getInFlowPhases().clone();
+ existingHandlers.addAll(axisConfig.getInFlowPhases());
break;
case OUT_FLOW:
- existingHandlers = (ArrayList) axisConfig.getOutFlowPhases().clone();
+ existingHandlers.addAll(axisConfig.getOutFlowPhases());
break;
case IN_FAULT_FLOW:
- existingHandlers = (ArrayList) axisConfig.getInFaultFlowPhases().clone();
+ existingHandlers.addAll(axisConfig.getInFaultFlowPhases());
break;
case OUT_FAULT_FLOW:
- existingHandlers = (ArrayList) axisConfig.getOutFaultFlowPhases().clone();
+ existingHandlers.addAll(axisConfig.getOutFaultFlowPhases());
break;
}
existingHandlers = flattenHandlerList(existingHandlers, null);
- ArrayList handlerListToReturn = new ArrayList();
+ ArrayList<Handler> handlerListToReturn = new ArrayList<Handler>();
for (int i = 0; i < metaDataEntries.size(); i++) {
Handler handler = (Handler) ActivateUtils
@@ -3921,16 +3921,16 @@
* @param metaDataEntries Linked list of MetaDataEntry objects
* @return LinkedList of objects or NULL if none available
*/
- private LinkedList restoreExecutedList(LinkedList base, LinkedList metaDataEntries) {
+ private LinkedList<Handler> restoreExecutedList(LinkedList<Handler> base, LinkedList<MetaDataEntry> metaDataEntries) {
if (metaDataEntries == null) {
return base;
}
// get a list of existing handler/phase objects for the restored objects
- ArrayList tmpMetaDataList = new ArrayList(metaDataEntries);
+ ArrayList<MetaDataEntry> tmpMetaDataList = new ArrayList<MetaDataEntry>(metaDataEntries);
- ArrayList existingList = restoreHandlerList(tmpMetaDataList);
+ ArrayList<Handler> existingList = restoreHandlerList(tmpMetaDataList);
if ((existingList == null) || (existingList.isEmpty())) {
return base;
@@ -3938,7 +3938,7 @@
// set up a list to return
- LinkedList returnedList = new LinkedList();
+ LinkedList<Handler> returnedList = new LinkedList<Handler>();
if (base != null) {
returnedList.addAll(base);
@@ -3959,7 +3959,7 @@
*/
private void setupPhaseList(Phase phase, MetaDataEntry mdPhase) {
// get the list from the phase object
- List handlers = phase.getHandlers();
+ List<Handler> handlers = phase.getHandlers();
if (handlers.isEmpty()) {
// done, make sure there is no list in the given meta data
@@ -3973,7 +3973,7 @@
if (listSize > 0) {
- Iterator i = handlers.iterator();
+ Iterator<Handler> i = handlers.iterator();
while (i.hasNext()) {
Object obj = i.next();
@@ -4189,11 +4189,11 @@
isSOAP11 = t;
}
- public void setExecutedPhasesExplicit(LinkedList inb) {
+ public void setExecutedPhasesExplicit(LinkedList<Handler> inb) {
executedPhases = inb;
}
- public void setSelfManagedDataMapExplicit(LinkedHashMap map) {
+ public void setSelfManagedDataMapExplicit(LinkedHashMap<String, Object> map) {
selfManagedDataMap = map;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Mon Dec 8 14:01:35 2008
@@ -120,7 +120,7 @@
/**
* the set of message contexts associated with this operation
*/
- private transient HashMap messageContexts;
+ private transient HashMap<String, MessageContext> messageContexts;
//----------------------------------------------------------------
// MetaData for data to be restored in activate after readExternal
@@ -186,7 +186,7 @@
*/
public OperationContext() {
super(null);
- this.messageContexts = new HashMap();
+ this.messageContexts = new HashMap<String, MessageContext>();
}
/**
@@ -200,7 +200,7 @@
public OperationContext(AxisOperation axisOperation,
ServiceContext serviceContext) {
super(serviceContext);
- this.messageContexts = new HashMap();
+ this.messageContexts = new HashMap<String, MessageContext>();
this.axisOperation = axisOperation;
this.setParent(serviceContext);
}
@@ -298,7 +298,7 @@
}
- public HashMap getMessageContexts() {
+ public HashMap<String, MessageContext> getMessageContexts() {
return messageContexts;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java Mon Dec 8 14:01:35 2008
@@ -567,7 +567,7 @@
public void putContextProperties(ServiceContext context, boolean doParentProperties) {
if (context != null) {
// get the current properties on this context object
- Map props = getProperties();
+ Map<String, Object> props = getProperties();
// copy them to the specified context object
context.mergeProperties(props);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java Mon Dec 8 14:01:35 2008
@@ -79,7 +79,7 @@
private transient AxisServiceGroup axisServiceGroup;
private String id;
- private Map serviceContextMap;
+ private Map<String, ServiceContext> serviceContextMap;
//----------------------------------------------------------------
// MetaData for data to be restored in activate after readExternal
@@ -105,14 +105,14 @@
// simple constructor
public ServiceGroupContext() {
super(null);
- serviceContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
}
public ServiceGroupContext(ConfigurationContext parent, AxisServiceGroup axisServiceGroup) {
super(parent);
this.axisServiceGroup = axisServiceGroup;
- serviceContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
// initially set the id to the axisServiceGroup
if (axisServiceGroup != null) {
setId(axisServiceGroup.getServiceGroupName());
@@ -145,7 +145,7 @@
axisServiceGroup.getServiceGroupName()));
}
if (serviceContextMap == null) {
- serviceContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
}
ServiceContext serviceContext = (ServiceContext) serviceContextMap.get(service.getName());
if (serviceContext == null) {
@@ -156,9 +156,9 @@
return serviceContext;
}
- public Iterator getServiceContexts() {
+ public Iterator<ServiceContext> getServiceContexts() {
if (serviceContextMap == null) {
- serviceContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
}
if (serviceContextMap.isEmpty()) {
return null;
@@ -189,7 +189,7 @@
}
if (serviceContextMap == null) {
- serviceContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
}
serviceContextMap.put(axisService.getName(), srvctx);
@@ -247,7 +247,7 @@
public void putContextProperties(ServiceGroupContext context) {
if (context != null) {
// get the current properties on this context object
- Map props = getProperties();
+ Map<String, Object> props = getProperties();
// copy them to the specified context object
context.mergeProperties(props);
@@ -401,7 +401,7 @@
//---------------------------------------------------------
// other
//---------------------------------------------------------
- serviceContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
//---------------------------------------------------------
// done
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java Mon Dec 8 14:01:35 2008
@@ -72,8 +72,8 @@
// TODO: investigate whether these collections need to be saved
- private transient Map serviceContextMap = new HashMap();
- private transient Map serviceGroupContextMap = new HashMap();
+ private transient Map<String, ServiceContext> serviceContextMap = new HashMap<String, ServiceContext>();
+ private transient Map<String, ServiceGroupContext> serviceGroupContextMap = new HashMap<String, ServiceGroupContext>();
private String cookieID;
@@ -141,7 +141,7 @@
return lastTouchedTime;
}
- public Iterator getServiceGroupContext() {
+ public Iterator<ServiceGroupContext> getServiceGroupContext() {
if (serviceGroupContextMap != null) {
if (serviceGroupContextMap.isEmpty()) {
return null;
@@ -155,7 +155,7 @@
protected void finalize() throws Throwable {
super.finalize();
if (serviceGroupContextMap != null && !serviceGroupContextMap.isEmpty()) {
- Iterator valuse = serviceGroupContextMap.values().iterator();
+ Iterator<ServiceGroupContext> valuse = serviceGroupContextMap.values().iterator();
while (valuse.hasNext()) {
ServiceGroupContext serviceGroupContext = (ServiceGroupContext) valuse.next();
cleanupServiceContextes(serviceGroupContext);
@@ -164,7 +164,7 @@
}
private void cleanupServiceContextes(ServiceGroupContext serviceGroupContext) {
- Iterator serviceContecxtes = serviceGroupContext.getServiceContexts();
+ Iterator<ServiceContext> serviceContecxtes = serviceGroupContext.getServiceContexts();
while (serviceContecxtes.hasNext()) {
ServiceContext serviceContext = (ServiceContext) serviceContecxtes.next();
DependencyManager.destroyServiceObject(serviceContext);
@@ -288,8 +288,8 @@
// done
//---------------------------------------------------------
- serviceContextMap = new HashMap();
- serviceGroupContextMap = new HashMap();
+ serviceContextMap = new HashMap<String, ServiceContext>();
+ serviceGroupContextMap = new HashMap<String, ServiceGroupContext>();
}
public ConfigurationContext getRootContext() {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java Mon Dec 8 14:01:35 2008
@@ -19,6 +19,16 @@
package org.apache.axis2.context.externalize;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -32,14 +42,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.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
/**
* Some Externalize objects must be "activated" after they are read.
@@ -387,7 +389,7 @@
* (could be a derived class)
* @return the Handler object that matches the criteria
*/
- public static Object findHandler(ArrayList existingHandlers, MetaDataEntry metaDataEntry) //String handlerClassName)
+ public static Object findHandler(List<Handler> existingHandlers, MetaDataEntry metaDataEntry) //String handlerClassName)
{
String title = "ObjectStateUtils:findHandler(): ";
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=724507&r1=724506&r2=724507&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 Mon Dec 8 14:01:35 2008
@@ -47,7 +47,7 @@
this.axisConfig = this.configCtx.getAxisConfiguration();
}
- public ArrayList populateServiceGroup(AxisServiceGroup axisServiceGroup)
+ public ArrayList<AxisService> populateServiceGroup(AxisServiceGroup axisServiceGroup)
throws DeploymentException {
ArrayList serviceList = new ArrayList();
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=724507&r1=724506&r2=724507&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 Mon Dec 8 14:01:35 2008
@@ -68,8 +68,8 @@
public class ArchiveReader implements DeploymentConstants {
private static final Log log = LogFactory.getLog(ArchiveReader.class);
- public ArrayList buildServiceGroup(InputStream zin, DeploymentFileData currentFile,
- AxisServiceGroup axisServiceGroup, HashMap wsdlServices,
+ public ArrayList<AxisService> buildServiceGroup(InputStream zin, DeploymentFileData currentFile,
+ AxisServiceGroup axisServiceGroup, HashMap<String, AxisService> wsdlServices,
ConfigurationContext configCtx)
throws XMLStreamException, AxisFault {
@@ -101,7 +101,7 @@
serviceBuilder.setWsdlServiceMap(wsdlServices);
AxisService service = serviceBuilder.populateService(rootElement);
- ArrayList serviceList = new ArrayList();
+ ArrayList<AxisService> serviceList = new ArrayList<AxisService>();
serviceList.add(service);
return serviceList;
} else if (TAG_SERVICE_GROUP.equals(elementName)) {
@@ -118,15 +118,15 @@
* @param filename
* @param axisServiceGroup
* @param extractService
- * @param wsdls
+ * @param wsdlServices
* @param configCtx
* @return Returns ArrayList.
* @throws DeploymentException
*/
- public ArrayList processServiceGroup(String filename, DeploymentFileData currentFile,
+ public ArrayList<AxisService> processServiceGroup(String filename, DeploymentFileData currentFile,
AxisServiceGroup axisServiceGroup,
boolean extractService,
- HashMap wsdls,
+ HashMap<String, AxisService> wsdlServices,
ConfigurationContext configCtx)
throws AxisFault {
// get attribute values
@@ -141,7 +141,7 @@
if (entry.getName().equalsIgnoreCase(SERVICES_XML)) {
axisServiceGroup.setServiceGroupName(
DescriptionBuilder.getShortFileName(currentFile.getName()));
- return buildServiceGroup(zin, currentFile, axisServiceGroup, wsdls,
+ return buildServiceGroup(zin, currentFile, axisServiceGroup, wsdlServices,
configCtx);
}
}
@@ -176,7 +176,7 @@
try {
in = new FileInputStream(file);
axisServiceGroup.setServiceGroupName(currentFile.getName());
- return buildServiceGroup(in, currentFile, axisServiceGroup, wsdls, configCtx);
+ return buildServiceGroup(in, currentFile, axisServiceGroup, wsdlServices, configCtx);
} catch (FileNotFoundException e) {
throw new DeploymentException(
Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND,
@@ -208,7 +208,7 @@
* @return Returns AxisService.
* @throws DeploymentException
*/
- private List processWSDLFile(WSDLToAxisServiceBuilder axisServiceBuilder,
+ private List<AxisService> processWSDLFile(WSDLToAxisServiceBuilder axisServiceBuilder,
File serviceArchiveFile,
boolean isArchive, InputStream in, String baseURI)
throws DeploymentException {
@@ -269,11 +269,11 @@
* @param file <code>ArchiveFileData</code>
* @throws DeploymentException <code>DeploymentException</code>
*/
- public HashMap processWSDLs(DeploymentFileData file)
+ public HashMap<String, AxisService> processWSDLs(DeploymentFileData file)
throws DeploymentException {
File serviceFile = file.getFile();
// to store service come from wsdl files
- HashMap servicesMap = new HashMap();
+ HashMap<String, AxisService> servicesMap = new HashMap<String, AxisService>();
boolean isDirectory = serviceFile.isDirectory();
if (isDirectory) {
try {
@@ -353,7 +353,7 @@
} else {
throw new DeploymentException(Messages.getMessage("invalidWSDLFound"));
}
- List services = processWSDLFile(wsdlToAxisServiceBuilder,
+ List<AxisService> services = processWSDLFile(wsdlToAxisServiceBuilder,
serviceFile, true,
new ByteArrayInputStream(
out.toByteArray()),
@@ -390,7 +390,7 @@
return servicesMap;
}
- public List getAxisServiceFromWsdl(InputStream in,
+ public List<AxisService> getAxisServiceFromWsdl(InputStream in,
ClassLoader loader, String wsdlUrl) throws Exception {
// ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
@@ -434,7 +434,7 @@
return null;
}
- public void processFilesInFolder(File folder, HashMap servicesMap)
+ public void processFilesInFolder(File folder, HashMap<String, AxisService> servicesMap)
throws FileNotFoundException, XMLStreamException, DeploymentException {
File files[] = folder.listFiles();
for (int i = 0; i < files.length; i++) {
@@ -466,7 +466,7 @@
}
FileInputStream in3 = new FileInputStream(file1);
- List services = processWSDLFile(wsdlToAxisServiceBuilder, file1, false,
+ List<AxisService> services = processWSDLFile(wsdlToAxisServiceBuilder, file1, false,
in2, file1.toURI().toString());
if (services != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java Mon Dec 8 14:01:35 2008
@@ -20,6 +20,12 @@
package org.apache.axis2.deployment.util;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.deployment.DeploymentErrorMsgs;
@@ -32,21 +38,17 @@
import org.apache.axis2.phaseresolver.PhaseException;
import org.apache.axis2.phaseresolver.PhaseMetadata;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Iterator;
-
public class PhasesInfo {
- private ArrayList INPhases;
- private ArrayList IN_FaultPhases;
- private ArrayList OUTPhases;
- private ArrayList OUT_FaultPhases;
+ private List<Phase> INPhases;
+ private List<Phase> IN_FaultPhases;
+ private List<Phase> OUTPhases;
+ private List<Phase> OUT_FaultPhases;
public PhasesInfo() {
- INPhases = new ArrayList();
- IN_FaultPhases = new ArrayList();
- OUTPhases = new ArrayList();
- OUT_FaultPhases = new ArrayList();
+ INPhases = new ArrayList<Phase>();
+ IN_FaultPhases = new ArrayList<Phase>();
+ OUTPhases = new ArrayList<Phase>();
+ OUT_FaultPhases = new ArrayList<Phase>();
}
/**
@@ -56,7 +58,7 @@
*/
private Phase copyPhase(Phase phase) throws DeploymentException {
Phase newPhase = new Phase(phase.getPhaseName());
- Iterator handlers = phase.getHandlers().iterator();
+ Iterator<Handler> handlers = phase.getHandlers().iterator();
while (handlers.hasNext()) {
try {
@@ -97,8 +99,8 @@
return phase;
}
- public ArrayList getGlobalInflow() throws DeploymentException {
- ArrayList globalphase = new ArrayList();
+ public List<Phase> getGlobalInflow() throws DeploymentException {
+ ArrayList<Phase> globalphase = new ArrayList<Phase>();
boolean foundDispatchPhase = false;
for (int i = 0; i < INPhases.size(); i++) {
Phase phase = (Phase) INPhases.get(i);
@@ -117,11 +119,11 @@
return globalphase;
}
- public ArrayList getGlobalOutPhaseList() throws DeploymentException {
+ public List<Phase> getGlobalOutPhaseList() throws DeploymentException {
/**
* I have assumed that PolicyDetermination and MessageProcessing are global out phase
*/
- ArrayList globalPhaseList = new ArrayList();
+ ArrayList<Phase> globalPhaseList = new ArrayList<Phase>();
boolean messageOut = false;
for (int i = 0; i < OUTPhases.size(); i++) {
@@ -139,24 +141,24 @@
return globalPhaseList;
}
- public ArrayList getINPhases() {
+ public List<Phase> getINPhases() {
return INPhases;
}
- public ArrayList getIN_FaultPhases() {
+ public List<Phase> getIN_FaultPhases() {
return IN_FaultPhases;
}
- public ArrayList getOUTPhases() {
+ public List<Phase> getOUTPhases() {
return OUTPhases;
}
- public ArrayList getOutFaultPhaseList(){
+ public List<Phase> getOutFaultPhaseList(){
return OUT_FaultPhases;
}
- public ArrayList getOUT_FaultPhases() throws DeploymentException {
- ArrayList globalPhaseList = new ArrayList();
+ public List<Phase> getOUT_FaultPhases() throws DeploymentException {
+ ArrayList<Phase> globalPhaseList = new ArrayList<Phase>();
boolean messageOut = false;
for (int i = 0; i < OUT_FaultPhases.size(); i++) {
Phase phase = (Phase) OUT_FaultPhases.get(i);
@@ -173,8 +175,8 @@
return globalPhaseList;
}
- public ArrayList getOperationInFaultPhases() throws DeploymentException {
- ArrayList operationINPhases = new ArrayList();
+ public List<Phase> getOperationInFaultPhases() throws DeploymentException {
+ ArrayList<Phase> operationINPhases = new ArrayList<Phase>();
boolean foundDispathPhase = false;
for (int i = 0; i < IN_FaultPhases.size(); i++) {
Phase phase = (Phase) IN_FaultPhases.get(i);
@@ -189,8 +191,8 @@
return operationINPhases;
}
- public ArrayList getGlobalInFaultPhases() throws DeploymentException {
- ArrayList globalInfaultphase = new ArrayList();
+ public List<Phase> getGlobalInFaultPhases() throws DeploymentException {
+ ArrayList<Phase> globalInfaultphase = new ArrayList<Phase>();
boolean foundDispatchPhase = false;
for (int i = 0; i < IN_FaultPhases.size(); i++) {
Phase phase = (Phase) IN_FaultPhases.get(i);
@@ -210,8 +212,8 @@
}
- public ArrayList getOperationInPhases() throws DeploymentException {
- ArrayList operationINPhases = new ArrayList();
+ public ArrayList<Phase> getOperationInPhases() throws DeploymentException {
+ ArrayList<Phase> operationINPhases = new ArrayList<Phase>();
boolean foundDispathPhase = false;
for (int i = 0; i < INPhases.size(); i++) {
Phase phase = (Phase) INPhases.get(i);
@@ -226,8 +228,8 @@
return operationINPhases;
}
- public ArrayList getOperationOutFaultPhases() throws DeploymentException {
- ArrayList operationFaultOutPhases = new ArrayList();
+ public ArrayList<Phase> getOperationOutFaultPhases() throws DeploymentException {
+ ArrayList<Phase> operationFaultOutPhases = new ArrayList<Phase>();
for (int i = 0; i < OUT_FaultPhases.size(); i++) {
Phase phase = (Phase) OUT_FaultPhases.get(i);
String phaseName = phase.getPhaseName();
@@ -240,8 +242,8 @@
return operationFaultOutPhases;
}
- public ArrayList getOperationOutPhases() throws DeploymentException {
- ArrayList oprationOUTPhases = new ArrayList();
+ public ArrayList<Phase> getOperationOutPhases() throws DeploymentException {
+ ArrayList<Phase> oprationOUTPhases = new ArrayList<Phase>();
for (int i = 0; i < OUTPhases.size(); i++) {
Phase phase = (Phase) OUTPhases.get(i);
@@ -255,19 +257,19 @@
return oprationOUTPhases;
}
- public void setINPhases(ArrayList INPhases) {
+ public void setINPhases(List<Phase> INPhases) {
this.INPhases = INPhases;
}
- public void setIN_FaultPhases(ArrayList IN_FaultPhases) {
+ public void setIN_FaultPhases(List<Phase> IN_FaultPhases) {
this.IN_FaultPhases = IN_FaultPhases;
}
- public void setOUTPhases(ArrayList OUTPhases) {
+ public void setOUTPhases(List<Phase> OUTPhases) {
this.OUTPhases = OUTPhases;
}
- public void setOUT_FaultPhases(ArrayList OUT_FaultPhases) {
+ public void setOUT_FaultPhases(List<Phase> OUT_FaultPhases) {
this.OUT_FaultPhases = OUT_FaultPhases;
}
@@ -276,7 +278,7 @@
try {
axisOperation.setRemainingPhasesInFlow(getOperationInPhases());
axisOperation.setPhasesOutFlow(getOperationOutPhases());
- axisOperation.setPhasesInFaultFlow(getOperationInFaultPhases());
+ axisOperation.setPhasesInFaultFlow(new ArrayList(getOperationInFaultPhases()));
axisOperation.setPhasesOutFaultFlow(getOperationOutFaultPhases());
} catch (DeploymentException e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Mon Dec 8 14:01:35 2008
@@ -19,6 +19,13 @@
package org.apache.axis2.description;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -29,12 +36,7 @@
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.neethi.Policy;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.neethi.PolicyComponent;
/**
* An AxisBinding represents a WSDL binding, and contains AxisBindingOperations.
@@ -45,9 +47,9 @@
private String type;
- private Map options;
+ private Map<String, Object> options;
- private Map faults;
+ private Map<String, AxisBindingMessage> faults;
public AxisBindingMessage getFault(String name) {
return (AxisBindingMessage) faults.get(name);
@@ -58,8 +60,8 @@
}
public AxisBinding() {
- options = new HashMap();
- faults = new HashMap();
+ options = new HashMap<String, Object>();
+ faults = new HashMap<String, AxisBindingMessage>();
}
@@ -208,7 +210,7 @@
// Populate Binding faults
if (faults != null) {
- Iterator iterator = faults.values().iterator();
+ Iterator<AxisBindingMessage> iterator = faults.values().iterator();
while (iterator.hasNext()) {
AxisBindingMessage axisBindingFault = (AxisBindingMessage)iterator.next();
OMElement omElement =
@@ -240,7 +242,7 @@
}
public Policy getEffectivePolicy() {
- ArrayList policyList = new ArrayList();
+ ArrayList<PolicyComponent> policyList = new ArrayList<PolicyComponent>();
policyList.addAll(getPolicyInclude().getAttachedPolicies());
// AxisEndpoint
@@ -270,4 +272,8 @@
public AxisEndpoint getAxisEndpoint() {
return (AxisEndpoint)parent;
}
+
+ public Iterator<AxisBindingOperation> getChildren(){
+ return (Iterator<AxisBindingOperation>) super.getChildren();
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Mon Dec 8 14:01:35 2008
@@ -42,7 +42,7 @@
private String direction;
- private Map options;
+ private Map<String, Object> options;
private AxisMessage axisMessage;
@@ -86,7 +86,7 @@
}
public AxisBindingMessage() {
- options = new HashMap();
+ options = new HashMap<String, Object>();
}
public void setProperty(String name, Object value) {
@@ -137,7 +137,7 @@
* @return The generated bindingMessage element
*/
public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns,
- OMNamespace wsoap, OMNamespace whttp, Map nameSpaceMap) {
+ OMNamespace wsoap, OMNamespace whttp, Map<String, String> nameSpaceMap) {
String property;
ArrayList list;
OMFactory omFactory = OMAbstractFactory.getOMFactory();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java Mon Dec 8 14:01:35 2008
@@ -19,6 +19,14 @@
package org.apache.axis2.description;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -29,13 +37,7 @@
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.neethi.Policy;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.neethi.PolicyComponent;
/**
* An AxisBindingOperation represents a WSDL <bindingOperation>
@@ -46,17 +48,17 @@
private QName name;
- private Map faults;
+ private Map<String, AxisBindingMessage> faults;
- private Map options;
+ private Map<String, Object> options;
public AxisBindingOperation() {
- options = new HashMap();
- faults = new HashMap();
+ options = new HashMap<String, Object>();
+ faults = new HashMap<String, AxisBindingMessage>();
}
- public ArrayList getFaults() {
- return new ArrayList(faults.values());
+ public ArrayList<AxisBindingMessage> getFaults() {
+ return new ArrayList<AxisBindingMessage>(faults.values());
}
public AxisBindingMessage getFault(String name) {
@@ -137,7 +139,7 @@
*/
public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns,
OMNamespace wsoap, OMNamespace whttp, String type,
- Map namespaceMap, String serviceName) {
+ Map<String, String> namespaceMap, String serviceName) {
String property;
OMFactory omFactory = OMAbstractFactory.getOMFactory();
OMElement bindingOpElement = omFactory.createOMElement(
@@ -247,8 +249,8 @@
// Add any fault elements
if (faults != null && faults.size() > 0) {
- Collection faultValues = faults.values();
- Iterator iterator = faultValues.iterator();
+ Collection<AxisBindingMessage> faultValues = faults.values();
+ Iterator<AxisBindingMessage> iterator = faultValues.iterator();
while (iterator.hasNext()) {
AxisBindingMessage faultMessage = (AxisBindingMessage) iterator
.next();
@@ -264,7 +266,7 @@
}
public Policy getEffectivePolicy() {
- ArrayList policyList = new ArrayList();
+ ArrayList<PolicyComponent> policyList = new ArrayList<PolicyComponent>();
PolicyInclude policyInclude;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Mon Dec 8 14:01:35 2008
@@ -56,12 +56,12 @@
private PolicySubject policySubject = null;
- private Map children;
+ private Map<Object, AxisDescription> children;
protected Map<String, AxisModule> engagedModules;
/** List of ParameterObservers who want to be notified of changes */
- protected List parameterObservers = null;
+ protected List<ParameterObserver> parameterObservers = null;
private OMFactory omFactory = OMAbstractFactory.getOMFactory();
@@ -73,13 +73,13 @@
public AxisDescription() {
parameterInclude = new ParameterIncludeImpl();
- children = new ConcurrentHashMap();
+ children = new ConcurrentHashMap<Object, AxisDescription>();
policySubject = new PolicySubject();
}
public void addParameterObserver(ParameterObserver observer) {
if (parameterObservers == null)
- parameterObservers = new ArrayList();
+ parameterObservers = new ArrayList<ParameterObserver>();
parameterObservers.add(observer);
}
@@ -161,7 +161,7 @@
return param != null && JavaUtils.isTrue(param.getValue());
}
- public ArrayList getParameters() {
+ public ArrayList<Parameter> getParameters() {
return parameterInclude.getParameters();
}
@@ -255,7 +255,7 @@
children.put(key, child);
}
- public Iterator getChildren() {
+ public Iterator<? extends AxisDescription> getChildren() {
return children.values().iterator();
}
@@ -316,19 +316,17 @@
engageModulesForPolicy(applicablePolicy, configuration);
}
- for (Iterator children = getChildren(); children.hasNext();) {
- AxisDescription child = (AxisDescription)children.next();
+ for (Iterator<? extends AxisDescription> children = getChildren(); children.hasNext();) {
+ AxisDescription child = children.next();
child.applyPolicy();
}
}
- private boolean canSupportAssertion(Assertion assertion, List moduleList) {
+ private boolean canSupportAssertion(Assertion assertion, List<AxisModule> moduleList) {
- AxisModule axisModule;
Module module;
- for (Object aModuleList : moduleList) {
- axisModule = (AxisModule)aModuleList;
+ for (AxisModule axisModule : moduleList) {
// FIXME is this step really needed ??
// Shouldn't axisMoudle.getModule always return not-null value ??
module = axisModule.getModule();
@@ -388,7 +386,7 @@
engageModulesToAxisDescription(modulesToEngage, this);
}
- private void engageModulesToAxisDescription(List moduleList, AxisDescription description)
+ private void engageModulesToAxisDescription(List<AxisModule> moduleList, AxisDescription description)
throws AxisFault {
AxisModule axisModule;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Mon Dec 8 14:01:35 2008
@@ -52,7 +52,7 @@
// The alias used for the endpoint
private String alias;
- private Map options;
+ private Map<String, Object> options;
private String transportInDescName;
@@ -68,7 +68,7 @@
}
public AxisEndpoint() {
- options = new HashMap();
+ options = new HashMap<String, Object>();
}
public void setProperty(String name, Object value) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java Mon Dec 8 14:01:35 2008
@@ -19,25 +19,28 @@
package org.apache.axis2.description;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.Handler;
import org.apache.axis2.phaseresolver.PhaseResolver;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.wsdl.SOAPHeaderMessage;
import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyComponent;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
/**
* This class represents the messages in WSDL. There can be message element in services.xml
@@ -45,7 +48,7 @@
*/
public class AxisMessage extends AxisDescription {
- private ArrayList handlerChain;
+ private ArrayList<Handler> handlerChain;
private String name;
private ArrayList soapHeaders;
@@ -56,7 +59,7 @@
private String messagePartName;
// To store deploy-time module refs
- private ArrayList modulerefs;
+ private ArrayList<String> modulerefs;
private String partName = Java2WSDLConstants.PARAMETERS;
// private PolicyInclude policyInclude;
@@ -77,11 +80,11 @@
public AxisMessage() {
soapHeaders = new ArrayList();
- handlerChain = new ArrayList();
- modulerefs = new ArrayList();
+ handlerChain = new ArrayList<Handler>();
+ modulerefs = new ArrayList<String>();
}
- public ArrayList getMessageFlow() {
+ public ArrayList<Handler> getMessageFlow() {
return handlerChain;
}
@@ -103,7 +106,7 @@
}
}
- public void setMessageFlow(ArrayList operationFlow) {
+ public void setMessageFlow(ArrayList<Handler> operationFlow) {
this.handlerChain = operationFlow;
}
@@ -209,7 +212,7 @@
phaseResolver.engageModuleToMessage(this, axisModule);
}
- public ArrayList getModulerefs() {
+ public ArrayList<String> getModulerefs() {
return modulerefs;
}
@@ -248,7 +251,7 @@
public Policy calculateEffectivePolicy() {
PolicySubject policySubject = null;
- ArrayList policyList = new ArrayList();
+ ArrayList<PolicyComponent> policyList = new ArrayList<PolicyComponent>();
// AxisMessage
policySubject = getPolicySubject();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java?rev=724507&r1=724506&r2=724507&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java Mon Dec 8 14:01:35 2008
@@ -66,7 +66,7 @@
private String version;
// to store module operations , which are suppose to be added to a service if it is engaged to a service
- private HashMap operations = new HashMap();
+ private HashMap<QName, AxisOperation> operations = new HashMap<QName, AxisOperation>();
private AxisConfiguration parent;
/*
@@ -164,7 +164,7 @@
return name;
}
- public HashMap getOperations() {
+ public HashMap<QName, AxisOperation> getOperations() {
return operations;
}
@@ -182,7 +182,7 @@
return parameters.getParameter(name);
}
- public ArrayList getParameters() {
+ public ArrayList<Parameter> getParameters() {
return parameters.getParameters();
}