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/17 13:18:30 UTC
svn commit: r744993 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/audit/statistics/view/
core/src/main/java/org/apache/synapse/config/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/con...
Author: indika
Date: Tue Feb 17 12:18:29 2009
New Revision: 744993
URL: http://svn.apache.org/viewvc?rev=744993&view=rev
Log:
some code improvement based on findbug tool feedback
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.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/metrics/GlobalRequestCountHandler.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/format/syslog/SyslogMessageBuilder.java
synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java
synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java Tue Feb 17 12:18:29 2009
@@ -28,11 +28,13 @@
*/
public class PerUserDomainViewStrategy extends PerUserViewStrategy {
- public Map<String, Map<String, Statistics>> determineView(List<StatisticsRecord> statisticsRecords, int type) {
+ public Map<String, Map<String, Statistics>> determineView(
+ List<StatisticsRecord> statisticsRecords, int type) {
return determineView(statisticsRecords, type, DOMAIN);
}
- public Map<String, Statistics> determineView(String id, List<StatisticsRecord> statisticsRecords, int type) {
+ public Map<String, Statistics> determineView(
+ String id, List<StatisticsRecord> statisticsRecords, int type) {
return determineView(id, statisticsRecords, type, DOMAIN);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java Tue Feb 17 12:18:29 2009
@@ -28,11 +28,13 @@
*/
public class PerUserIPViewStrategy extends PerUserViewStrategy {
- public Map<String, Map<String, Statistics>> determineView(List<StatisticsRecord> statisticsRecords, int type) {
+ public Map<String, Map<String, Statistics>> determineView(
+ List<StatisticsRecord> statisticsRecords, int type) {
return determineView(statisticsRecords, type, IP);
}
- public Map<String, Statistics> determineView(String id, List<StatisticsRecord> statisticsRecords, int type) {
+ public Map<String, Statistics> determineView(
+ String id, List<StatisticsRecord> statisticsRecords, int type) {
return determineView(id, statisticsRecords, type, IP);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java Tue Feb 17 12:18:29 2009
@@ -35,7 +35,7 @@
protected final static int IP = 0;
protected final static int DOMAIN = 1;
- private static Log log;
+ private Log log;
protected PerUserViewStrategy() {
log = LogFactory.getLog(getClass());
@@ -226,7 +226,7 @@
return statisticsMap;
}
- private static void handleException(String msg) {
+ private void handleException(String msg) {
log.error(msg);
throw new SynapseException(msg);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java Tue Feb 17 12:18:29 2009
@@ -36,7 +36,9 @@
private SynapsePropertiesLoader() {
}
- private static Properties cacheProperties;
+ private final static Properties cacheProperties = new Properties();
+
+ private static boolean reload = true;
/**
* Loads the properties
@@ -46,14 +48,15 @@
*/
public static Properties loadSynapseProperties() {
- if (cacheProperties == null) {
+ if (reload) {
if (log.isDebugEnabled()) {
log.debug("Loading synapse properties from a property file");
}
- cacheProperties = MiscellaneousUtil.loadProperties(
- SynapseConstants.SYNAPSE_PROPERTIES);
+ cacheProperties.putAll(MiscellaneousUtil.loadProperties(
+ SynapseConstants.SYNAPSE_PROPERTIES));
+ reload = false;
} else {
@@ -77,7 +80,8 @@
if (log.isDebugEnabled()) {
log.debug("Reloading synapse properties");
}
- cacheProperties = null;
+ reload = true;
+ cacheProperties.clear();
return loadSynapseProperties();
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java Tue Feb 17 12:18:29 2009
@@ -53,9 +53,9 @@
));
}
- if (mediator.getSeparator() != LogMediator.DEFAULT_SEP) {
+ if (!LogMediator.DEFAULT_SEP.equals(mediator.getSeparator())) {
log.addAttribute(fac.createOMAttribute(
- "separator", nullNS, mediator.getSeparator()));
+ "separator", nullNS, mediator.getSeparator()));
}
super.serializeProperties(log, mediator.getProperties());
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java Tue Feb 17 12:18:29 2009
@@ -62,18 +62,15 @@
EventPublisherMediatorSerializer.class
};
- private static MediatorSerializerFinder instance = null;
+ private final static MediatorSerializerFinder instance = new MediatorSerializerFinder();
/**
* A map of mediator QNames to implementation class
*/
- private static Map<String, MediatorSerializer> serializerMap
+ private final Map<String, MediatorSerializer> serializerMap
= new HashMap<String, MediatorSerializer>();
public static synchronized MediatorSerializerFinder getInstance() {
- if (instance == null) {
- instance = new MediatorSerializerFinder();
- }
return instance;
}
@@ -82,9 +79,6 @@
}
private MediatorSerializerFinder() {
-
- serializerMap = new HashMap<String, MediatorSerializer>();
-
for (Class c : mediatorSerializers) {
try {
MediatorSerializer ser = (MediatorSerializer) c.newInstance();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java Tue Feb 17 12:18:29 2009
@@ -62,7 +62,7 @@
* @return boolean value
*/
public boolean mediate(MessageContext synCtx) {
- return caseMediator != null ? caseMediator.mediate(synCtx) : true;
+ return caseMediator == null || caseMediator.mediate(synCtx);
}
/**
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java Tue Feb 17 12:18:29 2009
@@ -36,9 +36,6 @@
private static final OMNamespace synNS = fac.createOMNamespace(
XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
- private static final OMNamespace nullNS = fac.createOMNamespace(
- XMLConfigConstants.NULL_NAMESPACE, "");
-
/**
* Order of entries is irrelevant, however its nice to have some order.
*
@@ -107,19 +104,21 @@
}
private static void serializeEntries(OMElement definitions, Map entries) {
- Iterator iter = entries.keySet().iterator();
- while (iter.hasNext()) {
- String key = (String) iter.next();
- EntrySerializer.serializeEntry((Entry) entries.get(key),
- definitions);
+ for (Object o : entries.keySet()) {
+ if (o instanceof String) {
+ String key = (String) o;
+ EntrySerializer.serializeEntry((Entry) entries.get(key),
+ definitions);
+ }
}
}
private static void serializeStartups(OMElement definitions, Collection startups) {
- Iterator it = startups.iterator();
- while (it.hasNext()) {
- Startup s = (Startup) it.next();
- StartupFinder.getInstance().serializeStartup(definitions, s);
+ for (Object o : startups) {
+ if (o instanceof Startup) {
+ Startup s = (Startup) o;
+ StartupFinder.getInstance().serializeStartup(definitions, s);
+ }
}
}
@@ -130,12 +129,13 @@
}
private static void serializeSequences(OMElement definitions, Map sequences) {
- Iterator iter = sequences.keySet().iterator();
- while (iter.hasNext()) {
- String key = (String) iter.next();
- Mediator mediator = (Mediator) sequences.get(key);
- MediatorSerializerFinder.getInstance().getSerializer(mediator)
- .serializeMediator(definitions, mediator);
+ for (Object o : sequences.keySet()) {
+ if (o instanceof String) {
+ String key = (String) o;
+ Mediator mediator = (Mediator) sequences.get(key);
+ MediatorSerializerFinder.getInstance().getSerializer(mediator)
+ .serializeMediator(definitions, mediator);
+ }
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java Tue Feb 17 12:18:29 2009
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.SynapseException;
import org.apache.synapse.endpoints.AddressEndpoint;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.EndpointDefinition;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java Tue Feb 17 12:18:29 2009
@@ -39,7 +39,7 @@
*/
public abstract class EndpointSerializer {
- private static Log log;
+ private Log log;
protected OMFactory fac;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java Tue Feb 17 12:18:29 2009
@@ -481,14 +481,5 @@
}
return sb.toString();
- }
-
- private void initAudit(MessageContext synCtx) {
-
- if (XMLConfigConstants.STATISTICS_ENABLE.equals(
- synCtx.getConfiguration().getProperty(SynapseConstants.SYNAPSE_AUDIT_STATE))) {
- synCtx.setProperty(SynapseConstants.SYNAPSE_AUDIT_CONFIGURATION,
- new AuditConfiguration(SynapseConstants.SYNAPSE_AUDIT, true));
- }
- }
+ }
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java Tue Feb 17 12:18:29 2009
@@ -55,9 +55,9 @@
*/
public void updateSession(MessageContext synCtx) {
- Object cookie = extractSessionID(synCtx, SET_COOKIE);
+ String cookie = extractSessionID(synCtx, SET_COOKIE);
- if (cookie != null && cookie instanceof String) {
+ if (cookie != null) {
// extract the first name value pair of the Set-Cookie header, which is considered
// as the session id which will be sent back from the client with the Cookie header
@@ -70,7 +70,16 @@
log.debug("Found the HTTP header 'Set-Cookie: "
+ cookie + "' for updating the session");
}
- String sessionId = ((String) cookie).split(";")[0];
+
+ String[] sessionIds = cookie.split(";");
+ if (sessionIds == null || sessionIds.length == 0) {
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find a session id for the cookie : " + cookie);
+ }
+ return;
+ }
+
+ String sessionId = sessionIds[0];
if (log.isDebugEnabled()) {
log.debug("Using the session id '" + sessionId +
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java Tue Feb 17 12:18:29 2009
@@ -161,8 +161,7 @@
}
} else if (requestXPath != null) {
try {
- Object o = null;
- o = requestXPath.evaluate(MessageHelper.cloneMessageContext(synCtx));
+ Object o = requestXPath.evaluate(MessageHelper.cloneMessageContext(synCtx));
if (o instanceof OMElement) {
return (OMElement) o;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java Tue Feb 17 12:18:29 2009
@@ -57,7 +57,7 @@
/** The separator for which used to separate logging information */
private String separator = DEFAULT_SEP;
/** The holder for the custom properties */
- private List properties = new ArrayList();
+ private final List<MediatorProperty> properties = new ArrayList<MediatorProperty>();
/**
* Logs the current message according to the supplied semantics
@@ -107,20 +107,21 @@
private String getSimpleLogMessage(MessageContext synCtx) {
StringBuffer sb = new StringBuffer();
if (synCtx.getTo() != null)
- sb.append("To: " + synCtx.getTo().getAddress());
+ sb.append("To: ").append(synCtx.getTo().getAddress());
else
sb.append("To: ");
if (synCtx.getFrom() != null)
- sb.append(separator + "From: " + synCtx.getFrom().getAddress());
+ sb.append(separator).append("From: ").append(synCtx.getFrom().getAddress());
if (synCtx.getWSAAction() != null)
- sb.append(separator + "WSAction: " + synCtx.getWSAAction());
+ sb.append(separator).append("WSAction: ").append(synCtx.getWSAAction());
if (synCtx.getSoapAction() != null)
- sb.append(separator + "SOAPAction: " + synCtx.getSoapAction());
+ sb.append(separator).append("SOAPAction: ").append(synCtx.getSoapAction());
if (synCtx.getReplyTo() != null)
- sb.append(separator + "ReplyTo: " + synCtx.getReplyTo().getAddress());
+ sb.append(separator).append("ReplyTo: ").append(synCtx.getReplyTo().getAddress());
if (synCtx.getMessageID() != null)
- sb.append(separator + "MessageID: " + synCtx.getMessageID());
- sb.append(separator + "Direction: " + (synCtx.isResponse() ? "response" : "request"));
+ sb.append(separator).append("MessageID: ").append(synCtx.getMessageID());
+ sb.append(separator).append("Direction: ").append(
+ synCtx.isResponse() ? "response" : "request");
setCustomProperties(sb, synCtx);
return trimLeadingSeparator(sb);
}
@@ -134,12 +135,12 @@
Object o = iter.next();
if (o instanceof SOAPHeaderBlock) {
SOAPHeaderBlock headerBlk = (SOAPHeaderBlock) o;
- sb.append(separator + headerBlk.getLocalName() + " : " +
- headerBlk.getText());
+ sb.append(separator).append(headerBlk.getLocalName()).
+ append(" : ").append(headerBlk.getText());
} else if (o instanceof OMElement) {
OMElement headerElem = (OMElement) o;
- sb.append(separator + headerElem.getLocalName() + " : " +
- headerElem.getText());
+ sb.append(separator).append(headerElem.getLocalName()).
+ append(" : ").append(headerElem.getText());
}
}
}
@@ -152,17 +153,18 @@
StringBuffer sb = new StringBuffer();
sb.append(getSimpleLogMessage(synCtx));
if (synCtx.getEnvelope() != null)
- sb.append(separator + "Envelope: " + synCtx.getEnvelope());
+ sb.append(separator).append("Envelope: ").append(synCtx.getEnvelope());
return trimLeadingSeparator(sb);
}
private void setCustomProperties(StringBuffer sb, MessageContext synCtx) {
if (properties != null && !properties.isEmpty()) {
- for (Iterator iter = properties.iterator(); iter.hasNext();) {
- MediatorProperty prop = (MediatorProperty) iter.next();
- sb.append(separator + prop.getName() + " = " +
- (prop.getValue() != null ? prop.getValue() :
- prop.getEvaluatedExpression(synCtx)));
+ for (MediatorProperty property : properties) {
+ if(property != null){
+ sb.append(separator).append(property.getName()).append(" = ").append(property.getValue()
+ != null ? property.getValue() :
+ property.getEvaluatedExpression(synCtx));
+ }
}
}
}
@@ -187,11 +189,11 @@
properties.add(p);
}
- public void addAllProperties(List list) {
+ public void addAllProperties(List<MediatorProperty> list) {
properties.addAll(list);
}
- public List getProperties() {
+ public List<MediatorProperty> getProperties() {
return properties;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java Tue Feb 17 12:18:29 2009
@@ -34,9 +34,9 @@
*/
public class Statement {
- String rawStatement = null;
- List parameters = new ArrayList();
- Map resultsMap = new HashMap();
+ private String rawStatement = null;
+ private final List<Parameter> parameters = new ArrayList<Parameter>();
+ private final Map<String, String> resultsMap = new HashMap<String, String>();
public Statement(String rawStatement) {
this.rawStatement = rawStatement;
@@ -54,11 +54,11 @@
resultsMap.put(propertyName, column);
}
- public List getParameters() {
+ public List<Parameter> getParameters() {
return parameters;
}
- public Map getResultsMap() {
+ public Map<String, String> getResultsMap() {
return resultsMap;
}
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=744993&r1=744992&r2=744993&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 Tue Feb 17 12:18:29 2009
@@ -87,7 +87,6 @@
// if I have been explicitly asked to enable or disable tracing, set it to the message
// to pass it on; else, do nothing -> i.e. let the parents state flow
setEffectiveTraceState(synCtx);
- int myEffectiveTraceState = synCtx.getTracingState();
String sourceText = source.stringValueOf(synCtx);
if (synLog.isTraceOrDebugEnabled()) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java Tue Feb 17 12:18:29 2009
@@ -32,7 +32,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
msgContext
- .setProperty(MetricsConstants.REQUEST_RECEIVED_TIME, new Long(System.currentTimeMillis()));
+ .setProperty(MetricsConstants.REQUEST_RECEIVED_TIME, System.currentTimeMillis());
// global increment
((Counter) msgContext.getParameter(MetricsConstants.GLOBAL_REQUEST_COUNTER).getValue())
.increment();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/keystore/AbstractKeyStoreLoader.java Tue Feb 17 12:18:29 2009
@@ -38,7 +38,7 @@
*/
public abstract class AbstractKeyStoreLoader implements IKeyStoreLoader {
- protected static Log log;
+ protected Log log;
protected AbstractKeyStoreLoader() {
log = LogFactory.getLog(this.getClass());
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=744993&r1=744992&r2=744993&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 Tue Feb 17 12:18:29 2009
@@ -134,7 +134,7 @@
if (pid != -1) {
message.addAttribute(factory.createOMAttribute(SyslogConstants.PID, null, String.valueOf(pid)));
}
- message.setText(content.toString());
+ message.setText(content);
return message;
}
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java Tue Feb 17 12:18:29 2009
@@ -79,7 +79,7 @@
}
public void setTraceState(int traceState) {
- traceState = 0;
+ this.traceState = traceState;
}
public int getTraceState() {
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java Tue Feb 17 12:18:29 2009
@@ -39,7 +39,7 @@
private static SampleAxis2ServerManager ourInstance = new SampleAxis2ServerManager();
- public static int DEFAULT_PORT = 9000;
+ public final static int DEFAULT_PORT = 9000;
private ConfigurationContext configctx;
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java Tue Feb 17 12:18:29 2009
@@ -282,8 +282,9 @@
if (acceptor != null) {
return FIXUtils.generateEPRs(acceptor, serviceName, ip);
- } else
- return null;
+ } else {
+ return new String[]{};
+ }
}
/**
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=744993&r1=744992&r2=744993&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 Tue Feb 17 12:18:29 2009
@@ -36,15 +36,15 @@
/**
* Helper method to get the value of the property from a given property bag
*
- * @param dsProperties The property collection
+ * @param properties The property collection
* @param name The name of the property
* @param defaultValue The default value for the property
* @return The value of the property if it is found , otherwise , default value
*/
- public static String getProperty(Properties dsProperties, String name, String defaultValue) {
+ public static String getProperty(Properties properties, String name, String defaultValue) {
- String result = dsProperties.getProperty(name);
- if ((result == null || result.length() == 0 || "".equals(result)) && defaultValue != null) {
+ String result = properties.getProperty(name);
+ if ((result == null || result.length() == 0) && defaultValue != null) {
if (log.isDebugEnabled()) {
log.debug("The name with ' " + name + " ' cannot be found. " +
"Using default value " + defaultValue);
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java?rev=744993&r1=744992&r2=744993&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java Tue Feb 17 12:18:29 2009
@@ -117,7 +117,7 @@
*/
public static void setStaticProperty(OMElement property, Object o) {
- if (property.getLocalName().toLowerCase().equals("property")) {
+ if (("property".equals(property.getLocalName().toLowerCase()))) {
String propertyName = property.getAttributeValue(new QName("name"));
String mName = "set"