Author: veithen
Date: Fri Nov 7 02:59:39 2008
New Revision: 712107
URL: http://svn.apache.org/viewvc?rev=712107&view=rev
Log:
Eliminated duplicate code for EPR property extraction and moved it to BaseUtils.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXOutTransportInfo.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSOutTransportInfo.java
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXOutTransportInfo.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXOutTransportInfo.java?rev=712107&r1=712106&r2=712107&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXOutTransportInfo.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXOutTransportInfo.java
Fri Nov 7 02:59:39 2008
@@ -20,6 +20,7 @@
package org.apache.synapse.transport.fix;
import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import quickfix.SessionID;
@@ -52,7 +53,7 @@
FIXConstants.FIX_PREFIX);
}
else {
- Hashtable<String,String> properties =
FIXUtils.getProperties(targetEPR);
+ Hashtable<String,String> properties =
BaseUtils.getEPRProperties(targetEPR);
this.sessionID = new SessionID(
properties.get(FIXConstants.BEGIN_STRING),
properties.get(FIXConstants.SENDER_COMP_ID),
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=712107&r1=712106&r2=712107&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
Fri Nov 7 02:59:39 2008
@@ -22,6 +22,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import quickfix.*;
@@ -151,7 +152,7 @@
}
}
- Hashtable<String,String> properties = FIXUtils.getProperties(fixEPR);
+ Hashtable<String,String> properties =
BaseUtils.getEPRProperties(fixEPR);
Iterator<String> keys = properties.keySet().iterator();
while (keys.hasNext()) {
String currentKey = keys.next();
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java?rev=712107&r1=712106&r2=712107&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
Fri Nov 7 02:59:39 2008
@@ -27,6 +27,7 @@
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.transport.OutTransportInfo;
import org.apache.axis2.transport.base.AbstractTransportSender;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.LogFactory;
import quickfix.*;
import quickfix.field.*;
@@ -180,7 +181,7 @@
* @param targetEPR the EPR to which the message will be sent
*/
private void setDeliverToXFields(Message message, String targetEPR) {
- Hashtable<String, String> properties =
FIXUtils.getProperties(targetEPR);
+ Hashtable<String, String> properties =
BaseUtils.getEPRProperties(targetEPR);
String deliverTo = properties.get(FIXConstants.DELIVER_TO_COMP_ID);
//If a DeliverToCompID field is given in EPR put the field in the
message
if (deliverTo != null) {
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java?rev=712107&r1=712106&r2=712107&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
Fri Nov 7 02:59:39 2008
@@ -28,6 +28,7 @@
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import quickfix.*;
@@ -539,28 +540,6 @@
}
/**
- * Extracts parameters embedded in FIX EPRs
- *
- * @param url a valid FIX EPR
- * @return a Hashtable of FIX properties
- */
- public static Hashtable getProperties(String url) {
- Hashtable<String, String> h = new Hashtable<String, String>();
- int propPos = url.indexOf("?");
- if (propPos != -1) {
- StringTokenizer st = new StringTokenizer(url.substring(propPos +
1), "&");
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- int sep = token.indexOf("=");
- if (sep != -1) {
- h.put(token.substring(0, sep), token.substring(sep + 1));
- }
- }
- }
- return h;
- }
-
- /**
* Compares two given FIX URL strings. The second URL is considered equal
to the
* first URL if all the properties in the first URL also exist in the
second URL
* and if they have equals values.
@@ -573,8 +552,8 @@
if (!url1.substring(0, url1.indexOf("?")).equals(url2.substring(0,
url2.indexOf("?")))) {
return false;
} else {
- Hashtable<String,String> properties1 = getProperties(url1);
- Hashtable<String, String> properties2 = getProperties(url2);
+ Hashtable<String,String> properties1 =
BaseUtils.getEPRProperties(url1);
+ Hashtable<String, String> properties2 =
BaseUtils.getEPRProperties(url2);
Iterator<String> keys = properties1.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSOutTransportInfo.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSOutTransportInfo.java?rev=712107&r1=712106&r2=712107&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSOutTransportInfo.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSOutTransportInfo.java
Fri Nov 7 02:59:39 2008
@@ -25,6 +25,7 @@
import java.util.StringTokenizer;
import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -53,17 +54,17 @@
this.outFileURI = outFileURI;
}
- Map properties = getProperties(outFileURI);
+ Map<String,String> properties = BaseUtils.getEPRProperties(outFileURI);
if(properties.containsKey(VFSConstants.MAX_RETRY_COUNT)) {
- String strMaxRetryCount = (String)
properties.get(VFSConstants.MAX_RETRY_COUNT);
+ String strMaxRetryCount =
properties.get(VFSConstants.MAX_RETRY_COUNT);
maxRetryCount = Integer.parseInt(strMaxRetryCount);
}
if(properties.containsKey(VFSConstants.RECONNECT_TIMEOUT)) {
- String strReconnectTimeout = (String)
properties.get(VFSConstants.RECONNECT_TIMEOUT);
+ String strReconnectTimeout =
properties.get(VFSConstants.RECONNECT_TIMEOUT);
reconnectTimeout = Long.parseLong(strReconnectTimeout) * 1000;
}
if (properties.containsKey(VFSConstants.APPEND)) {
- String strAppend = (String)properties.get(VFSConstants.APPEND);
+ String strAppend = properties.get(VFSConstants.APPEND);
append = Boolean.parseBoolean(strAppend);
}
}
@@ -103,22 +104,4 @@
public void setAppend(boolean append) {
this.append = append;
}
-
- public static Map getProperties(String url) {
- Map h = new HashMap();
- int propPos = url.indexOf("?");
- if (propPos != -1) {
- StringTokenizer st = new StringTokenizer(url.substring(propPos +
1), "&");
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- int sep = token.indexOf("=");
- if (sep != -1) {
- h.put(token.substring(0, sep), token.substring(sep + 1));
- } else {
- continue; // ignore, what else can we do?
- }
- }
- }
- return h;
- }
}
\ No newline at end of file
