Author: indika
Date: Fri Mar 13 07:46:03 2009
New Revision: 753149
URL: http://svn.apache.org/viewvc?rev=753149&view=rev
Log:
Add annotations
Add a Constructor for GetPropertyFunction and remove setter method
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.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/registry/url/SimpleURLRegistry.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java?rev=753149&r1=753148&r2=753149&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
Fri Mar 13 07:46:03 2009
@@ -30,7 +30,7 @@
public class AsyncCallback implements AxisCallback {
/** The corresponding Synapse outgoing message context this instance is
holding onto */
- private MessageContext synapseOutMsgCtx = null;
+ private final MessageContext synapseOutMsgCtx;
/** Time to timeout this callback */
private long timeOutOn;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?rev=753149&r1=753148&r2=753149&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Fri Mar 13 07:46:03 2009
@@ -24,8 +24,8 @@
import org.apache.axis2.transport.base.BaseConstants;
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.SynapseConstants;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.jaxen.Context;
@@ -34,10 +34,10 @@
import org.jaxen.Navigator;
import org.jaxen.function.StringFunction;
-import java.util.List;
-import java.util.Map;
import java.text.Format;
import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
/**
* Implements the XPath extension function
synapse:get-property(scope,prop-name)
@@ -50,14 +50,14 @@
public static final String NULL_STRING = "";
/** Synapse Message context*/
- private MessageContext synCtx = null;
+ private final MessageContext synCtx;
- public MessageContext getSynCtx() {
- return synCtx;
+ public GetPropertyFunction(MessageContext synCtx) {
+ this.synCtx = synCtx;
}
- public void setSynCtx(MessageContext synCtx) {
- this.synCtx = synCtx;
+ public MessageContext getSynCtx() {
+ return synCtx;
}
/**
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?rev=753149&r1=753148&r2=753149&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
Fri Mar 13 07:46:03 2009
@@ -22,10 +22,10 @@
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
+import org.apache.synapse.audit.statistics.StatisticsReporter;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.synapse.mediators.MediatorFaultHandler;
-import org.apache.synapse.audit.statistics.StatisticsReporter;
import java.util.Stack;
@@ -170,6 +170,7 @@
* This method will ensure that each and every sequence wil only be
initialized atmost once
* @param se - enviorenment to be initialized
*/
+ @Override
public synchronized void init(SynapseEnvironment se) {
if (!initialized) {
super.init(se);
@@ -177,6 +178,7 @@
}
}
+ @Override
public synchronized void destroy() {
if (initialized) {
super.destroy();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java?rev=753149&r1=753148&r2=753149&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
Fri Mar 13 07:46:03 2009
@@ -59,6 +59,7 @@
* do the IC lookup here
* @param se the Synapse environment reference
*/
+ @Override
public void init(SynapseEnvironment se) {
// do nothing
}
@@ -66,6 +67,7 @@
/**
* Destroys the mediator. If we are using our custom DataSource, then shut
down the connections
*/
+ @Override
public void destroy() {
if (this.dataSource instanceof BasicDataSource) {
try {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java?rev=753149&r1=753148&r2=753149&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
Fri Mar 13 07:46:03 2009
@@ -83,30 +83,32 @@
return result;
}
- public void destroy() {
+ @Override
+ public void destroy() {
if (log.isDebugEnabled()) {
log.debug("Destroying class mediator instance for : " +
mediator.getClass());
}
if (mediator instanceof ManagedLifecycle) {
- ((ManagedLifecycle) mediator).destroy();
- }
- }
+ ((ManagedLifecycle) mediator).destroy();
+ }
+ }
- public void init(SynapseEnvironment se) {
+ @Override
+ public void init(SynapseEnvironment se) {
if (log.isDebugEnabled()) {
log.debug("Initializing class mediator instance for : " +
mediator.getClass());
}
if (mediator == null) {
log.warn("init() called before mediator reference set");
return;
- }
+ }
- if (mediator instanceof ManagedLifecycle) {
- ((ManagedLifecycle) mediator).init(se);
- }
- }
+ if (mediator instanceof ManagedLifecycle) {
+ ((ManagedLifecycle) mediator).init(se);
+ }
+ }
- public void setMediator(Mediator mediator) {
+ public void setMediator(Mediator mediator) {
this.mediator = mediator;
}
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=753149&r1=753148&r2=753149&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
Fri Mar 13 07:46:03 2009
@@ -45,6 +45,7 @@
/** The default switch case, if any */
private SwitchCase defaultCase = null;
+ @Override
public void init(SynapseEnvironment se) {
for (ManagedLifecycle swCase : cases) {
swCase.init(se);
@@ -54,6 +55,7 @@
}
}
+ @Override
public void destroy() {
for (ManagedLifecycle swCase : cases) {
swCase.destroy();
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=753149&r1=753148&r2=753149&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
Fri Mar 13 07:46:03 2009
@@ -56,8 +56,10 @@
public OMNode lookup(String key) {
- log.debug("==> Repository fetch of resource with key : " + key);
+ if (log.isDebugEnabled()) {
+ log.debug("==> Repository fetch of resource with key : " + key);
+ }
URL url = SynapseConfigUtils.getURLFromPath(root + key);
if (url == null) {
return null;
@@ -161,7 +163,7 @@
wre.setCachableDuration(
connection.getExpiration() - System.currentTimeMillis());
} else {
- wre.setCachableDuration(getCachableDuration(key));
+ wre.setCachableDuration(getCachableDuration());
}
return wre;
}
@@ -182,7 +184,7 @@
}
root = value;
} else {
- handleException("Parameter 'root' is null");
+ handleException("Parameter root is null");
}
}
@@ -205,7 +207,7 @@
}
- public long getCachableDuration(String rootPath) {
+ private long getCachableDuration() {
String cachableDuration = (String) properties.get("cachableDuration");
return cachableDuration == null ? 1500 :
Long.parseLong(cachableDuration);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java?rev=753149&r1=753148&r2=753149&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
Fri Mar 13 07:46:03 2009
@@ -72,13 +72,11 @@
throws UnresolvableException {
if (localName != null &&
SynapseXPathConstants.GET_PROPERTY_FUNCTION.equals(localName)) {
-
+
// create an instance of a synapse:get-property()
// function and set it to the xpath
- GetPropertyFunction getPropertyFunc = new GetPropertyFunction();
- getPropertyFunc.setSynCtx(synCtx);
+ return new GetPropertyFunction(synCtx);
- return getPropertyFunc;
}
// if not the get-property function then try to get it from the parent
context
