You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sa...@apache.org on 2012/05/24 13:02:04 UTC
svn commit: r1342194 - in /axis/axis2/java/core/trunk/modules:
adb/src/org/apache/axis2/rpc/receivers/
kernel/src/org/apache/axis2/addressing/
kernel/src/org/apache/axis2/addressing/wsdl/
kernel/src/org/apache/axis2/deployment/ kernel/src/org/apache/ax...
Author: sagara
Date: Thu May 24 11:02:04 2012
New Revision: 1342194
URL: http://svn.apache.org/viewvc?rev=1342194&view=rev
Log:
clean some codes and add proper generics.
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1342194&r1=1342193&r2=1342194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Thu May 24 11:02:04 2012
@@ -77,7 +77,7 @@ public class RPCMessageReceiver extends
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
- Class implClass = obj.getClass();
+ Class<?> implClass = obj.getClass();
AxisOperation op = inMessage.getOperationContext().getAxisOperation();
method = (Method)(op.getParameterValue("myMethod"));
@@ -172,9 +172,9 @@ public class RPCMessageReceiver extends
throw (AxisFault)cause;
}
- Class[] exceptionTypes = method.getExceptionTypes();
- for (Class exceptionType : exceptionTypes){
- if (exceptionType.getName().equals(cause.getClass().getName())){
+ Class<?>[] exceptionTypes = method.getExceptionTypes();
+ for (Class<?> exceptionType : exceptionTypes){
+ if (cause != null && exceptionType.getName().equals(cause.getClass().getName())){
// this is an bussiness logic exception so handle it properly
String partQName = inMessage.getAxisService().getName() + getSimpleClassName(exceptionType);
TypeTable typeTable = inMessage.getAxisService().getTypeTable();
@@ -222,7 +222,7 @@ public class RPCMessageReceiver extends
}
}
- private String getSimpleClassName(Class type) {
+ private String getSimpleClassName(Class<?> type) {
String simpleClassName = type.getName();
int idx = simpleClassName.lastIndexOf('.');
if (idx != -1 && idx < (simpleClassName.length() - 1)) {
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/AddressingFaultsHelper.java?rev=1342194&r1=1342193&r2=1342194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/AddressingFaultsHelper.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/AddressingFaultsHelper.java Thu May 24 11:02:04 2012
@@ -346,10 +346,10 @@ public class AddressingFaultsHelper {
Object faultInformationValue, String faultcode,
String faultSubcode, String faultReason)
throws AxisFault {
- Map faultInformation =
- (Map)messageContext.getLocalProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
+ Map<String, Object> faultInformation =
+ (Map<String, Object>)messageContext.getLocalProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
if (faultInformation == null) {
- faultInformation = new HashMap();
+ faultInformation = new HashMap<String, Object>();
messageContext.setProperty(Constants.FAULT_INFORMATION_FOR_HEADERS, faultInformation);
}
@@ -422,12 +422,12 @@ public class AddressingFaultsHelper {
public static OMElement getDetailElementForAddressingFault(MessageContext messageContext,
OMNamespace addressingNamespaceObject) {
- Map faultInfo = (Map)messageContext.getLocalProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
+ Map<String, String> faultInfo = (Map<String, String>)messageContext.getLocalProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
OMElement problemDetail = null;
if (faultInfo != null) {
- String faultyHeaderQName = (String)faultInfo.get(Final.FAULT_HEADER_PROB_HEADER_QNAME);
- String faultyAction = (String)faultInfo.get(Final.FAULT_PROBLEM_ACTION_NAME);
- String faultyAddress = (String)faultInfo.get(Final.FAULT_HEADER_PROB_IRI);
+ String faultyHeaderQName = faultInfo.get(Final.FAULT_HEADER_PROB_HEADER_QNAME);
+ String faultyAction = faultInfo.get(Final.FAULT_PROBLEM_ACTION_NAME);
+ String faultyAddress = faultInfo.get(Final.FAULT_HEADER_PROB_IRI);
if (faultyAddress != null && !"".equals(faultyAddress)) {
problemDetail = messageContext.getEnvelope().getOMFactory().createOMElement(
Final.FAULT_HEADER_PROB_IRI, addressingNamespaceObject);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java?rev=1342194&r1=1342193&r2=1342194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java Thu May 24 11:02:04 2012
@@ -132,7 +132,7 @@ public class WSDL11ActionHelper {
// wsdl4j may return a String, QName or a List of either
// If it is a list, extract the first element
if (attribute instanceof List) {
- List l = (List) attribute;
+ List<Object> l = (List<Object>) attribute;
if (l.size() > 0) {
attribute = l.get(0);
} else {
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=1342194&r1=1342193&r2=1342194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Thu May 24 11:02:04 2012
@@ -25,7 +25,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.InOnlyAxisOperation;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Deployable;
import org.apache.axis2.engine.MessageReceiver;
@@ -47,6 +51,7 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
/**
* Builds a module description from OM
@@ -61,14 +66,15 @@ public class ModuleBuilder extends Descr
this.module = module;
}
+ @SuppressWarnings("unchecked")
private void loadModuleClass(AxisModule module, String moduleClassName)
throws DeploymentException {
- Class moduleClass;
+ Class<?> moduleClass;
try {
if ((moduleClassName != null) && !"".equals(moduleClassName)) {
moduleClass = Loader.loadClass(module.getModuleClassLoader(), moduleClassName);
- final Class fmoduleClass = moduleClass;
+ final Class<?> fmoduleClass = moduleClass;
final AxisModule fmodule = module;
try {
AccessController.doPrivileged(new PrivilegedExceptionAction() {
@@ -99,7 +105,7 @@ public class ModuleBuilder extends Descr
OMAttribute moduleClassAtt = moduleElement.getAttribute(new QName(TAG_CLASS_NAME));
// processing Parameters
// Processing service level parameters
- Iterator itr = moduleElement.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<?> itr = moduleElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, module, module.getParent());
@@ -161,20 +167,20 @@ public class ModuleBuilder extends Descr
}
// Processing Dynamic Phase
- Iterator phaseItr = moduleElement.getChildrenWithName(new QName(TAG_PHASE));
+ Iterator<OMElement> phaseItr = moduleElement.getChildrenWithName(new QName(TAG_PHASE));
processModulePhase(phaseItr);
// setting the PolicyInclude
// processing <wsp:Policy> .. </..> elements
- Iterator policyElements = PolicyUtil.getPolicyChildren(moduleElement);
+ Iterator<OMElement> policyElements = PolicyUtil.getPolicyChildren(moduleElement);
if (policyElements != null && policyElements.hasNext()) {
processPolicyElements(policyElements, module.getPolicySubject());
}
// processing <wsp:PolicyReference> .. </..> elements
- Iterator policyRefElements = PolicyUtil.getPolicyRefChildren(moduleElement);
+ Iterator<OMElement> policyRefElements = PolicyUtil.getPolicyRefChildren(moduleElement);
if (policyRefElements != null && policyRefElements.hasNext()) {
processPolicyRefElements(policyRefElements, module.getPolicySubject());
@@ -182,9 +188,9 @@ public class ModuleBuilder extends Descr
// process flows (case-insensitive)
- Iterator flows = moduleElement.getChildElements();
+ Iterator<OMElement> flows = moduleElement.getChildElements();
while (flows.hasNext()) {
- OMElement flowElement = (OMElement)flows.next();
+ OMElement flowElement = flows.next();
final String flowName = flowElement.getLocalName();
if (flowName.compareToIgnoreCase(TAG_FLOW_IN) == 0) {
module.setInFlow(processFlow(flowElement, module));
@@ -216,8 +222,8 @@ public class ModuleBuilder extends Descr
}
// processing Operations
- Iterator op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
- ArrayList<AxisOperation> operations = processOperations(op_itr);
+ Iterator<?> op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
+ List<AxisOperation> operations = processOperations(op_itr);
for (AxisOperation op : operations) {
module.addOperation(op);
@@ -234,9 +240,9 @@ public class ModuleBuilder extends Descr
}
}
- private ArrayList<AxisOperation> processOperations(Iterator operationsIterator)
+ private List<AxisOperation> processOperations(Iterator<?> operationsIterator)
throws DeploymentException {
- ArrayList operations = new ArrayList();
+ List<AxisOperation> operations = new ArrayList<AxisOperation>();
while (operationsIterator.hasNext()) {
OMElement operation = (OMElement) operationsIterator.next();
@@ -291,7 +297,7 @@ public class ModuleBuilder extends Descr
}
// Operation Parameters
- Iterator parameters = operation.getChildrenWithName(new QName(TAG_PARAMETER));
+ Iterator<OMElement> parameters = operation.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, op_descrip, module);
//To process wsamapping;
@@ -313,18 +319,18 @@ public class ModuleBuilder extends Descr
}
// Process Module Refs
- Iterator modules = operation.getChildrenWithName(new QName(TAG_MODULE));
+ Iterator<OMElement> modules = operation.getChildrenWithName(new QName(TAG_MODULE));
processOperationModuleRefs(modules, op_descrip);
// processing <wsp:Policy> .. </..> elements
- Iterator policyElements = PolicyUtil.getPolicyChildren(operation);
+ Iterator<OMElement> policyElements = PolicyUtil.getPolicyChildren(operation);
if (policyElements != null && policyElements.hasNext()) {
processPolicyElements(policyElements, op_descrip.getPolicySubject());
}
// processing <wsp:PolicyReference> .. </..> elements
- Iterator policyRefElements = PolicyUtil.getPolicyRefChildren(operation);
+ Iterator<OMElement> policyRefElements = PolicyUtil.getPolicyRefChildren(operation);
if (policyRefElements != null && policyRefElements.hasNext()) {
processPolicyRefElements(policyRefElements, module.getPolicySubject());
@@ -358,7 +364,7 @@ public class ModuleBuilder extends Descr
* @param phases : OMElement iterator
* @throws AxisFault : If something went wrong
*/
- private void processModulePhase(Iterator phases) throws AxisFault {
+ private void processModulePhase(Iterator<OMElement> phases) throws AxisFault {
if (phases == null){
return;
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?rev=1342194&r1=1342193&r2=1342194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Thu May 24 11:02:04 2012
@@ -37,7 +37,6 @@ import org.apache.commons.logging.LogFac
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -78,7 +77,6 @@ public class POJODeployer extends Abstra
Thread.currentThread().setContextClassLoader(classLoader);
String className = Utils.getClassNameFromResourceName(file.getName());
- Class<?> clazz = Loader.loadClass(className);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_POJO,
serviceHierarchy + className,
deploymentFileData.getFile().getAbsolutePath()));
@@ -121,8 +119,7 @@ public class POJODeployer extends Abstra
(File)configCtx.getAxisConfiguration().
getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
configCtx.getAxisConfiguration().isChildFirstClassLoading());
- Thread.currentThread().setContextClassLoader(classLoader);
- Class<?> clazz = Loader.loadClass(className);
+ Thread.currentThread().setContextClassLoader(classLoader);
/**
* Schema generation done in two stage 1. Load all the methods and
@@ -176,56 +173,7 @@ public class POJODeployer extends Abstra
String error = "Error:\n" + errorWriter.toString();
configCtx.getAxisConfiguration().getFaultyServices().
put(deploymentFileData.getFile().getAbsolutePath(), error);
- }
-
- private AxisService createAxisService(ClassLoader classLoader,
- String className,
- URL serviceLocation) throws ClassNotFoundException,
- InstantiationException,
- IllegalAccessException,
- AxisFault {
- AxisService axisService;
- try {
- Class<?> claxx = Class.forName(
- "org.apache.axis2.jaxws.description.DescriptionFactory");
- Method mthod = claxx.getMethod("createAxisService", Class.class);
- Class<?> pojoClass = Loader.loadClass(classLoader, className);
- axisService = (AxisService) mthod.invoke(claxx, pojoClass);
- if (axisService != null) {
- Iterator<AxisOperation> operations = axisService.getOperations();
- while (operations.hasNext()) {
- AxisOperation axisOperation = operations.next();
- if (axisOperation.getMessageReceiver() == null) {
- try {
- Class<?> jaxwsMR = Loader.loadClass(
- "org.apache.axis2.jaxws.server.JAXWSMessageReceiver");
- MessageReceiver jaxwsMRInstance =
- (MessageReceiver) jaxwsMR.newInstance();
- axisOperation.setMessageReceiver(jaxwsMRInstance);
- } catch (Exception e) {
- log.debug("Error occurde while loading JAXWSMessageReceiver for "
- + className );
- }
- }
- }
- }
- axisService.setElementFormDefault(false);
- axisService.setFileName(serviceLocation);
- Utils.fillAxisService(axisService,
- configCtx.getAxisConfiguration(),
- new ArrayList<String>(),
- new ArrayList<String>());
- //Not needed at this case, the message receivers always set to RPC if this executes
- //setMessageReceivers(axisService);
-
- } catch (Exception e) {
- // Seems like the jax-ws jars missing in the class path .
- // lets try with annogen
- log.info(Messages.getMessage(DeploymentErrorMsgs.JAXWS_JARS_MISSING,e.getMessage()),e);
- axisService = createAxisServiceUsingAnnogen(className, classLoader, serviceLocation);
- }
- return axisService;
- }
+ }
private AxisService createAxisServiceUsingAnnogen(String className,
ClassLoader classLoader,
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=1342194&r1=1342193&r2=1342194&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Thu May 24 11:02:04 2012
@@ -47,7 +47,7 @@ import java.lang.reflect.Method;
public class RawXMLINOutMessageReceiver extends AbstractMessageReceiver
implements MessageReceiver {
- private Method findOperation(AxisOperation op, Class implClass) {
+ private Method findOperation(AxisOperation op, Class<?> implClass) {
Method method = (Method)(op.getParameterValue("myMethod"));
if (method != null && method.getDeclaringClass() == implClass) return method;
@@ -86,7 +86,7 @@ public class RawXMLINOutMessageReceiver
Object obj = getTheImplementationObject(msgContext);
// find the WebService method
- Class implClass = obj.getClass();
+ Class<?> implClass = obj.getClass();
AxisOperation opDesc = msgContext.getAxisOperation();
Method method = findOperation(opDesc, implClass);