Author: hiranya
Date: Thu Sep 23 10:11:05 2010
New Revision: 1000390
URL: http://svn.apache.org/viewvc?rev=1000390&view=rev
Log:
Refactoring
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/debug/AbstractConnectionDebug.java
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
Thu Sep 23 10:11:05 2010
@@ -59,14 +59,14 @@ public class TaskDescriptionSerializer {
task.addAttribute("group", group, NULL_OMNS);
}
- List pinnedServers = taskDescription.getPinnedServers();
+ List<String> pinnedServers = taskDescription.getPinnedServers();
if (pinnedServers != null && !pinnedServers.isEmpty()) {
- String pinnedServersStr = "" + pinnedServers.get(0);
+ StringBuffer pinnedServersStr = new
StringBuffer(pinnedServers.get(0));
for (int i = 1; i < pinnedServers.size(); i++) {
- pinnedServersStr = pinnedServersStr + " " +
pinnedServers.get(i);
+ pinnedServersStr.append(" ").append(pinnedServers.get(i));
}
task.addAttribute(omFactory.createOMAttribute("pinnedServers",
- NULL_OMNS, pinnedServersStr));
+ NULL_OMNS, pinnedServersStr.toString()));
}
if (taskDescription.getDescription() != null) {
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
Thu Sep 23 10:11:05 2010
@@ -363,7 +363,7 @@ public class Axis2HttpRequest {
public void setCompleted(boolean completed) {
this.completed = completed;
- synchronized(this) {
+ synchronized (this) {
this.notifyAll();
}
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
Thu Sep 23 10:11:05 2010
@@ -196,9 +196,7 @@ public class ClientHandler implements NH
try {
processConnection(conn, (Axis2HttpRequest) attachment);
} catch (ConnectionClosedException e) {
- if (metrics != null) {
- metrics.incrementFaultsSending();
- }
+ metrics.incrementFaultsSending();
handleException("I/O Error submitting request : " +
e.getMessage(), e, conn);
}
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
Thu Sep 23 10:11:05 2010
@@ -218,6 +218,7 @@ public class HttpCoreNIOListener impleme
try {
FileInputStream fis = new FileInputStream(fileName);
definitions = new StAXOMBuilder(fis).getDocumentElement();
+ assert definitions != null;
definitions.build();
} catch (FileNotFoundException e) {
handleException("Priority configuration file cannot be found : " +
fileName, e);
@@ -225,8 +226,6 @@ public class HttpCoreNIOListener impleme
handleException("Error parsing priority configuration xml file " +
fileName, e);
}
- assert definitions != null;
-
OMElement executorElem = definitions.getFirstChildWithName(
new QName(ExecutorConstants.PRIORITY_EXECUTOR));
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
Thu Sep 23 10:11:05 2010
@@ -216,10 +216,13 @@ public class HttpCoreNIOSender extends A
/**
* Return the IOEventDispatch implementation to be used. This is
overridden by the
* SSL sender
- * @param handler
- * @param sslContext
- * @param params
- * @return
+ * @param handler The NHTTP client handler instance
+ * @param sslContext SSL context used by the sender or null
+ * @param sslIOSessionHandler SSL session handler or null
+ * @param params HTTP parameters
+ * @param trpOut Transport out description
+ * @return an IOEventDispatch instance
+ * @throws AxisFault on error
*/
protected IOEventDispatch getEventDispatch(NHttpClientHandler handler,
SSLContext sslContext,
SSLIOSessionHandler sslIOSessionHandler, HttpParams params,
@@ -230,9 +233,9 @@ public class HttpCoreNIOSender extends A
/**
* Always return null, as this implementation does not support outgoing SSL
- * @param transportOut
+ * @param transportOut The transport out description
* @return null
- * @throws AxisFault
+ * @throws AxisFault on error
*/
protected SSLContext getSSLContext(TransportOutDescription transportOut)
throws AxisFault {
return null;
@@ -240,8 +243,9 @@ public class HttpCoreNIOSender extends A
/**
* Create the SSL IO Session handler to be used by this listener
- * @param transportOut
+ * @param transportOut Transport out description
* @return always null
+ * @throws AxisFault on error
*/
protected SSLIOSessionHandler
getSSLIOSessionHandler(TransportOutDescription transportOut)
throws AxisFault {
@@ -404,7 +408,7 @@ public class HttpCoreNIOSender extends A
ServerConnectionDebug scd = (ServerConnectionDebug)
msgContext.getProperty(ServerHandler.SERVER_CONNECTION_DEBUG);
- ClientConnectionDebug ccd = null;
+ ClientConnectionDebug ccd;
if (scd != null) {
ccd = scd.getClientConnectionDebug();
if (ccd == null) {
@@ -464,7 +468,7 @@ public class HttpCoreNIOSender extends A
MessageFormatter messageFormatter =
MessageFormatterDecoratorFactory.createMessageFormatterDecorator(msgContext);
Boolean noEntityBody = (Boolean)
msgContext.getProperty(NhttpConstants.NO_ENTITY_BODY);
- if (noEntityBody == null || Boolean.FALSE == noEntityBody) {
+ if (noEntityBody == null || !noEntityBody) {
response.setHeader(
HTTP.CONTENT_TYPE,
messageFormatter.getContentType(msgContext, format,
msgContext.getSoapAction()));
@@ -518,15 +522,13 @@ public class HttpCoreNIOSender extends A
* write an empty byte array as body
*/
if (msgContext.isPropertyTrue(NhttpConstants.SC_ACCEPTED)
- || Boolean.TRUE == noEntityBody) {
+ || noEntityBody) {
out.write(new byte[0]);
} else {
messageFormatter.writeTo(msgContext, format, out, false);
}
out.close();
- if (lstMetrics != null) {
- lstMetrics.incrementMessagesSent();
- }
+ lstMetrics.incrementMessagesSent();
} catch (HttpException e) {
if (lstMetrics != null) {
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/debug/AbstractConnectionDebug.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/debug/AbstractConnectionDebug.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/debug/AbstractConnectionDebug.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/debug/AbstractConnectionDebug.java
Thu Sep 23 10:11:05 2010
@@ -31,7 +31,7 @@ import java.util.List;
*/
public abstract class AbstractConnectionDebug {
- protected static final DateFormat formatter = new
SimpleDateFormat("HH:mm:ss.SSS");
+ protected final DateFormat formatter = new
SimpleDateFormat("HH:mm:ss.SSS");
protected String keyValueSeparator;
protected String fieldSeparator;
Modified:
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
(original)
+++
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
Thu Sep 23 10:11:05 2010
@@ -180,11 +180,9 @@ public class FIXSessionFactory {
}
Hashtable<String,String> properties =
BaseUtils.getEPRProperties(fixEPR);
- Iterator<String> keys = properties.keySet().iterator();
- while (keys.hasNext()) {
- String currentKey = keys.next();
- settings.setString(sessionID, currentKey,
properties.get(currentKey));
- }
+ for (String key : properties.keySet()) {
+ settings.setString(sessionID, key, properties.get(key));
+ }
String[] socketAddressElements =
FIXUtils.getSocketAddressElements(fixEPR);
settings.setString(sessionID, FIXConstants.CONNECTION_TYPE,
FIXConstants.FIX_INITIATOR);
Modified:
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java?rev=1000390&r1=1000389&r2=1000390&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
(original)
+++
synapse/trunk/java/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
Thu Sep 23 10:11:05 2010
@@ -552,15 +552,13 @@ public class FIXUtils {
} else {
Hashtable<String,String> properties1 =
BaseUtils.getEPRProperties(url1);
Hashtable<String, String> properties2 =
BaseUtils.getEPRProperties(url2);
- Iterator<String> keys = properties1.keySet().iterator();
- while (keys.hasNext()) {
- String key = keys.next();
+ for (String key : properties1.keySet()) {
if (!properties2.containsKey(key)) {
return false;
} else if (!properties1.get(key).equals(properties2.get(key)))
{
return false;
}
- }
+ }
}
return true;
}
