You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ve...@apache.org on 2010/01/23 20:08:08 UTC
svn commit: r902463 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment:
POJODeployer.java util/Utils.java
Author: veithen
Date: Sat Jan 23 19:08:08 2010
New Revision: 902463
URL: http://svn.apache.org/viewvc?rev=902463&view=rev
Log:
Eliminated some warnings related to generics.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?rev=902463&r1=902462&r2=902463&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Sat Jan 23 19:08:08 2010
@@ -83,7 +83,7 @@
Thread.currentThread().setContextClassLoader(classLoader);
String className = file.getName();
className = className.replaceAll(".class", "");
- Class clazz = Loader.loadClass(className);
+ Class<?> clazz = Loader.loadClass(className);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_POJO,
serviceHierarchy + className,
deploymentFileData.getFile().getAbsolutePath()));
@@ -118,14 +118,14 @@
configCtx.getAxisConfiguration().addService(axisService);
} else if ("jar".equals(extension)) {
- ArrayList classList;
+ ArrayList<String> classList;
FileInputStream fin = null;
ZipInputStream zin = null;
try {
fin = new FileInputStream(deploymentFileData.getAbsolutePath());
zin = new ZipInputStream(fin);
ZipEntry entry;
- classList = new ArrayList();
+ classList = new ArrayList<String>();
while ((entry = zin.getNextEntry()) != null) {
String name = entry.getName();
if (name.endsWith(".class")) {
@@ -145,10 +145,9 @@
fin.close();
}
}
- ArrayList axisServiceList = new ArrayList();
- for (Object aClassList : classList) {
- String className = (String)aClassList;
- ArrayList urls = new ArrayList();
+ ArrayList<AxisService> axisServiceList = new ArrayList<AxisService>();
+ for (String className : classList) {
+ ArrayList<URL> urls = new ArrayList<URL>();
urls.add(deploymentFileData.getFile().toURL());
urls.add(configCtx.getAxisConfiguration().getRepository());
String webLocation = DeploymentEngine.getWebLocationString();
@@ -165,7 +164,7 @@
Thread.currentThread().setContextClassLoader(classLoader);
className = className.replaceAll(".class", "");
className = className.replaceAll("/", ".");
- Class clazz = Loader.loadClass(className);
+ Class<?> clazz = Loader.loadClass(className);
/**
* Schema generation done in two stage 1. Load all the methods and
@@ -237,18 +236,18 @@
AxisFault {
AxisService axisService;
try {
- Class claxx = Class.forName(
+ Class<?> claxx = Class.forName(
"org.apache.axis2.jaxws.description.DescriptionFactory");
Method mthod = claxx.getMethod("createAxisService", Class.class);
- Class pojoClass = Loader.loadClass(classLoader, className);
+ Class<?> pojoClass = Loader.loadClass(classLoader, className);
axisService = (AxisService) mthod.invoke(claxx, pojoClass);
if (axisService != null) {
- Iterator operations = axisService.getOperations();
+ Iterator<AxisOperation> operations = axisService.getOperations();
while (operations.hasNext()) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
+ AxisOperation axisOperation = operations.next();
if (axisOperation.getMessageReceiver() == null) {
try {
- Class jaxwsMR = Loader.loadClass(
+ Class<?> jaxwsMR = Loader.loadClass(
"org.apache.axis2.jaxws.server.JAXWSMessageReceiver");
MessageReceiver jaxwsMRInstance =
(MessageReceiver) jaxwsMR.newInstance();
@@ -264,8 +263,8 @@
axisService.setFileName(serviceLocation);
Utils.fillAxisService(axisService,
configCtx.getAxisConfiguration(),
- new ArrayList(),
- new ArrayList());
+ new ArrayList<String>(),
+ new ArrayList<String>());
//Not needed at this case, the message receivers always set to RPC if this executes
//setMessageReceivers(axisService);
@@ -285,14 +284,14 @@
InstantiationException,
IllegalAccessException,
AxisFault {
- HashMap messageReciverMap = new HashMap();
- Class inOnlyMessageReceiver = Loader.loadClass(
+ HashMap<String,MessageReceiver> messageReciverMap = new HashMap<String,MessageReceiver>();
+ Class<?> inOnlyMessageReceiver = Loader.loadClass(
"org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver");
MessageReceiver messageReceiver =
(MessageReceiver) inOnlyMessageReceiver.newInstance();
messageReciverMap.put(WSDL2Constants.MEP_URI_IN_ONLY,
messageReceiver);
- Class inoutMessageReceiver = Loader.loadClass(
+ Class<?> inoutMessageReceiver = Loader.loadClass(
"org.apache.axis2.rpc.receivers.RPCMessageReceiver");
MessageReceiver inOutmessageReceiver =
(MessageReceiver) inoutMessageReceiver.newInstance();
@@ -311,20 +310,20 @@
}
public void setMessageReceivers(AxisService service) {
- Iterator iterator = service.getOperations();
+ Iterator<AxisOperation> iterator = service.getOperations();
while (iterator.hasNext()) {
- AxisOperation operation = (AxisOperation) iterator.next();
+ AxisOperation operation = iterator.next();
String MEP = operation.getMessageExchangePattern();
if (MEP != null) {
try {
if (WSDL2Constants.MEP_URI_IN_ONLY.equals(MEP)) {
- Class inOnlyMessageReceiver = Loader.loadClass(
+ Class<?> inOnlyMessageReceiver = Loader.loadClass(
"org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver");
MessageReceiver messageReceiver =
(MessageReceiver) inOnlyMessageReceiver.newInstance();
operation.setMessageReceiver(messageReceiver);
} else {
- Class inoutMessageReceiver = Loader.loadClass(
+ Class<?> inoutMessageReceiver = Loader.loadClass(
"org.apache.axis2.rpc.receivers.RPCMessageReceiver");
MessageReceiver inOutmessageReceiver =
(MessageReceiver) inoutMessageReceiver.newInstance();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=902463&r1=902462&r2=902463&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sat Jan 23 19:08:08 2010
@@ -425,8 +425,8 @@
* @throws Exception if a problem occurs
*/
public static void fillAxisService(final AxisService axisService,
- AxisConfiguration axisConfig, ArrayList excludeOperations,
- ArrayList nonRpcMethods) throws Exception {
+ AxisConfiguration axisConfig, ArrayList<String> excludeOperations,
+ ArrayList<String> nonRpcMethods) throws Exception {
String serviceClass;
Parameter implInfoParam = axisService
.getParameter(Constants.SERVICE_CLASS);