Author: shameera
Date: Sat May 18 16:34:47 2013
New Revision: 1484140
URL: http://svn.apache.org/r1484140
Log:
Refactoring to remove redundant initializations and simplify the code
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonBuilder.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonInOnlyRPCMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
Sat May 18 16:34:47 2013
@@ -169,11 +169,7 @@ public class GsonXMLStreamReader impleme
public boolean hasNext() throws XMLStreamException {
try {
tokenType = jsonReader.peek();
- if (tokenType == JsonToken.END_DOCUMENT) {
- return false;
- } else {
- return true;
- }
+ return !(tokenType == JsonToken.END_DOCUMENT);
} catch (IOException e) {
throw new XMLStreamException("Unexpected end of json stream");
}
@@ -195,42 +191,30 @@ public class GsonXMLStreamReader impleme
public boolean isStartElement() {
- if (state == JsonState.NameName
+ return (state == JsonState.NameName
|| state == JsonState.NameValue
|| state == JsonState.ValueValue_CHAR
- || state == JsonState.EndObjectBeginObject_START) {
- return true;
- } else {
- return false;
- }
+ || state == JsonState.EndObjectBeginObject_START);
}
public boolean isEndElement() {
- if (state == JsonState.ValueValue_START
+ return (state == JsonState.ValueValue_START
|| state == JsonState.EndArrayName
|| state == JsonState.ValueEndObject_END_2
|| state == JsonState.ValueName_START
|| state == JsonState.EndObjectName
|| state == JsonState.EndObjectBeginObject_END
|| state == JsonState.EndArrayEndObject
- || state == JsonState.EndObjectEndObject) {
- return true;
- } else {
- return false;
- }
+ || state == JsonState.EndObjectEndObject);
}
public boolean isCharacters() {
- if (state == JsonState.ValueValue_END
+ return (state == JsonState.ValueValue_END
|| state == JsonState.ValueEndArray
|| state == JsonState.ValueEndObject_END_1
- || state == JsonState.ValueName_END) {
- return true;
- } else {
- return false;
- }
+ || state == JsonState.ValueName_END);
}
@@ -382,11 +366,7 @@ public class GsonXMLStreamReader impleme
public boolean hasText() {
- if (isCharacters()) {
- return true;
- } else {
- return false;
- }
+ return isCharacters();
}
@@ -404,17 +384,17 @@ public class GsonXMLStreamReader impleme
public int getCharacterOffset() {
- return 0; //To change body of implemented methods use File |
Settings | File Templates.
+ return 0;
}
public String getPublicId() {
- return null; //To change body of implemented methods use File
| Settings | File Templates.
+ return null;
}
public String getSystemId() {
- return null; //To change body of implemented methods use File
| Settings | File Templates.
+ return null;
}
};
}
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
Sat May 18 16:34:47 2013
@@ -374,7 +374,7 @@ public class GsonXMLStreamWriter impleme
throw new XMLStreamException("Error occours while write first
begin object ");
}
}
- JsonObject stackObj = null;
+ JsonObject stackObj;
try {
if (flushObject != null) {
if (topNestedArrayObj != null && flushObject.getType() ==
JSONType.NESTED_ARRAY &&
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonBuilder.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonBuilder.java
Sat May 18 16:34:47 2013
@@ -30,7 +30,6 @@ import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.json.gson.factory.JsonConstant;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
@@ -38,7 +37,7 @@ import java.io.UnsupportedEncodingExcept
public class JsonBuilder implements Builder {
public OMElement processDocument(InputStream inputStream, String s,
MessageContext messageContext) throws AxisFault {
messageContext.setProperty(JsonConstant.IS_JSON_STREAM , true);
- JsonReader jsonReader = null;
+ JsonReader jsonReader;
String charSetEncoding=null;
try {
charSetEncoding = (String)
messageContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
@@ -51,8 +50,6 @@ public class JsonBuilder implements Buil
return soapEnvelope;
} catch (UnsupportedEncodingException e) {
throw new AxisFault(charSetEncoding + " encoding is may not
supported by json inputStream ", e);
- } catch (IOException e) {
- throw new AxisFault("IOException while processing JsonReader ",
e);
}
}
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
Sat May 18 16:34:47 2013
@@ -54,7 +54,7 @@ public class JsonFormatter implements Me
public void writeTo(MessageContext outMsgCtxt, OMOutputFormat
omOutputFormat, OutputStream outputStream, boolean b) throws AxisFault {
String charSetEncoding = (String)
outMsgCtxt.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
- JsonWriter jsonWriter = null;
+ JsonWriter jsonWriter;
String msg;
try {
@@ -129,8 +129,7 @@ public class JsonFormatter implements Me
}
public String getContentType(MessageContext outMsgCtxt, OMOutputFormat
omOutputFormat, String s) {
- String contentType =
(String)outMsgCtxt.getProperty(Constants.Configuration.CONTENT_TYPE);
- return contentType;
+ return
(String)outMsgCtxt.getProperty(Constants.Configuration.CONTENT_TYPE);
}
public URL getTargetAddress(MessageContext messageContext, OMOutputFormat
omOutputFormat, URL url) throws AxisFault {
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNode.java
Sat May 18 16:34:47 2013
@@ -40,7 +40,7 @@ public class XmlNode {
}
- public void addChildtoList(XmlNode child) {
+ public void addChildToList(XmlNode child) {
childrenList.add(child);
}
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java
Sat May 18 16:34:47 2013
@@ -89,7 +89,7 @@ public class XmlNodeGenerator {
XmlSchemaType schemaType = element.getSchemaType();
if (schemaTypeName != null) {
xmlNode = new XmlNode(element.getName(), targetNamespace, false,
(element.getMaxOccurs() == 1 ? false : true), schemaTypeName.getLocalPart());
- parentNode.addChildtoList(xmlNode);
+ parentNode.addChildToList(xmlNode);
if
(("http://www.w3.org/2001/XMLSchema";).equals(schemaTypeName.getNamespaceURI()))
{
} else {
XmlSchema schemaOfType;
@@ -105,7 +105,7 @@ public class XmlNodeGenerator {
}
}else if (schemaType != null) {
xmlNode = new XmlNode(element.getName(), targetNamespace, false,
(element.getMaxOccurs() == 1 ? false : true),
schemaType.getQName().getLocalPart());
- parentNode.addChildtoList(xmlNode);
+ parentNode.addChildToList(xmlNode);
processSchemaType(schemaType, xmlNode, schema);
}
}
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonInOnlyRPCMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonInOnlyRPCMessageReceiver.java?rev=1484140&r1=1484139&r2=1484140&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonInOnlyRPCMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/rpc/JsonInOnlyRPCMessageReceiver.java
Sat May 18 16:34:47 2013
@@ -68,11 +68,10 @@ public class JsonInOnlyRPCMessageReceive
}
public void invokeService(JsonReader jsonReader, Object serviceObj, String
operation_name) throws AxisFault {
- Method method = null;
String msg;
Class implClass = serviceObj.getClass();
Method[] allMethods = implClass.getDeclaredMethods();
- method = JsonUtils.getOpMethod(operation_name, allMethods);
+ Method method = JsonUtils.getOpMethod(operation_name, allMethods);
Class[] paramClasses = method.getParameterTypes();
try {
int paramCount = paramClasses.length;
