You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/03/29 19:30:18 UTC
svn commit: r523776 - in
/incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip:
packaging/EipServiceUnitAnalyzer.java support/AbstractAggregator.java
support/NamespaceContextImpl.java
Author: gnodet
Date: Thu Mar 29 10:30:17 2007
New Revision: 523776
URL: http://svn.apache.org/viewvc?view=rev&rev=523776
Log:
SM-903: Switch to java 5
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/packaging/EipServiceUnitAnalyzer.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/NamespaceContextImpl.java
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/packaging/EipServiceUnitAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/packaging/EipServiceUnitAnalyzer.java?view=diff&rev=523776&r1=523775&r2=523776
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/packaging/EipServiceUnitAnalyzer.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/packaging/EipServiceUnitAnalyzer.java Thu Mar 29 10:30:17 2007
@@ -36,7 +36,7 @@
public class EipServiceUnitAnalyzer extends AbstractXBeanServiceUnitAnalyzer {
- protected List getConsumes(Endpoint endpoint) {
+ protected List<Consumes> getConsumes(Endpoint endpoint) {
if (endpoint instanceof ContentBasedRouter)
return resolveContentBasedRouter((ContentBasedRouter) endpoint);
if (endpoint instanceof MessageFilter)
@@ -53,15 +53,15 @@
return resolveWireTap((WireTap) endpoint);
if (endpoint instanceof XPathSplitter)
return resolveXPathSplitter((XPathSplitter) endpoint);
- return new ArrayList();
+ return new ArrayList<Consumes>();
}
- private List resolveXPathSplitter(XPathSplitter splitter) {
- return generateConsumesFromTarget(splitter.getTarget(), new ArrayList());
+ private List<Consumes> resolveXPathSplitter(XPathSplitter splitter) {
+ return generateConsumesFromTarget(splitter.getTarget(), new ArrayList<Consumes>());
}
- private List resolveWireTap(WireTap tap) {
- List consumes = new ArrayList();
+ private List<Consumes> resolveWireTap(WireTap tap) {
+ List<Consumes> consumes = new ArrayList<Consumes>();
consumes = generateConsumesFromTarget(tap.getTarget(), consumes);
consumes = generateConsumesFromTarget(tap.getInListener(), consumes);
consumes = generateConsumesFromTarget(tap.getOutListener(), consumes);
@@ -69,8 +69,8 @@
return consumes;
}
- private List resolveStaticRoutingSlip(StaticRoutingSlip slip) {
- List consumes = new ArrayList();
+ private List<Consumes> resolveStaticRoutingSlip(StaticRoutingSlip slip) {
+ List<Consumes> consumes = new ArrayList<Consumes>();
for (int i = 0; i < slip.getTargets().length; i++) {
consumes = generateConsumesFromTarget(slip.getTargets()[i],
consumes);
@@ -78,8 +78,8 @@
return consumes;
}
- private List resolveStaticRecipientList(StaticRecipientList list) {
- List consumes = new ArrayList();
+ private List<Consumes> resolveStaticRecipientList(StaticRecipientList list) {
+ List<Consumes> consumes = new ArrayList<Consumes>();
for (int i = 0; i < list.getRecipients().length; i++) {
consumes = generateConsumesFromTarget(list.getRecipients()[i],
consumes);
@@ -87,23 +87,23 @@
return consumes;
}
- private List resolveSplitAggregator(SplitAggregator aggregator) {
+ private List<Consumes> resolveSplitAggregator(SplitAggregator aggregator) {
return generateConsumesFromTarget(aggregator.getTarget(),
- new ArrayList());
+ new ArrayList<Consumes>());
}
- private List resolvePipeline(Pipeline pipeline) {
- List consumes = generateConsumesFromTarget(pipeline.getTarget(), new ArrayList());
+ private List<Consumes> resolvePipeline(Pipeline pipeline) {
+ List<Consumes> consumes = generateConsumesFromTarget(pipeline.getTarget(), new ArrayList<Consumes>());
consumes = generateConsumesFromTarget(pipeline.getTransformer(), consumes);
return consumes;
}
- private List resolveMessageFilter(MessageFilter filter) {
- return generateConsumesFromTarget(filter.getTarget(), new ArrayList());
+ private List<Consumes> resolveMessageFilter(MessageFilter filter) {
+ return generateConsumesFromTarget(filter.getTarget(), new ArrayList<Consumes>());
}
- private List resolveContentBasedRouter(ContentBasedRouter router) {
- List consumes = new ArrayList();
+ private List<Consumes> resolveContentBasedRouter(ContentBasedRouter router) {
+ List<Consumes> consumes = new ArrayList<Consumes>();
for (int i = 0; i < router.getRules().length; i++) {
RoutingRule rule = router.getRules()[i];
consumes = generateConsumesFromTarget(rule.getTarget(), consumes);
@@ -111,7 +111,7 @@
return consumes;
}
- private List generateConsumesFromTarget(ExchangeTarget target, List consumes) {
+ private List<Consumes> generateConsumesFromTarget(ExchangeTarget target, List<Consumes> consumes) {
if (target != null) {
Consumes consume = new Consumes();
consume.setEndpointName(target.getEndpoint());
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java?view=diff&rev=523776&r1=523775&r2=523776
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java Thu Mar 29 10:30:17 2007
@@ -17,6 +17,9 @@
package org.apache.servicemix.eip.support;
import java.util.Date;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
@@ -31,10 +34,6 @@
import org.apache.servicemix.timers.Timer;
import org.apache.servicemix.timers.TimerListener;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
-
/**
* Aggregator can be used to wait and combine several messages.
* This component implements the
@@ -58,7 +57,7 @@
private boolean synchronous;
- private ConcurrentMap closedAggregates = new ConcurrentHashMap();
+ private ConcurrentMap<String, Boolean> closedAggregates = new ConcurrentHashMap<String, Boolean>();
/**
* @return the synchronous
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/NamespaceContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/NamespaceContextImpl.java?view=diff&rev=523776&r1=523775&r2=523776
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/NamespaceContextImpl.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/NamespaceContextImpl.java Thu Mar 29 10:30:17 2007
@@ -20,6 +20,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -41,7 +42,7 @@
* is used to ensure that {@link #getPrefix(String)} always returns the same
* prefix, unless that prefix is removed.
*/
- private Map namespaces = new LinkedHashMap();
+ private Map<String,String> namespaces = new LinkedHashMap<String,String>();
/**
* Constructs a SimpleNamespaceContext with no parent context or namespace
@@ -56,7 +57,7 @@
*
* @param namespaces A Map of namespace URIs, keyed by their prefixes.
*/
- public NamespaceContextImpl(Map namespaces) {
+ public NamespaceContextImpl(Map<String, String> namespaces) {
setNamespaces(namespaces);
}
@@ -64,14 +65,14 @@
* @org.apache.xbean.Map entryName="namespace" keyName="prefix"
* @return Returns the namespaces.
*/
- public Map getNamespaces() {
+ public Map<String,String> getNamespaces() {
return namespaces;
}
/**
* @param namespaces The namespaces to set.
*/
- public void setNamespaces(Map namespaces) {
+ public void setNamespaces(Map<String,String> namespaces) {
this.namespaces.clear();
if (namespaces != null) {
this.namespaces.putAll(namespaces);
@@ -89,7 +90,7 @@
} else if (prefix.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
return XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
} else if (namespaces.containsKey(prefix)) {
- String uri = (String) namespaces.get(prefix);
+ String uri = namespaces.get(prefix);
if (uri.length() == 0) {
return null;
} else {
@@ -131,7 +132,7 @@
/* (non-Javadoc)
* @see javax.xml.namespace.NamespaceContext#getPrefixes(java.lang.String)
*/
- public Iterator getPrefixes(String nsURI) {
+ public Iterator<String> getPrefixes(String nsURI) {
if (nsURI == null) {
throw new IllegalArgumentException("nsURI was null");
} else if (nsURI.length() == 0) {
@@ -141,14 +142,12 @@
} else if (nsURI.equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) {
return Collections.singleton(XMLConstants.XMLNS_ATTRIBUTE).iterator();
}
- Set prefixes = null;
- Iterator iter = namespaces.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- String uri = (String) entry.getValue();
+ Set<String> prefixes = null;
+ for (Map.Entry<String,String> entry : namespaces.entrySet()) {
+ String uri = entry.getValue();
if (uri.equals(nsURI)) {
if (prefixes == null) {
- prefixes = new HashSet();
+ prefixes = new HashSet<String>();
}
prefixes.add(entry.getKey());
}
@@ -158,7 +157,8 @@
} else if (nsURI.length() == 0) {
return Collections.singleton("").iterator();
} else {
- return Collections.EMPTY_LIST.iterator();
+ List<String> l = Collections.emptyList();
+ return l.iterator();
}
}