You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/02/23 08:31:50 UTC
svn commit: r746908 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
core/axis2/ endpoints/ endpoints/dispatch/ mediators/ mediators/builtin/
mediators/filters/ mediators/transform/ registry/ registry/url/
util/concurrent/
Author: indika
Date: Mon Feb 23 07:31:49 2009
New Revision: 746908
URL: http://svn.apache.org/viewvc?rev=746908&view=rev
Log:
minor improvements
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SessionInformation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java Mon Feb 23 07:31:49 2009
@@ -27,7 +27,6 @@
import org.apache.synapse.ServerManager;
import org.apache.synapse.endpoints.dispatch.SALSessions;
-import java.util.Iterator;
import java.util.Map;
import java.util.Stack;
import java.util.TimerTask;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java Mon Feb 23 07:31:49 2009
@@ -32,12 +32,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.clustering.ClusteringAgent;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.util.Stack;
import java.util.List;
-import java.util.Set;
-import java.lang.management.ManagementFactory;
+import java.util.Stack;
+
/**
* An abstract base class for all Endpoint implementations
@@ -196,7 +193,7 @@
/**
* Is this a leaf level endpoint? or parent endpoint that has children?
- * @return
+ * @return true if this is a leaf endpoint
*/
public boolean isLeafEndpoint() {
return children == null || children.size() == 0;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java Mon Feb 23 07:31:49 2009
@@ -19,9 +19,6 @@
package org.apache.synapse.endpoints;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseConstants;
-
/**
* This class represents an endpoint with the EPR as the 'To' header of the message. It is
* responsible for sending the message to this EPR, performing retries etc on failure and
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SALSessions.java Mon Feb 23 07:31:49 2009
@@ -41,7 +41,7 @@
private static final Log log = LogFactory.getLog(SALSessions.class);
- private String SESSION_IDS = "synapse.salep.sessionids.";
+ private final static String SESSION_IDS = "synapse.salep.sessionids.";
private ConfigurationContext configCtx;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SessionInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SessionInformation.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SessionInformation.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SessionInformation.java Mon Feb 23 07:31:49 2009
@@ -35,7 +35,7 @@
private String rootEndpointName;
private List<String> path;
private long expiryTime;
- private transient List<Endpoint> endpointList;
+ private final transient List<Endpoint> endpointList;
public SessionInformation(String id, List<Endpoint> endpointList, long expiryTime) {
this.id = id;
@@ -71,10 +71,6 @@
return endpointList;
}
- public void setEndpointList(List<Endpoint> endpointList) {
- this.endpointList = endpointList;
- }
-
public String getRootEndpointName() {
return rootEndpointName;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java Mon Feb 23 07:31:49 2009
@@ -103,8 +103,8 @@
/**
* Get a SynapseLog instance appropriate for the given context.
*
- * @param synCtx
- * @return
+ * @param synCtx the current message context
+ * @return MediatorLog instance - an implementation of the SynapseLog
*/
protected SynapseLog getLog(MessageContext synCtx) {
return new MediatorLog(log, isTraceOn(synCtx), synCtx);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java Mon Feb 23 07:31:49 2009
@@ -56,12 +56,12 @@
if (synLog.isTraceOrDebugEnabled()) {
StringBuffer sb = new StringBuffer();
- sb.append("Sending " + (synCtx.isResponse() ? "response" : "request")
- + " message using implicit message properties..");
- sb.append("\nSending To: " + (synCtx.getTo() != null ?
- synCtx.getTo().getAddress() : "null"));
- sb.append("\nSOAPAction: " + (synCtx.getWSAAction() != null ?
- synCtx.getWSAAction() : "null"));
+ sb.append("Sending ").append(synCtx.isResponse() ? "response" : "request").
+ append(" message using implicit message properties..");
+ sb.append("\nSending To: ").append(synCtx.getTo() != null ?
+ synCtx.getTo().getAddress() : "null");
+ sb.append("\nSOAPAction: ").append(synCtx.getWSAAction() != null ?
+ synCtx.getWSAAction() : "null");
synLog.traceOrDebug(sb.toString());
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java Mon Feb 23 07:31:49 2009
@@ -19,9 +19,6 @@
package org.apache.synapse.mediators.filters;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
import org.apache.synapse.mediators.AbstractListMediator;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java Mon Feb 23 07:31:49 2009
@@ -177,7 +177,7 @@
/**
* setting the default case ...which contains mediators to invoke when no case condition satisfy
- * @param defaultCase
+ * @param defaultCase A SwitchCase instance representing default case
*/
public void setDefaultCase(SwitchCase defaultCase) {
this.defaultCase = defaultCase;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java Mon Feb 23 07:31:49 2009
@@ -33,7 +33,6 @@
import org.apache.synapse.util.xpath.SynapseXPath;
import javax.xml.namespace.QName;
-import java.util.Iterator;
import java.util.List;
/**
@@ -173,8 +172,7 @@
if (headersList == null || headersList.isEmpty()) {
return;
}
- for ( Iterator iter = headersList.iterator();iter.hasNext();) {
- Object o = iter.next();
+ for (Object o : headersList) {
if (o instanceof SOAPHeaderBlock) {
SOAPHeaderBlock header = (SOAPHeaderBlock) o;
if (header.getLocalName().equals(qName.getLocalPart())) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java Mon Feb 23 07:31:49 2009
@@ -129,17 +129,17 @@
/**
* Any parameters which should be passed into the XSLT transformation
*/
- private List<MediatorProperty> properties = new ArrayList<MediatorProperty>();
+ private final List<MediatorProperty> properties = new ArrayList<MediatorProperty>();
/**
* Any features which should be set to the TransformerFactory explicitly
*/
- private List<MediatorProperty> transformerFactoryFeatures = new ArrayList<MediatorProperty>();
+ private final List<MediatorProperty> transformerFactoryFeatures = new ArrayList<MediatorProperty>();
/**
* Any attributes which should be set to the TransformerFactory explicitly
*/
- private List<MediatorProperty> transformerFactoryAttributes
+ private final List<MediatorProperty> transformerFactoryAttributes
= new ArrayList<MediatorProperty>();
/**
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java Mon Feb 23 07:31:49 2009
@@ -37,11 +37,11 @@
private static final Log log = LogFactory.getLog(AbstractRegistry.class);
/** The list of configuration properties */
- protected Properties properties = new Properties();
+ protected final Properties properties = new Properties();
/**
* Get the resource for the given key from this registry
- * @param entry
+ * @param entry The Enrty instance that contains meta-data
* @return the matching resultant object
*/
public Object getResource(Entry entry) {
@@ -88,7 +88,8 @@
entry.setExpiryTime(-1);
}
if (log.isDebugEnabled()) {
- log.debug("Renew cache lease for another " + re.getCachableDuration() / 1000 + "s");
+ log.debug("Renew cache lease for another " + re.getCachableDuration() / 1000 +
+ "s");
}
// return cached object
@@ -158,6 +159,6 @@
}
public void init(Properties properties) {
- this.properties =properties;
+ this.properties.putAll(properties);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java Mon Feb 23 07:31:49 2009
@@ -134,7 +134,7 @@
}
public RegistryEntry getRegistryEntry(String key) {
-
+
if (log.isDebugEnabled()) {
log.debug("Perform RegistryEntry lookup for key : " + key);
}
@@ -227,13 +227,11 @@
if (!file.isDirectory()) {
return null;
}
- InputStream inStream = null;
+ BufferedReader reader = null;
try {
- inStream = (InputStream) url.getContent();
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(inStream));
- ArrayList entryList = new ArrayList();
- String key = "";
+ reader = new BufferedReader(new InputStreamReader((InputStream) url.getContent()));
+ ArrayList<RegistryEntry> entryList = new ArrayList<RegistryEntry>();
+ String key;
while ((key = reader.readLine()) != null) {
RegistryEntryImpl registryEntryImpl = new RegistryEntryImpl();
if (entry.getKey().equals("")) {
@@ -251,14 +249,19 @@
RegistryEntry[] entries = new RegistryEntry[entryList.size()];
for (int i = 0; i < entryList.size(); i++) {
- entries[i] = (RegistryEntry) entryList.get(i);
+ entries[i] = entryList.get(i);
}
return entries;
-
} catch (Exception e) {
throw new SynapseException("Error in reading the URL.");
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException ignored) {
+ }
+ }
}
-
} else {
throw new SynapseException("Invalid protocol.");
}
@@ -266,49 +269,35 @@
public RegistryEntry[] getDescendants(RegistryEntry entry) {
- ArrayList list = new ArrayList();
- RegistryEntry[] entries = getChildren(entry);
- if (entries != null) {
- for (int i = 0; i < entries.length; i++) {
-
- if (list.size() > MAX_KEYS) {
- break;
- }
-
- fillDescendants(entries[i], list);
- }
- }
+ ArrayList<RegistryEntry> list = new ArrayList<RegistryEntry>();
+ fillDescendants(entry, list);
RegistryEntry[] descendants = new RegistryEntry[list.size()];
for (int i = 0; i < list.size(); i++) {
- descendants[i] = (RegistryEntry) list.get(i);
+ descendants[i] = list.get(i);
}
return descendants;
}
- private void fillDescendants(RegistryEntry parent, ArrayList list) {
-
- RegistryEntry[] entries = getChildren(parent);
- if (entries != null) {
- for (int i = 0; i < entries.length; i++) {
+ private void fillDescendants(RegistryEntry parent, ArrayList<RegistryEntry> list) {
+ RegistryEntry[] children = getChildren(parent);
+ if (children != null) {
+ for (RegistryEntry child : children) {
+ if (child == null) {
+ continue;
+ }
if (list.size() > MAX_KEYS) {
break;
}
-
- fillDescendants(entries[i], list);
+ fillDescendants(child, list);
}
} else {
list.add(parent);
}
}
- private void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseException(msg, e);
- }
-
private void handleException(String msg) {
log.error(msg);
throw new SynapseException(msg);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java?rev=746908&r1=746907&r2=746908&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java Mon Feb 23 07:31:49 2009
@@ -29,13 +29,13 @@
public class SynapseThreadFactory implements ThreadFactory {
/** Holds the ThreadGroup under which this factory creates threads */
- final ThreadGroup group;
+ private final ThreadGroup group;
/** Holds the AtomicInteger class instance for the factory */
- final AtomicInteger count;
+ private final AtomicInteger count;
/** prefix for the thread id, thread number will be followed to construct the id */
- final String namePrefix;
+ private final String namePrefix;
/**
* Constructor for the ThreadFactory to create new threads