You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2008/05/06 04:27:08 UTC
svn commit: r653670 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/xml/endpoints/ endpoints/
Author: ruwan
Date: Mon May 5 19:27:08 2008
New Revision: 653670
URL: http://svn.apache.org/viewvc?rev=653670&view=rev
Log:
Some more refactoring of Endpoints
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java Mon May 5 19:27:08 2008
@@ -33,13 +33,13 @@
import java.util.Iterator;
/**
- * Creates FailoverEndpoint using a XML configuration.
+ * Creates {@link FailoverEndpoint} using a XML configuration.
*
- * <endpoint [name="name"]>
- * <failover>
- * <endpoint>+
- * </failover>
- * </endpoint>
+ * <endpoint [name="name"]>
+ * <failover>
+ * <endpoint>+
+ * </failover>
+ * </endpoint>
*/
public class FailoverEndpointFactory extends EndpointFactory {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java Mon May 5 19:27:08 2008
@@ -30,13 +30,13 @@
import java.util.List;
/**
- * Serializes FailoverEndpoint to XML configuration.
+ * Serializes {@link FailoverEndpoint} to XML configuration.
*
- * <endpoint [name="name"]>
- * <failover>
- * <endpoint>+
- * </failover>
- * </endpoint>
+ * <endpoint [name="name"]>
+ * <failover>
+ * <endpoint>+
+ * </failover>
+ * </endpoint>
*/
public class FailoverEndpointSerializer extends EndpointSerializer {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java Mon May 5 19:27:08 2008
@@ -32,9 +32,9 @@
/**
* Creates an IndirectEndpoint using a XML configuration. Key can be a name of an endpoint defined
* in the same Synapse configuration or a registry key pointing to an endpoint configuration in the
- * registry (e.g. <endpoint key="registry/endpoint1.xml" />).
+ * registry (e.g. <endpoint key="registry/endpoint1.xml"/>).
*
- * <endpoint key="key" />
+ * <endpoint key="key"/>
*/
public class IndirectEndpointFactory extends EndpointFactory {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java Mon May 5 19:27:08 2008
@@ -28,9 +28,9 @@
import org.apache.synapse.SynapseConstants;
/**
- * Serializes an IndirectEndpoint to an XML configuration.
+ * Serializes an {@link IndirectEndpoint} to an XML configuration.
*
- * <endpoint key="key" />
+ * <endpoint key="key"/>
*/
public class IndirectEndpointSerializer extends EndpointSerializer {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java Mon May 5 19:27:08 2008
@@ -19,30 +19,27 @@
package org.apache.synapse.config.xml.endpoints;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNode;
+import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.config.xml.endpoints.utils.LoadbalanceAlgorithmFactory;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.LoadbalanceEndpoint;
import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.config.xml.endpoints.utils.LoadbalanceAlgorithmFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
/**
- * Creates LoadbalanceEndpoint using an XML configuration.
+ * Creates {@link LoadbalanceEndpoint} using an XML configuration.
*
- * <endpoint [name="name"]>
- * <loadbalance policy="load balance algorithm">
- * <endpoint>+
- * </loadbalance>
- * </endpoint>
+ * <endpoint [name="name"]>
+ * <loadbalance policy="load balance algorithm">
+ * <endpoint>+
+ * </loadbalance>
+ * </endpoint>
*/
public class LoadbalanceEndpointFactory extends EndpointFactory {
@@ -58,9 +55,8 @@
// create the endpoint, manager and the algorithms
- OMElement loadbalanceElement = null;
- loadbalanceElement = epConfig.getFirstChildWithName
- (new QName(SynapseConstants.SYNAPSE_NAMESPACE, "loadbalance"));
+ OMElement loadbalanceElement = epConfig.getFirstChildWithName(
+ new QName(SynapseConstants.SYNAPSE_NAMESPACE, "loadbalance"));
if(loadbalanceElement != null) {
@@ -75,7 +71,7 @@
}
// set endpoints
- ArrayList endpoints = getEndpoints(loadbalanceElement, loadbalanceEndpoint);
+ ArrayList<Endpoint> endpoints = getEndpoints(loadbalanceElement, loadbalanceEndpoint);
loadbalanceEndpoint.setEndpoints(endpoints);
// set load balance algorithm
@@ -104,9 +100,9 @@
return null;
}
- private ArrayList getEndpoints(OMElement loadbalanceElement, Endpoint parent) {
+ private ArrayList<Endpoint> getEndpoints(OMElement loadbalanceElement, Endpoint parent) {
- ArrayList endpoints = new ArrayList();
+ ArrayList<Endpoint> endpoints = new ArrayList<Endpoint>();
Iterator iter = loadbalanceElement.getChildrenWithName
(org.apache.synapse.config.xml.XMLConfigConstants.ENDPOINT_ELT);
while (iter.hasNext()) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java Mon May 5 19:27:08 2008
@@ -19,26 +19,26 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
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.config.xml.XMLConfigConstants;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.LoadbalanceEndpoint;
import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
import org.apache.synapse.endpoints.algorithms.RoundRobin;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.SynapseConstants;
import java.util.List;
/**
- * Serializes LoadbalanceEndpoint to an XML configuration.
+ * Serializes {@link LoadbalanceEndpoint} to an XML configuration.
*
- * <endpoint [name="name"]>
- * <loadbalance policy="load balance algorithm">
- * <endpoint>+
- * </loadbalance>
- * </endpoint>
+ * <endpoint [name="name"]>
+ * <loadbalance policy="load balance algorithm">
+ * <endpoint>+
+ * </loadbalance>
+ * </endpoint>
*/
public class LoadbalanceEndpointSerializer extends EndpointSerializer {
@@ -49,7 +49,8 @@
}
fac = OMAbstractFactory.getOMFactory();
- OMElement endpointElement = fac.createOMElement("endpoint", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement endpointElement
+ = fac.createOMElement("endpoint", SynapseConstants.SYNAPSE_OMNAMESPACE);
LoadbalanceEndpoint loadbalanceEndpoint = (LoadbalanceEndpoint) endpoint;
@@ -58,7 +59,8 @@
endpointElement.addAttribute("name", name, null);
}
- OMElement loadbalanceElement = fac.createOMElement("loadbalance", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement loadbalanceElement
+ = fac.createOMElement("loadbalance", SynapseConstants.SYNAPSE_OMNAMESPACE);
endpointElement.addChild(loadbalanceElement);
LoadbalanceAlgorithm algorithm = loadbalanceEndpoint.getAlgorithm();
@@ -66,17 +68,15 @@
if (algorithm instanceof RoundRobin) {
algorithmName = "roundRobin";
}
- loadbalanceElement.addAttribute
- (org.apache.synapse.config.xml.XMLConfigConstants.ALGORITHM_NAME, algorithmName, null);
+ loadbalanceElement.addAttribute(XMLConfigConstants.ALGORITHM_NAME, algorithmName, null);
// set if failover is turned off in the endpoint
if (!loadbalanceEndpoint.isFailover()) {
loadbalanceElement.addAttribute("failover", "false", null);
}
- List endpoints = loadbalanceEndpoint.getEndpoints();
- for (int i = 0; i < endpoints.size(); i++) {
- Endpoint childEndpoint = (Endpoint) endpoints.get(i);
+ List<Endpoint> endpoints = loadbalanceEndpoint.getEndpoints();
+ for (Endpoint childEndpoint : endpoints) {
EndpointSerializer serializer = EndpointAbstractSerializer.
getEndpointSerializer(childEndpoint);
OMElement aeElement = serializer.serializeEndpoint(childEndpoint);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java Mon May 5 19:27:08 2008
@@ -40,14 +40,14 @@
import java.util.Iterator;
/**
- * Creates SALoadbalanceEndpoint from a XML configuration.
+ * Creates {@link SALoadbalanceEndpoint} from a XML configuration.
*
- * <endpoint [name="name"]>
- * <session type="soap | ..other session types.." />
- * <loadbalance policy="policy">
- * <endpoint>+
- * </loadbalance>
- * </endpoint>
+ * <endpoint [name="name"]>
+ * <session type="soap | ..other session types.." />
+ * <loadbalance policy="policy">
+ * <endpoint>+
+ * </loadbalance>
+ * </endpoint>
*/
public class SALoadbalanceEndpointFactory extends EndpointFactory {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java?rev=653670&r1=653669&r2=653670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java Mon May 5 19:27:08 2008
@@ -54,7 +54,7 @@
* List of endpoints among which the load is distributed. Any object implementing the Endpoint
* interface could be used.
*/
- private List endpoints = null;
+ private List<Endpoint> endpoints = null;
/**
* Algorithm used for selecting the next endpoint to direct the load. Default is RoundRobin.
@@ -186,8 +186,7 @@
public boolean isActive(MessageContext synMessageContext) {
boolean active = endpointContext.isActive();
if (!active && endpoints != null) {
- for (int i = 0; i < endpoints.size(); i++) {
- Endpoint endpoint = (Endpoint) endpoints.get(i);
+ for (Endpoint endpoint : endpoints) {
if (endpoint.isActive(synMessageContext)) {
active = true;
endpointContext.setActive(true);
@@ -215,11 +214,11 @@
this.failover = failover;
}
- public List getEndpoints() {
+ public List<Endpoint> getEndpoints() {
return endpoints;
}
- public void setEndpoints(List endpoints) {
+ public void setEndpoints(List<Endpoint> endpoints) {
this.endpoints = endpoints;
}