Author: hiranya
Date: Fri Aug 2 20:42:30 2013
New Revision: 1509848
URL: http://svn.apache.org/r1509848
Log:
Some refactoring and minor improvements - Removing redundant null checks etc.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.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/SynapseImportFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.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/deployers/ImportDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/ArtifactFile.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Access.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/passthru/ServerWorker.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
Fri Aug 2 20:42:30 2013
@@ -442,8 +442,8 @@ public class Axis2SynapseController impl
}
// continue stopping the axis2 environment if we created it
- if (serverConfigurationInformation.isCreateNewInstance() &&
configurationContext != null
- && configurationContext.getAxisConfiguration() != null) {
+ if (serverConfigurationInformation.isCreateNewInstance() &&
+ configurationContext.getAxisConfiguration() != null) {
Map<String, AxisService> serviceMap =
configurationContext.getAxisConfiguration().getServices();
for (AxisService svc : serviceMap.values()) {
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=1509848&r1=1509847&r2=1509848&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
Fri Aug 2 20:42:30 2013
@@ -120,10 +120,8 @@ public class SwitchCase implements Manag
Matcher matcher = regex.matcher(value);
if (matcher == null) {
-
log.warn("Matcher for the provided character sequence and the
pattern ' "
+ regex + " '" + " cannot be found. Switch case will not
be executed.");
-
return false;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
Fri Aug 2 20:42:30 2013
@@ -70,9 +70,4 @@ public class SynapseImportFactory {
throw new SynapseException(msg);
}
- private static void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseException(msg, e);
- }
-
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
Fri Aug 2 20:42:30 2013
@@ -47,30 +47,22 @@ public class SynapseImportSerializer {
/**
* This method will implements the serialization of SynapseImport object
to its configuration
*
- * @param s the type SynapseImport which is subjected to the serialization
+ * @param synapseImport the type SynapseImport which is subjected to the
serialization
* @return OMElement serialized in to xml from the given parameters
*/
- public OMElement serializeImport(SynapseImport s) {
-
-
- if (!(s instanceof SynapseImport)) {
- handleException("Unsupported Synapse Import passed in for
serialization");
- }
-
- SynapseImport synapseImport = (SynapseImport) s;
-
+ public OMElement serializeImport(SynapseImport synapseImport) {
OMElement importElem = fac.createOMElement("import", synNS);
if (synapseImport.getLibName() != null) {
importElem.addAttribute(fac.createOMAttribute(
- "name", nullNS, s.getLibName()));
+ "name", nullNS, synapseImport.getLibName()));
} else {
handleException("Invalid Synapse Import. Target Library name is
required");
}
if (synapseImport.getLibPackage() != null) {
importElem.addAttribute(fac.createOMAttribute(
- "package", nullNS, s.getLibPackage()));
+ "package", nullNS, synapseImport.getLibPackage()));
} else {
handleException("Invalid Synapse Import. Target Library package is
required");
}
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=1509848&r1=1509847&r2=1509848&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
Fri Aug 2 20:42:30 2013
@@ -152,13 +152,10 @@ public class Axis2MessageContext impleme
if (o != null && o instanceof Mediator) {
return (Mediator) o;
} else {
- Mediator m = getConfiguration().getSequenceTemplate(key);
- if (m instanceof TemplateMediator) {
- TemplateMediator templateMediator = (TemplateMediator) m;
- synchronized (m) {
- if (!templateMediator.isInitialized()) {
- templateMediator.init(synEnv);
- }
+ TemplateMediator m = getConfiguration().getSequenceTemplate(key);
+ synchronized (m) {
+ if (!m.isInitialized()) {
+ m.init(synEnv);
}
}
localEntries.put(key, m);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
Fri Aug 2 20:42:30 2013
@@ -148,9 +148,7 @@ public class ImportDeployer extends Abst
//this is a important step -> we need to unload what ever
the components loaded previously
synLib.unLoadLibrary();
//then reload
- if (synLib != null) {
- LibDeployerUtils.loadLibArtifacts(synImport, synLib);
- }
+ LibDeployerUtils.loadLibArtifacts(synImport, synLib);
log.info("Synapse Library Import named '" +
synImportQualfiedName +
" has been deployed from file : "
+ fileName);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/ArtifactFile.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/ArtifactFile.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/ArtifactFile.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/ArtifactFile.java
Fri Aug 2 20:42:30 2013
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.synapse.libraries.model;
import org.apache.axiom.om.OMElement;
@@ -33,7 +34,7 @@ public abstract class ArtifactFile {
private static final Log log = LogFactory.getLog(ArtifactFile.class);
- protected static String fileName;
+ protected String fileName;
protected OMElement configurationElement;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
Fri Aug 2 20:42:30 2013
@@ -96,7 +96,7 @@ public class LibraryArtifact implements
LibraryArtifact artifact = subArtifacts.get(artifactName);
if (artifact.isLeafArtifact()) {
delegateClassLoading(artifact, library);
- //this is where actual artifact is constructed to it's ture
form
+ //this is where actual artifact is constructed to its true form
Object template = artifact.file.build();
if (artifact.file instanceof TemplateArtifactFile) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
Fri Aug 2 20:42:30 2013
@@ -208,7 +208,7 @@ public class Value {
}
return expression;
} catch (Exception e) {
- handleException("Can not evaluate escaped expression : " +
expr.toString());
+ handleException("Can not evaluate escaped expression : " + expr);
}
return this.expression;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
Fri Aug 2 20:42:30 2013
@@ -161,7 +161,7 @@ public class ForwardingJob implements St
errorStop = true;
continue;
- } else if(outCtx == null) {
+ } else if (outCtx == null) {
// This Means we have invoked an out only
operation
// remove the message and reset the count
messageStore.poll();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
Fri Aug 2 20:42:30 2013
@@ -73,7 +73,7 @@ public class ResequencingJob implements
}
/** Extract the SynapseXpath object from parameters to identify the
sequence number of the message */
- if (parameters != null &&
parameters.get(ResequencingProcessor.SEQUENCE_NUMBER_XPATH) != null) {
+ if (parameters.get(ResequencingProcessor.SEQUENCE_NUMBER_XPATH) !=
null) {
seqNoxPath = (SynapseXPath)
parameters.get(ResequencingProcessor.SEQUENCE_NUMBER_XPATH);
}
@@ -236,7 +236,7 @@ public class ResequencingJob implements
try {
Thread.sleep(timePeriod);
} catch (InterruptedException e) {
- log.error(new String("Interrupted while thread sleeping in
resequencer"));
+ log.error("Interrupted while thread sleeping in resequencer", e);
}
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Access.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Access.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Access.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Access.java
Fri Aug 2 20:42:30 2013
@@ -40,6 +40,7 @@ import java.util.concurrent.ConcurrentLi
* org.apache.catalina.valves.AccessLogValve with thanks.
*/
public class Access {
+
private static Log log = LogFactory.getLog(Access.class);
/**
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=1509848&r1=1509847&r2=1509848&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
Fri Aug 2 20:42:30 2013
@@ -387,8 +387,8 @@ public class Axis2HttpRequest {
}
public void setCompleted(boolean completed) {
- this.completed = completed;
synchronized (this) {
+ this.completed = completed;
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=1509848&r1=1509847&r2=1509848&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
Fri Aug 2 20:42:30 2013
@@ -740,8 +740,7 @@ public class ClientHandler implements NH
responseMsgCtx.getProperty("synapse.send")
== null) {
return;
}
- } else if (responseMsgCtx == null ||
-
outMsgCtx.getOptions().isUseSeparateListener()) {
+ } else if
(outMsgCtx.getOptions().isUseSeparateListener()) {
// Since we need to notify the SynapseCallback
receiver to remove the
// call backs registered we set a custom property
setHeaders(context, response, outMsgCtx,
responseMsgCtx);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ServerWorker.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ServerWorker.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ServerWorker.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ServerWorker.java
Fri Aug 2 20:42:30 2013
@@ -404,9 +404,6 @@ public class ServerWorker implements Run
if (soapVersion == 1) {
SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
envelope = fac.getDefaultEnvelope();
- } else if (soapVersion == 2) {
- SOAPFactory fac = OMAbstractFactory.getSOAP12Factory();
- envelope = fac.getDefaultEnvelope();
} else {
SOAPFactory fac = OMAbstractFactory.getSOAP12Factory();
envelope = fac.getDefaultEnvelope();
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java?rev=1509848&r1=1509847&r2=1509848&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
Fri Aug 2 20:42:30 2013
@@ -459,7 +459,7 @@ public class SourceHandler implements NH
if (conn != null) {
errorMessage = "[" + conn + "] " + msg;
} else {
- errorMessage = "[" + conn + "] " + msg;
+ errorMessage = msg;
}
log.error(errorMessage, e);
}
