Author: indika
Date: Wed Feb 18 08:53:31 2009
New Revision: 745435
URL: http://svn.apache.org/viewvc?rev=745435&view=rev
Log:
some code improvments
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadPool.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/InputStreamConsumer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/SyslogMessageBuilder.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
Wed Feb 18 08:53:31 2009
@@ -129,15 +129,12 @@
return null;
}
OMText text = (OMText) textNode;
- DataHandler dh = null;
- try {
- dh = (DataHandler) text.getDataHandler();
- } catch (ClassCastException ce) {
- log.error("cannot get DataHandler" + ce.getMessage());
- return null;
- }
- return dh;
-
+ try {
+ return (DataHandler) text.getDataHandler();
+ } catch (ClassCastException ce) {
+ log.error("cannot get DataHandler" + ce.getMessage());
+ return null;
+ }
}
public static DataHandler getBinaryPayload(MessageContext mc) {
@@ -226,8 +223,7 @@
log.error("Wrong QName" + el.getQName());
return null;
}
- SimpleMap map = new SimpleMapImpl(el);
- return map;
+ return new SimpleMapImpl(el);
}
public static SimpleMap getMapPayload(MessageContext mc) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
Wed Feb 18 08:53:31 2009
@@ -56,7 +56,7 @@
public boolean getBoolean(String name) {
Object o = this.get((Object) name);
if (o instanceof Boolean) {
- return ((Boolean) o).booleanValue();
+ return (Boolean) o;
} else {
throw new RuntimeException("getBoolean(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Boolean");
@@ -66,7 +66,7 @@
public byte getByte(String name) {
Object o = this.get((Object) name);
if (o instanceof Byte) {
- return ((Byte) o).byteValue();
+ return (Byte) o;
} else {
throw new RuntimeException("getByte(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Byte");
@@ -86,7 +86,7 @@
public char getChar(String name) {
Object o = this.get((Object) name);
if (o instanceof Character) {
- return ((Character) o).charValue();
+ return (Character) o;
} else {
throw new RuntimeException("getChar(" + name + "): "
+ o.getClass().getName()
@@ -97,7 +97,7 @@
public double getDouble(String name) {
Object o = this.get((Object) name);
if (o instanceof Double) {
- return ((Double) o).doubleValue();
+ return (Double) o;
} else {
throw new RuntimeException("getDouble(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Double");
@@ -107,7 +107,7 @@
public float getFloat(String name) {
Object o = this.get((Object) name);
if (o instanceof Float) {
- return ((Float) o).floatValue();
+ return (Float) o;
} else {
throw new RuntimeException("getFloat(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Float");
@@ -117,7 +117,7 @@
public int getInt(String name) {
Object o = this.get((Object) name);
if (o instanceof Integer) {
- return ((Integer) o).intValue();
+ return (Integer) o;
} else {
throw new RuntimeException("getInt(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Integer");
@@ -127,7 +127,7 @@
public long getLong(String name) {
Object o = this.get((Object) name);
if (o instanceof Long) {
- return ((Long) o).longValue();
+ return (Long) o;
} else {
throw new RuntimeException("getLong(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Long");
@@ -137,7 +137,7 @@
public short getShort(String name) {
Object o = this.get((Object) name);
if (o instanceof Short) {
- return ((Short) o).shortValue();
+ return (Short) o;
} else {
throw new RuntimeException("getShort(" + name + "): "
+ o.getClass().getName() + " is not an
instance of Short");
@@ -159,12 +159,12 @@
}
public void putBoolean(String name, boolean b) {
- this.put((Object) name, new Boolean(b));
+ this.put((Object) name, b);
}
public void putByte(String name, byte b) {
- this.put((Object) name, new Byte(b));
+ this.put((Object) name, b);
}
@@ -174,32 +174,32 @@
}
public void putChar(String name, char c) {
- this.put((Object) name, new Character(c));
+ this.put((Object) name, c);
}
public void putDouble(String name, double d) {
- this.put((Object) name, new Double(d));
+ this.put((Object) name, d);
}
public void putFloat(String name, float fl) {
- this.put((Object) name, new Float(fl));
+ this.put((Object) name, fl);
}
public void putInt(String name, int i) {
- this.put((Object) name, new Integer(i));
+ this.put((Object) name, i);
}
public void putLong(String name, long l) {
- this.put((Object) name, new Long(l));
+ this.put((Object) name, l);
}
public void putShort(String name, short s) {
- this.put((Object) name, new Short(s));
+ this.put((Object) name, s);
}
@@ -214,54 +214,51 @@
public OMElement getOMElement(OMFactory fac) {
OMElement mapElement =
fac.createOMElement(PayloadHelper.MAPELT);
-
- for (Iterator it = this.keySet().iterator(); it.hasNext();) {
- OMElement entry = fac.createOMElement(new QName(
- PayloadHelper.AXIOMPAYLOADNS, ENTRY),
mapElement);
-
-
- Object key = it.next();
- if (key instanceof String) {
- Object o = this.get(key);
- entry.addAttribute(NAME, (String) key, attrNS);
- if (o instanceof Character) {
- entry.addAttribute(TYPE, CHAR, attrNS);
- entry.setText(o.toString());
- } else if (o instanceof Boolean) {
- entry.addAttribute(TYPE, BOOLEAN,
attrNS);
- entry.setText(o.toString());
- } else if (o instanceof String) {
- entry.addAttribute(TYPE, STRING,
attrNS);
- entry.setText(o.toString());
- } else if (o instanceof Byte) {
- entry.addAttribute(TYPE, BYTE, attrNS);
- entry.setText(((Byte) o).toString());
- } else if (o instanceof byte[]) {
- entry.addAttribute(TYPE, BYTEARRAY,
attrNS);
- OMText text = fac.createOMText(new
DataHandler(
- new
ByteArrayDataSource((byte[]) o)), true);
- entry.addChild(text);
- } else if (o instanceof Float) {
- entry.addAttribute(TYPE, FLOAT, attrNS);
- entry.setText(o.toString());
- } else if (o instanceof Double) {
- entry.addAttribute(TYPE, DOUBLE,
attrNS);
- entry.setText(o.toString());
- } else if (o instanceof Long) {
- entry.addAttribute(TYPE, LONG, attrNS);
- entry.setText(o.toString());
- } else if (o instanceof Short) {
- entry.addAttribute(TYPE, SHORT, attrNS);
- entry.setText(o.toString());
- } else if (o instanceof Integer) {
- entry.addAttribute(TYPE, INTEGER,
attrNS);
- entry.setText(o.toString());
- }
- } else {
- // shouldn't be any non-string keys. Ignore!
- }
- }
+ for (Object key : this.keySet()) {
+ if (key instanceof String) {
+ OMElement entry = fac.createOMElement(new QName(
+ PayloadHelper.AXIOMPAYLOADNS, ENTRY), mapElement);
+ Object o = this.get(key);
+ entry.addAttribute(NAME, (String) key, attrNS);
+ if (o instanceof Character) {
+ entry.addAttribute(TYPE, CHAR, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof Boolean) {
+ entry.addAttribute(TYPE, BOOLEAN, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof String) {
+ entry.addAttribute(TYPE, STRING, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof Byte) {
+ entry.addAttribute(TYPE, BYTE, attrNS);
+ entry.setText(((Byte) o).toString());
+ } else if (o instanceof byte[]) {
+ entry.addAttribute(TYPE, BYTEARRAY, attrNS);
+ OMText text = fac.createOMText(new DataHandler(
+ new ByteArrayDataSource((byte[]) o)), true);
+ entry.addChild(text);
+ } else if (o instanceof Float) {
+ entry.addAttribute(TYPE, FLOAT, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof Double) {
+ entry.addAttribute(TYPE, DOUBLE, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof Long) {
+ entry.addAttribute(TYPE, LONG, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof Short) {
+ entry.addAttribute(TYPE, SHORT, attrNS);
+ entry.setText(o.toString());
+ } else if (o instanceof Integer) {
+ entry.addAttribute(TYPE, INTEGER, attrNS);
+ entry.setText(o.toString());
+ }
+
+ } else {
+ // shouldn't be any non-string keys. Ignore!
+ }
+ }
return mapElement;
}
@@ -288,13 +285,13 @@
if (type.equals(INTEGER)) {
this.put((Object)name, new
Integer(text.getText()));
} else if (type.equals(CHAR)) {
- this.put((Object)name, new
Character((text.getText().charAt(0))));
+ this.put((Object)name,
(text.getText().charAt(0)));
} else if (type.equals(DOUBLE)) {
this.put((Object)name, new
Double(text.getText()));
} else if (type.equals(FLOAT)) {
this.put((Object)name, new
Float(text.getText()));
} else if (type.equals(BYTE)) {
- this.put((Object)name, new
Byte(text.getText().getBytes()[0]));
+ this.put((Object)name,
text.getText().getBytes()[0]);
} else if (type.equals(SHORT)) {
this.put((Object)name, new
Short(text.getText()));
} else if (type.equals(LONG)) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadPool.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadPool.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadPool.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadPool.java
Wed Feb 18 08:53:31 2009
@@ -19,8 +19,6 @@
package org.apache.synapse.util.concurrent;
-import org.apache.synapse.config.SynapseConfiguration;
-
import java.util.concurrent.*;
/**
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/InputStreamConsumer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/InputStreamConsumer.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/InputStreamConsumer.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/InputStreamConsumer.java
Wed Feb 18 08:53:31 2009
@@ -111,7 +111,8 @@
public void expect(int expected) throws IOException, ProtocolException {
int next = next();
if (next != expected) {
- throw new ProtocolException("Unexpected byte: expected " +
expected + " ('" + (char)expected + "') , got " + next + " ('" + (char)next +
"')");
+ throw new ProtocolException("Unexpected byte: expected " +
expected +
+ " ('" + (char) expected + "') , got " + next + " ('" +
(char) next + "')");
}
}
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/SyslogMessageBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/SyslogMessageBuilder.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/SyslogMessageBuilder.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/SyslogMessageBuilder.java
Wed Feb 18 08:53:31 2009
@@ -117,7 +117,8 @@
}
}
catch (ProtocolException ex) {
- log.error("Protocol error: " + ex.getMessage() + " [pri=" +
facility + "." + severity + " tag=" + tag + " pid=" + pid + "]");
+ log.error("Protocol error: " + ex.getMessage() + " [pri=" +
facility + "." +
+ severity + " tag=" + tag + " pid=" + pid + "]");
throw new AxisFault("Protocol error", ex);
}
catch (IOException ex) {
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
Wed Feb 18 08:53:31 2009
@@ -194,11 +194,8 @@
} else {
returnObject = mediateForInlineScript(synCtx);
}
- if (returnObject != null && returnObject instanceof Boolean) {
- returnValue = ((Boolean) returnObject).booleanValue();
- } else {
- returnValue = true;
- }
+ returnValue = !(returnObject != null && returnObject instanceof
Boolean)
+ || (Boolean) returnObject;
} catch (ScriptException e) {
handleException("The script engine returned an error executing the
" +
Modified:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java?rev=745435&r1=745434&r2=745435&view=diff
==============================================================================
---
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
(original)
+++
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
Wed Feb 18 08:53:31 2009
@@ -90,7 +90,7 @@
if (result instanceof String) {
return result;
} else {
- handleException("Invalid type , expect String");
+ handleException("Invalid type , expected String");
}
} else if (Boolean.class.equals(type)) {
@@ -99,7 +99,7 @@
} else if (result instanceof Boolean) {
return result;
} else {
- handleException("Invalid type , expect Boolean");
+ handleException("Invalid type , expected Boolean");
}
} else if (Integer.class.equals(type)) {
@@ -108,7 +108,7 @@
} else if (result instanceof Integer) {
return result;
} else {
- handleException("Invalid type , expect Integer");
+ handleException("Invalid type , expected Integer");
}
} else if (Long.class.equals(type)) {
if (result instanceof String) {
@@ -116,7 +116,7 @@
} else if (result instanceof Long) {
return result;
} else {
- handleException("Invalid type , expect Long");
+ handleException("Invalid type , expected Long");
}
} else {
return result;
@@ -192,14 +192,12 @@
if (binOut != null) {
try {
binOut.close();
- } catch (IOException ex) {
- }
+ } catch (IOException ignored) {}
}
if (outputStream != null) {
try {
outputStream.close();
- } catch (IOException ex) {
- }
+ } catch (IOException ignored) {}
}
}
return result;
