Author: veithen
Date: Wed Feb 26 11:43:15 2014
New Revision: 1572020
URL: http://svn.apache.org/r1572020
Log:
Some code simplifications.
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java?rev=1572020&r1=1572019&r2=1572020&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
Wed Feb 26 11:43:15 2014
@@ -109,19 +109,8 @@ public class JavaDefinitionWriter implem
// by JavaTypeWriter.
MessageEntry me =
symbolTable.getMessageEntry(message.getQName());
- boolean emitSimpleFault = true;
- if (me != null) {
- Boolean complexTypeFault = (Boolean) me.getDynamicVar(
- JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
- if ((complexTypeFault != null)
- && complexTypeFault.booleanValue()) {
- emitSimpleFault = false;
- }
- }
-
- if (emitSimpleFault) {
+ if (me == null || !Utils.isFaultComplex(me)) {
try {
JavaFaultWriter writer = new JavaFaultWriter(emitter,
symbolTable, faultInfo);
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java?rev=1572020&r1=1572019&r2=1572020&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Wed Feb 26 11:43:15 2014
@@ -805,10 +805,7 @@ public class JavaGeneratorFactory implem
} else {
// Complex Type Exception
- Boolean isComplexFault = (Boolean) te.getDynamicVar(
- JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
- if ((isComplexFault == null) ||
!isComplexFault.booleanValue()) {
+ if (!Utils.isFaultComplex(te)) {
// Mark the type as a complex type fault
te.setDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT,
@@ -1153,8 +1150,8 @@ public class JavaGeneratorFactory implem
}
// Appended Suffix for avoiding name
collisions (JAX-RPC 1.1)
- Boolean isComplexTypeFault =
(Boolean)entry.getDynamicVar(COMPLEX_TYPE_FAULT);
- if ((isComplexTypeFault != null) &&
isComplexTypeFault.booleanValue()) {
+ boolean isComplexTypeFault =
Utils.isFaultComplex(entry);
+ if (isComplexTypeFault) {
entry.setName(mangleName(entry.getName(),
EXCEPTION_SUFFIX));
}
else {
@@ -1173,13 +1170,12 @@ public class JavaGeneratorFactory implem
}
// Need to resolve a complex-type exception
message.
- if ((isComplexTypeFault != null) &&
isComplexTypeFault.booleanValue()) {
+ if (isComplexTypeFault) {
// SHOULD update the exception class name
of a referencing message entry.
List messageEntries =
symbolTable.getMessageEntries();
for (int j = 0; j < messageEntries.size();
j++) {
MessageEntry messageEntry =
(MessageEntry)messageEntries.get(j);
- Boolean isComplexTypeFaultMsg =
(Boolean)messageEntry.getDynamicVar(COMPLEX_TYPE_FAULT);
- if ((isComplexTypeFaultMsg != null) &&
(isComplexTypeFaultMsg.booleanValue())) {
+ if
(Utils.isFaultComplex(messageEntry)) {
QName exceptionDataType =
(QName)messageEntry.getDynamicVar(EXCEPTION_DATA_TYPE);
if
(((TypeEntry)entry).getQName().equals(exceptionDataType)) {
String className =
(String)messageEntry.getDynamicVar(EXCEPTION_CLASS_NAME);
@@ -1194,9 +1190,7 @@ public class JavaGeneratorFactory implem
} else if (entry instanceof ServiceEntry) {
entry.setName(mangleName(entry.getName(),
SERVICE_SUFFIX));
} else if (entry instanceof MessageEntry) {
- Boolean complexTypeFault =
- (Boolean)
entry.getDynamicVar(COMPLEX_TYPE_FAULT);
- if ((complexTypeFault == null) ||
!complexTypeFault.booleanValue()) {
+ if (!Utils.isFaultComplex(entry)) {
String exceptionClassName = (String)
entry.getDynamicVar(EXCEPTION_CLASS_NAME);
entry.setDynamicVar(EXCEPTION_CLASS_NAME,
exceptionClassName + EXCEPTION_SUFFIX);
}
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java?rev=1572020&r1=1572019&r2=1572020&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
Wed Feb 26 11:43:15 2014
@@ -160,10 +160,7 @@ public class JavaTypeWriter implements G
// If this complexType is referenced in a
// fault context, emit a bean-like exception
// class
- Boolean isComplexFault = (Boolean) type.getDynamicVar(
- JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
- if ((isComplexFault != null) && isComplexFault.booleanValue()) {
+ if (Utils.isFaultComplex(type)) {
return new JavaBeanFaultWriter(emitter, type, elements, base,
attributes,
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java?rev=1572020&r1=1572019&r2=1572020&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
Wed Feb 26 11:43:15 2014
@@ -282,16 +282,13 @@ public class Utils extends org.apache.ax
public static boolean isFaultComplex(Message faultMessage,
SymbolTable symbolTable) {
- MessageEntry me = symbolTable.getMessageEntry(faultMessage.getQName());
- Boolean ret =
- (Boolean)
me.getDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
- if (ret != null) {
- return ret.booleanValue();
- } else {
- return false;
- }
+ return
isFaultComplex(symbolTable.getMessageEntry(faultMessage.getQName()));
} // isFaultComplex
+
+ static boolean isFaultComplex(SymTabEntry entry) {
+ Boolean value = (Boolean)
entry.getDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
+ return value != null && value.booleanValue();
+ }
/**
* If the specified node represents a supported JAX-RPC enumeration,
