Author: gnodet
Date: Fri Mar 30 00:40:26 2007
New Revision: 523977
URL: http://svn.apache.org/viewvc?view=rev&rev=523977
Log:
SM-903: use generics
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsService.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/finder/FactoryFinder.java
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/jdbc/JdbcStoreFactory.java
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStoreFactory.java
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsService.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsService.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsService.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsService.java
Fri Mar 30 00:40:26 2007
@@ -322,7 +322,7 @@
}
// Get components
Collection connectors = container.getRegistry().getComponents();
- List components = new ArrayList();
+ List<ComponentMBeanImpl> components = new
ArrayList<ComponentMBeanImpl>();
for (Iterator iter = connectors.iterator(); iter.hasNext();) {
ComponentMBeanImpl component = (ComponentMBeanImpl)
iter.next();
// Skip SEs if needed
@@ -376,8 +376,8 @@
buffer.append("<?xml version='1.0'?>\n");
buffer
.append("<component-info-list
xmlns='http://java.sun.com/xml/ns/jbi/component-info-list' version='1.0'>\n");
- for (Iterator iter = components.iterator(); iter.hasNext();) {
- ComponentMBeanImpl component = (ComponentMBeanImpl)
iter.next();
+ for (Iterator<ComponentMBeanImpl> iter = components.iterator();
iter.hasNext();) {
+ ComponentMBeanImpl component = iter.next();
buffer.append(" <component-info");
if (!component.isBinding() && component.isService()) {
buffer.append(" type='service-engine'");
@@ -406,7 +406,7 @@
*/
public String listSharedLibraries(String componentName,
String sharedLibraryName) throws Exception {
- Collection libs;
+ Collection<SharedLibrary> libs;
if (sharedLibraryName != null) {
SharedLibrary sl =
container.getRegistry().getSharedLibrary(
sharedLibraryName);
@@ -425,8 +425,8 @@
buffer.append("<?xml version='1.0'?>\n");
buffer
.append("<component-info-list
xmlns='http://java.sun.com/xml/ns/jbi/component-info-list' version='1.0'>\n");
- for (Iterator iter = libs.iterator(); iter.hasNext();) {
- SharedLibrary sl = (SharedLibrary) iter.next();
+ for (Iterator<SharedLibrary> iter = libs.iterator();
iter.hasNext();) {
+ SharedLibrary sl = iter.next();
buffer.append(" <component-info type='shared-library'
name='")
.append(sl.getName()).append("'
state='Started'>");
if (sl.getDescription() != null) {
@@ -460,7 +460,7 @@
result =
container.getRegistry().getDeployedServiceAssemblies();
}
- List assemblies = new ArrayList();
+ List<ServiceAssemblyLifeCycle> assemblies = new
ArrayList<ServiceAssemblyLifeCycle>();
for (int i = 0; i < result.length; i++) {
ServiceAssemblyLifeCycle sa = container.getRegistry()
.getServiceAssembly(result[i]);
@@ -478,8 +478,8 @@
buffer.append("<?xml version='1.0'?>\n");
buffer
.append("<service-assembly-info-list
xmlns='http://java.sun.com/xml/ns/jbi/service-assembly-info-list'
version='1.0'>\n");
- for (Iterator iter = assemblies.iterator(); iter.hasNext();) {
- ServiceAssemblyLifeCycle sa =
(ServiceAssemblyLifeCycle) iter
+ for (Iterator<ServiceAssemblyLifeCycle> iter =
assemblies.iterator(); iter.hasNext();) {
+ ServiceAssemblyLifeCycle sa = iter
.next();
buffer.append(" <service-assembly-info");
buffer.append(" name='" + sa.getName() + "'");
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
Fri Mar 30 00:40:26 2007
@@ -84,7 +84,7 @@
buildState();
}
- protected Class getServiceMBean() {
+ protected Class<DeploymentServiceMBean> getServiceMBean() {
return DeploymentServiceMBean.class;
}
@@ -492,8 +492,8 @@
// Everything seems ok, so deploy all SUs
int nbSuccess = 0;
int nbFailures = 0;
- List componentResults = new ArrayList();
- List suKeys = new ArrayList();
+ List<Element> componentResults = new ArrayList<Element>();
+ List<String> suKeys = new ArrayList<String>();
if (sus != null) {
for (int i = 0; i < sus.length; i++) {
File targetDir = null;
@@ -549,9 +549,9 @@
// Failure
if (nbFailures > 0) {
// Undeploy SUs
- for (Iterator iter = suKeys.iterator(); iter.hasNext();) {
+ for (Iterator<String> iter = suKeys.iterator(); iter.hasNext();) {
try {
- String suName = (String) iter.next();
+ String suName = iter.next();
ServiceUnitLifeCycle su = registry.getServiceUnit(suName);
undeployServiceUnit(su);
} catch (Exception e) {
@@ -565,7 +565,7 @@
// Success
else {
// Register SA
- String[] deployedSUs = (String[]) suKeys.toArray(new
String[suKeys.size()]);
+ String[] deployedSUs = suKeys.toArray(new String[suKeys.size()]);
ServiceAssemblyLifeCycle salc =
registry.registerServiceAssembly(sa, deployedSUs, env);
salc.writeRunningState();
// Build result string
@@ -577,7 +577,7 @@
}
}
- protected void getComponentTaskError(Exception exception, String
component, List results) {
+ protected void getComponentTaskError(Exception exception, String
component, List<Element> results) {
Element result = null;
try {
Document doc = parse(exception.getMessage());
@@ -592,7 +592,7 @@
}
}
- protected boolean getComponentTaskResult(String resultMsg, String
component, List results, boolean success) {
+ protected boolean getComponentTaskResult(String resultMsg, String
component, List<Element> results, boolean success) {
Element result = null;
try {
Document doc = parse(resultMsg);
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
Fri Mar 30 00:40:26 2007
@@ -72,7 +72,7 @@
*/
public JMXConnector getJMXConnector (JMXServiceURL url) throws IOException
{
String[] credentials = new String[] { getUsername(), getPassword() };
- Map environment = new HashMap();
+ Map<String,Object> environment = new HashMap<String,Object>();
environment.put(JMXConnector.CREDENTIALS, credentials);
return JMXConnectorFactory.connect(url, environment);
}
Modified:
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/finder/FactoryFinder.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/finder/FactoryFinder.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/finder/FactoryFinder.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/finder/FactoryFinder.java
Fri Mar 30 00:40:26 2007
@@ -19,6 +19,7 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -27,7 +28,7 @@
public class FactoryFinder {
private final String path;
- private final ConcurrentHashMap classMap = new ConcurrentHashMap();
+ private final Map<String, Class<?>> classMap = new
ConcurrentHashMap<String, Class<?>>();
public FactoryFinder(String path) {
this.path = path;
@@ -52,7 +53,7 @@
if (propertyPrefix == null)
propertyPrefix = "";
- Class clazz = (Class) classMap.get(propertyPrefix + key);
+ Class clazz = classMap.get(propertyPrefix + key);
if (clazz == null) {
clazz = newInstance(doFindFactoryProperies(key), propertyPrefix);
classMap.put(propertyPrefix + key, clazz);
Modified:
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
Fri Mar 30 00:40:26 2007
@@ -281,13 +281,13 @@
PreparedStatement s = null;
ResultSet rs = null;
try {
- List ids = new ArrayList();
+ List<String> ids = new ArrayList<String>();
s =
connection.prepareStatement(statements.getFindAllIdsStatement());
rs = s.executeQuery();
while (rs.next()) {
ids.add(rs.getString(1));
}
- return (String[]) ids.toArray(new String[ids.size()]);
+ return ids.toArray(new String[ids.size()]);
}
finally {
close(rs);
Modified:
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/jdbc/JdbcStoreFactory.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/jdbc/JdbcStoreFactory.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/jdbc/JdbcStoreFactory.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/jdbc/JdbcStoreFactory.java
Fri Mar 30 00:40:26 2007
@@ -37,7 +37,7 @@
private boolean clustered;
private DataSource dataSource;
private IdGenerator idGenerator = new IdGenerator();
- private Map stores = new HashMap();
+ private Map<String, JdbcStore> stores = new HashMap<String, JdbcStore>();
private String tableName = "SM_STORE";
private boolean createDataBase = true;
private JDBCAdapter adapter;
@@ -72,7 +72,7 @@
}
}
}
- JdbcStore store = (JdbcStore) stores.get(name);
+ JdbcStore store = stores.get(name);
if (store == null) {
store = new JdbcStore(this, name);
stores.put(name, store);
Modified:
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java
Fri Mar 30 00:40:26 2007
@@ -36,7 +36,7 @@
private static final Log log = LogFactory.getLog(MemoryStore.class);
- private Map datas = new ConcurrentHashMap();
+ private Map<String, Object> datas = new ConcurrentHashMap<String,
Object>();
private IdGenerator idGenerator;
public MemoryStore(IdGenerator idGenerator) {
Modified:
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStoreFactory.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStoreFactory.java?view=diff&rev=523977&r1=523976&r2=523977
==============================================================================
---
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStoreFactory.java
(original)
+++
incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/store/memory/MemoryStoreFactory.java
Fri Mar 30 00:40:26 2007
@@ -27,13 +27,13 @@
public class MemoryStoreFactory implements StoreFactory {
private IdGenerator idGenerator = new IdGenerator();
- private Map stores = new HashMap();
+ private Map<String, MemoryStore> stores = new HashMap<String,
MemoryStore>();
/* (non-Javadoc)
* @see
org.apache.servicemix.store.ExchangeStoreFactory#get(java.lang.String)
*/
public synchronized Store open(String name) throws IOException {
- MemoryStore store = (MemoryStore) stores.get(name);
+ MemoryStore store = stores.get(name);
if (store == null) {
store = new MemoryStore(idGenerator);
stores.put(name, store);
