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 ve...@apache.org on 2016/03/12 15:14:22 UTC
svn commit: r1734705 - in /axis/axis2/java/core/trunk/modules:
codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
kernel/src/org/apache/axis2/client/FaultMapKey.java
Author: veithen
Date: Sat Mar 12 14:14:22 2016
New Revision: 1734705
URL: http://svn.apache.org/viewvc?rev=1734705&view=rev
Log:
Some cleanup.
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/FaultMapKey.java
Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=1734705&r1=1734704&r2=1734705&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Sat Mar 12 14:14:22 2016
@@ -59,9 +59,9 @@
protected org.apache.axis2.description.AxisOperation[] _operations;
//hashmaps to keep the fault mapping
- private java.util.HashMap faultExceptionNameMap = new java.util.HashMap();
- private java.util.HashMap faultExceptionClassNameMap = new java.util.HashMap();
- private java.util.HashMap faultMessageMap = new java.util.HashMap();
+ private java.util.Map<org.apache.axis2.client.FaultMapKey,String> faultExceptionNameMap = new java.util.HashMap<org.apache.axis2.client.FaultMapKey,String>();
+ private java.util.Map<org.apache.axis2.client.FaultMapKey,String> faultExceptionClassNameMap = new java.util.HashMap<org.apache.axis2.client.FaultMapKey,String>();
+ private java.util.Map<org.apache.axis2.client.FaultMapKey,String> faultMessageMap = new java.util.HashMap<org.apache.axis2.client.FaultMapKey,String>();
private static int counter = 0;
@@ -519,12 +519,12 @@
if (faultExceptionNameMap.containsKey(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"))){
//make the fault by reflection
try{
- java.lang.String exceptionClassName = (java.lang.String)faultExceptionClassNameMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
+ java.lang.String exceptionClassName = faultExceptionClassNameMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
java.lang.Class exceptionClass = java.lang.Class.forName(exceptionClassName);
java.lang.reflect.Constructor constructor = exceptionClass.getConstructor(java.lang.String.class);
java.lang.Exception ex = (java.lang.Exception) constructor.newInstance(f.getMessage());
//message class
- java.lang.String messageClassName = (java.lang.String)faultMessageMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
+ java.lang.String messageClassName = faultMessageMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
java.lang.Class messageClass = java.lang.Class.forName(messageClassName);
java.lang.Object messageObject = fromOM(faultElt,messageClass);
java.lang.reflect.Method m = exceptionClass.getMethod("setFaultMessage",
@@ -789,12 +789,12 @@
if (faultExceptionNameMap.containsKey(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"))){
//make the fault by reflection
try{
- java.lang.String exceptionClassName = (java.lang.String)faultExceptionClassNameMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
+ java.lang.String exceptionClassName = faultExceptionClassNameMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
java.lang.Class exceptionClass = java.lang.Class.forName(exceptionClassName);
java.lang.reflect.Constructor constructor = exceptionClass.getConstructor(java.lang.String.class);
java.lang.Exception ex = (java.lang.Exception) constructor.newInstance(f.getMessage());
//message class
- java.lang.String messageClassName = (java.lang.String)faultMessageMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
+ java.lang.String messageClassName = faultMessageMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
java.lang.Class messageClass = java.lang.Class.forName(messageClassName);
java.lang.Object messageObject = fromOM(faultElt,messageClass);
java.lang.reflect.Method m = exceptionClass.getMethod("setFaultMessage",
@@ -1049,12 +1049,12 @@
if (faultExceptionNameMap.containsKey(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"))){
//make the fault by reflection
try{
- java.lang.String exceptionClassName = (java.lang.String)faultExceptionClassNameMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
+ java.lang.String exceptionClassName = faultExceptionClassNameMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
java.lang.Class exceptionClass = java.lang.Class.forName(exceptionClassName);
java.lang.Exception ex=
(java.lang.Exception) exceptionClass.newInstance();
//message class
- java.lang.String messageClassName = (java.lang.String)faultMessageMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
+ java.lang.String messageClassName = faultMessageMap.get(new org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of select="@originalName"/>"));
java.lang.Class messageClass = java.lang.Class.forName(messageClassName);
java.lang.Object messageObject = fromOM(faultElt,messageClass);
java.lang.reflect.Method m = exceptionClass.getMethod("setFaultMessage",
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/FaultMapKey.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/FaultMapKey.java?rev=1734705&r1=1734704&r2=1734705&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/FaultMapKey.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/FaultMapKey.java Sat Mar 12 14:14:22 2016
@@ -25,8 +25,8 @@ import javax.xml.namespace.QName;
public class FaultMapKey {
- private QName elementQname;
- private String operationName;
+ private final QName elementQname;
+ private final String operationName;
public FaultMapKey(QName elementQname, String operationName) {
this.elementQname = elementQname;
@@ -39,8 +39,8 @@ public class FaultMapKey {
boolean isEqual = false;
if (obj instanceof FaultMapKey){
FaultMapKey faultMapKey = (FaultMapKey) obj;
- isEqual = this.elementQname.equals(faultMapKey.getElementQname()) &&
- this.operationName.equals(faultMapKey.getOperationName());
+ isEqual = this.elementQname.equals(faultMapKey.elementQname) &&
+ this.operationName.equals(faultMapKey.operationName);
}
return isEqual;
}
@@ -48,20 +48,4 @@ public class FaultMapKey {
public int hashCode() {
return this.elementQname.hashCode() + this.operationName.hashCode();
}
-
- public QName getElementQname() {
- return elementQname;
- }
-
- public void setElementQname(QName elementQname) {
- this.elementQname = elementQname;
- }
-
- public String getOperationName() {
- return operationName;
- }
-
- public void setOperationName(String operationName) {
- this.operationName = operationName;
- }
}