You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/06/09 23:31:31 UTC
svn commit: r665898 - in /synapse/trunk/java/modules:
core/src/test/java/org/apache/synapse/mediators/
core/src/test/java/org/apache/synapse/mediators/builtin/
core/src/test/java/org/apache/synapse/mediators/transform/
core/src/test/java/org/apache/syn...
Author: veithen
Date: Mon Jun 9 14:31:30 2008
New Revision: 665898
URL: http://svn.apache.org/viewvc?rev=665898&view=rev
Log:
Usage of Java 5 generics
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/SynapseXPathTest.java
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java?rev=665898&r1=665897&r2=665898&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java Mon Jun 9 14:31:30 2008
@@ -20,7 +20,6 @@
package org.apache.synapse.mediators;
import java.io.StringReader;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.stream.XMLInputFactory;
@@ -46,7 +45,7 @@
public class TestUtils {
- public static TestMessageContext getTestContext(String bodyText, Map props) throws Exception {
+ public static TestMessageContext getTestContext(String bodyText, Map<String,Entry> props) throws Exception {
// create a test synapse context
TestMessageContext synCtx = new TestMessageContext();
@@ -55,10 +54,8 @@
synCtx.setEnvironment(new Axis2SynapseEnvironment(testConfig));
if (props != null) {
- Iterator iter = props.keySet().iterator();
- while (iter.hasNext()) {
- String key = (String) iter.next();
- testConfig.addEntry(key, (Entry) props.get(key));
+ for (Map.Entry<String,Entry> mapEntry : props.entrySet()) {
+ testConfig.addEntry(mapEntry.getKey(), mapEntry.getValue());
}
}
synCtx.setConfiguration(testConfig);
@@ -81,7 +78,7 @@
}
public static Axis2MessageContext getAxis2MessageContext(String bodyText,
- Map props) throws Exception {
+ Map<String,Entry> props) throws Exception {
// create a test synapse context
SynapseConfiguration testConfig = new SynapseConfiguration();
org.apache.axis2.context.MessageContext inContext =
@@ -91,10 +88,8 @@
testConfig.setRegistry(new SimpleURLRegistry());
if (props != null) {
- Iterator iter = props.keySet().iterator();
- while (iter.hasNext()) {
- String key = (String) iter.next();
- testConfig.addEntry(key, (Entry) props.get(key));
+ for (Map.Entry<String,Entry> mapEntry : props.entrySet()) {
+ testConfig.addEntry(mapEntry.getKey(), mapEntry.getValue());
}
}
synCtx.setConfiguration(testConfig);
@@ -114,7 +109,7 @@
return synCtx;
}
- public static TestMessageContext getTestContextForXSLTMediator(String bodyText, Map props) throws Exception {
+ public static TestMessageContext getTestContextForXSLTMediator(String bodyText, Map<String,Entry> props) throws Exception {
// create a test synapse context
TestMessageContext synCtx = new TestMessageContext();
@@ -123,10 +118,8 @@
synCtx.setEnvironment(new Axis2SynapseEnvironment(new ConfigurationContext(new AxisConfiguration()), testConfig));
if (props != null) {
- Iterator iter = props.keySet().iterator();
- while (iter.hasNext()) {
- String key = (String) iter.next();
- testConfig.addEntry(key, (Entry) props.get(key));
+ for (Map.Entry<String,Entry> mapEntry : props.entrySet()) {
+ testConfig.addEntry(mapEntry.getKey(), mapEntry.getValue());
}
}
synCtx.setConfiguration(testConfig);
@@ -149,7 +142,7 @@
return synCtx;
}
- public static TestMessageContext getTestContextForXSLTMediatorUsingFile(String path, Map props) throws Exception {
+ public static TestMessageContext getTestContextForXSLTMediatorUsingFile(String path, Map<String,Entry> props) throws Exception {
// create a test synapse context
TestMessageContext synCtx = new TestMessageContext();
@@ -158,10 +151,8 @@
synCtx.setEnvironment(new Axis2SynapseEnvironment(new ConfigurationContext(new AxisConfiguration()), testConfig));
if (props != null) {
- Iterator iter = props.keySet().iterator();
- while (iter.hasNext()) {
- String key = (String) iter.next();
- testConfig.addEntry(key, (Entry) props.get(key));
+ for (Map.Entry<String,Entry> mapEntry : props.entrySet()) {
+ testConfig.addEntry(mapEntry.getKey(), mapEntry.getValue());
}
}
synCtx.setConfiguration(testConfig);
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java?rev=665898&r1=665897&r2=665898&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java Mon Jun 9 14:31:30 2008
@@ -148,7 +148,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key");
validate.setSchemaKeys(keys);
SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
@@ -158,7 +158,7 @@
// set dummy mediator to be called on fail
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
@@ -177,7 +177,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key-1");
keys.add("xsd-key-2");
validate.setSchemaKeys(keys);
@@ -188,7 +188,7 @@
// set dummy mediator to be called on fail
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
@@ -211,7 +211,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key-1");
keys.add("xsd-key-2");
validate.setSchemaKeys(keys);
@@ -222,7 +222,7 @@
// set dummy mediator to be called on fail
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
@@ -245,7 +245,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
@@ -255,7 +255,7 @@
// set dummy mediator to be called on fail
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
@@ -274,7 +274,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
@@ -284,7 +284,7 @@
// set dummy mediator to be called on fail
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
@@ -303,7 +303,7 @@
ValidateMediator validate = new ValidateMediator();
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
@@ -313,7 +313,7 @@
// set dummy mediator to be called on fail
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
@@ -356,7 +356,7 @@
setOnFailInvoked(false);
// set the schema url, source xpath and any name spaces
- List keys = new ArrayList();
+ List<String> keys = new ArrayList<String>();
keys.add("xsd-key-1");
validate.setSchemaKeys(keys);
SynapseXPath source = new SynapseXPath("//m0:CheckPriceRequest");
@@ -367,7 +367,7 @@
validate.removeChild(0);
validate.addChild(testMediator);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/validate/validate.xsd"));
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?rev=665898&r1=665897&r2=665898&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java Mon Jun 9 14:31:30 2008
@@ -77,7 +77,7 @@
mp.setValue("value1");
list.add(mp);
transformMediator.addAllProperties(list);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt"));
@@ -117,7 +117,7 @@
// set XSLT transformation URL
transformMediator.setXsltKey("xslt-key");
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt"));
@@ -153,7 +153,7 @@
transformMediator.setXsltKey("xslt-key");
for (int i=0; i<2; i++) {
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_load.xml"));
@@ -177,7 +177,7 @@
transformMediator.setXsltKey("xslt-key");
for (int i=0; i<2; i++) {
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_load_3.xml"));
@@ -199,7 +199,7 @@
// set XSLT transformation URL
transformMediator.setXsltKey("xslt-key");
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_load_2.xml"));
@@ -224,7 +224,7 @@
transformMediator.setXsltKey("xslt-key");
for (int i=0; i<5; i++) {
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_load_2.xml"));
@@ -251,7 +251,7 @@
// set XSLT transformation URL
transformMediator.setXsltKey("xslt-key");
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
Entry prop = new Entry();
prop.setType(Entry.URL_SRC);
prop.setSrc(new URL("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt"));
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/SynapseXPathTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/SynapseXPathTest.java?rev=665898&r1=665897&r2=665898&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/SynapseXPathTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/SynapseXPathTest.java Mon Jun 9 14:31:30 2008
@@ -78,8 +78,7 @@
}
public void testAxis2ContextProperties() throws Exception {
- HashMap props = new HashMap();
- Axis2MessageContext synCtx = TestUtils.getAxis2MessageContext("<test/>", props);
+ Axis2MessageContext synCtx = TestUtils.getAxis2MessageContext("<test/>", null);
synCtx.getAxis2MessageContext().setProperty("test", message);
synCtx.getAxis2MessageContext().setProperty("test2", "1234");
assertEquals(message, new SynapseXPath("$axis2:test").evaluate(synCtx));
Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java?rev=665898&r1=665897&r2=665898&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java Mon Jun 9 14:31:30 2008
@@ -65,7 +65,7 @@
Entry prop = new Entry();
prop.setKey("MyMediator");
prop.setValue(MY_MEDIATOR);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
props.put("MyMediator", prop);
MessageContext mc = TestUtils.getTestContext("<foo/>", props);
@@ -77,7 +77,7 @@
public void testRegPropWithFunctionMediatorFactory() throws Exception {
Entry prop = new Entry();
prop.setValue(MY_MEDIATOR_FOO_FUNC);
- Map props = new HashMap();
+ Map<String,Entry> props = new HashMap<String,Entry>();
props.put("MyFooMediator", prop);
MessageContext mc = TestUtils.getTestContext("<foo/>", props);