From ba50092b37cbf72d058f8dde392cfdc95524984d Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 29 Jul 2010 17:51:35 +0200 Subject: [PATCH] Fix 'raw type' warnings. No significant API changes. --- .../amqp/core/BindingBuilder.java | 6 ++---- .../amqp/support/converter/ClassMapper.java | 4 ++-- .../support/converter/DefaultClassMapper.java | 20 +++++++++--------- .../rabbit/stocks/handler/ServerHandler.java | 2 +- .../stocks/service/CreditCheckService.java | 3 ++- .../service/stubs/CreditCheckServiceStub.java | 2 +- .../springframework/util/exec/Background.java | 1 + .../springframework/util/exec/Execute.java | 21 ++++++++++--------- .../adapter/MessageListenerAdapter.java | 2 +- .../support/RabbitGatewaySupportTests.java | 4 ++-- 10 files changed, 33 insertions(+), 32 deletions(-) diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/BindingBuilder.java b/spring-amqp-core/src/main/java/org/springframework/amqp/core/BindingBuilder.java index d799a3dc..abf37c17 100644 --- a/spring-amqp-core/src/main/java/org/springframework/amqp/core/BindingBuilder.java +++ b/spring-amqp-core/src/main/java/org/springframework/amqp/core/BindingBuilder.java @@ -74,8 +74,7 @@ public final class BindingBuilder { return new Binding(this.queue, this.exchange, routingKey); } - @SuppressWarnings("unchecked") - public Binding with(Enum routingKeyEnum) { + public Binding with(Enum routingKeyEnum) { return new Binding(this.queue, this.exchange, routingKeyEnum.toString()); } } @@ -91,8 +90,7 @@ public final class BindingBuilder { return new Binding(this.queue, this.exchange, routingKey); } - @SuppressWarnings("unchecked") - public Binding with(Enum routingKeyEnum) { + public Binding with(Enum routingKeyEnum) { return new Binding(this.queue, this.exchange, routingKeyEnum.toString()); } diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java b/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java index a414a142..98745b24 100644 --- a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java +++ b/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java @@ -27,7 +27,7 @@ public interface ClassMapper { String getClassIdFieldName(); - String fromClass(Class clazz); + String fromClass(Class clazz); - Class toClass(String classId); + Class toClass(String classId); } diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java b/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java index 54b6ceba..adaeda85 100644 --- a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java +++ b/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java @@ -33,16 +33,16 @@ public class DefaultClassMapper implements ClassMapper, InitializingBean { public static final String DEFAULT_CLASSID_FIELD_NAME = "__TypeId__"; - private Map idClassMapping = new HashMap(); + private Map> idClassMapping = new HashMap>(); - private Map classIdMapping = new HashMap(); + private Map, String> classIdMapping = new HashMap, String>(); private String defaultHashtableTypeId = "Hashtable"; - private Class defaultHashtableClass = Hashtable.class; + private Class defaultHashtableClass = Hashtable.class; - public void setDefaultHashtableClass(Class defaultHashtableClass) { + public void setDefaultHashtableClass(Class defaultHashtableClass) { this.defaultHashtableClass = defaultHashtableClass; } @@ -50,11 +50,11 @@ public class DefaultClassMapper implements ClassMapper, InitializingBean { return DEFAULT_CLASSID_FIELD_NAME; } - public void setIdClassMapping(Map idClassMapping) { + public void setIdClassMapping(Map> idClassMapping) { this.idClassMapping = idClassMapping; } - public String fromClass(Class classOfObjectToConvert) { + public String fromClass(Class classOfObjectToConvert) { if (classIdMapping.containsKey(classOfObjectToConvert)) { return classIdMapping.get(classOfObjectToConvert); } @@ -65,7 +65,7 @@ public class DefaultClassMapper implements ClassMapper, InitializingBean { return classOfObjectToConvert.getName(); } - public Class toClass(String classId) { + public Class toClass(String classId) { if (this.idClassMapping.containsKey(classId)) { return idClassMapping.get(classId); } @@ -89,10 +89,10 @@ public class DefaultClassMapper implements ClassMapper, InitializingBean { } private void validateIdTypeMapping() { - Map finalIdClassMapping = new HashMap(); - for (Entry entry : idClassMapping.entrySet()) { + Map> finalIdClassMapping = new HashMap>(); + for (Entry> entry : idClassMapping.entrySet()) { String id = entry.getKey(); - Class clazz = entry.getValue(); + Class clazz = entry.getValue(); finalIdClassMapping.put(id, clazz); classIdMapping.put(clazz, id); } diff --git a/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/handler/ServerHandler.java b/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/handler/ServerHandler.java index 9911b58b..2f965e13 100644 --- a/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/handler/ServerHandler.java +++ b/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/handler/ServerHandler.java @@ -55,7 +55,7 @@ public class ServerHandler { public TradeResponse handleMessage(TradeRequest tradeRequest) { TradeResponse tradeResponse; - List errors = new ArrayList(); + List errors = new ArrayList(); if (creditCheckService.canExecute(tradeRequest, errors)) { tradeResponse = executionVenueService.executeTradeRequest(tradeRequest); diff --git a/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/CreditCheckService.java b/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/CreditCheckService.java index 9bbaed1e..116ef61e 100644 --- a/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/CreditCheckService.java +++ b/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/CreditCheckService.java @@ -28,5 +28,6 @@ import org.springframework.amqp.rabbit.stocks.domain.TradeRequest; */ public interface CreditCheckService { - boolean canExecute(TradeRequest tradeRequest, List errors); + boolean canExecute(TradeRequest tradeRequest, List errors); + } diff --git a/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/stubs/CreditCheckServiceStub.java b/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/stubs/CreditCheckServiceStub.java index 4507fe11..48e1b860 100644 --- a/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/stubs/CreditCheckServiceStub.java +++ b/spring-amqp-samples/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/stubs/CreditCheckServiceStub.java @@ -28,7 +28,7 @@ import org.springframework.amqp.rabbit.stocks.service.CreditCheckService; */ public class CreditCheckServiceStub implements CreditCheckService { - public boolean canExecute(TradeRequest tradeRequest, List errors) { + public boolean canExecute(TradeRequest tradeRequest, List errors) { return true; } diff --git a/spring-erlang/src/main/java/org/springframework/util/exec/Background.java b/spring-erlang/src/main/java/org/springframework/util/exec/Background.java index af5bdda3..5676dc1e 100644 --- a/spring-erlang/src/main/java/org/springframework/util/exec/Background.java +++ b/spring-erlang/src/main/java/org/springframework/util/exec/Background.java @@ -109,6 +109,7 @@ public class Background { String[] execCmd; ArrayList tmpCmd = new ArrayList(); Runtime r; + ArrayList tmpCmd = new ArrayList(); tmpCmd.add("cmd"); tmpCmd.add("/c"); diff --git a/spring-erlang/src/main/java/org/springframework/util/exec/Execute.java b/spring-erlang/src/main/java/org/springframework/util/exec/Execute.java index a2b1255c..c5de040a 100644 --- a/spring-erlang/src/main/java/org/springframework/util/exec/Execute.java +++ b/spring-erlang/src/main/java/org/springframework/util/exec/Execute.java @@ -51,15 +51,15 @@ public class Execute { private File workingDirectory = null; private boolean newEnvironment = false; - private static Vector procEnvironment = null; + private static Vector procEnvironment = null; /** * Find the list of environment variables for this process. */ - public static synchronized Vector getProcEnvironment() { + public static synchronized Vector getProcEnvironment() { if (procEnvironment != null) return procEnvironment; - procEnvironment = new Vector(); + procEnvironment = new Vector(); try { ByteArrayOutputStream out = new ByteArrayOutputStream(); Execute exe = new Execute(new PumpStreamHandler(out)); @@ -321,7 +321,8 @@ public class Execute { * @return the patched environment */ private String[] patchEnvironment() { - Vector osEnv = (Vector) getProcEnvironment().clone(); + @SuppressWarnings("unchecked") + Vector osEnv = (Vector) getProcEnvironment().clone(); for (int i = 0; i < env.length; i++) { int pos = env[i].indexOf('='); // Get key including "=" @@ -340,18 +341,18 @@ public class Execute { return result; } - public static int execute( Vector envVars, String cmd, File baseDir ) { - Vector v=new Vector(); + public static int execute(Vector envVars, String cmd, File baseDir ) { + Vector v = new Vector(); StringTokenizer st=new StringTokenizer( cmd, " " ); while( st.hasMoreTokens() ) { - v.addElement( st.nextElement() ); + v.addElement( st.nextToken() ); } return execute( envVars, v, baseDir ); } - public static int execute( Vector envVars, Vector cmd, File baseDir) { - return execute( envVars, cmd, baseDir, 10000 /* default time to wait */); + public static int execute(Vector envVars, Vector cmd, File baseDir) { + return execute( envVars, cmd, baseDir, 10000 /* default time to wait */); } /** Wrapper for common execution patterns @@ -360,7 +361,7 @@ public class Execute { * @param baseDir the base directory to run from (optional) * @param timeToWait milliseconds to wait for completion */ - public static int execute( Vector envVars, Vector cmd, File baseDir, int timeToWait) { + public static int execute(Vector envVars, Vector cmd, File baseDir, int timeToWait) { try { // We can collect the out or provide in if needed ExecuteWatchdog watchdog=new ExecuteWatchdog( timeToWait ); diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java index 21637107..698c83e9 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java @@ -318,7 +318,7 @@ public class MessageListenerAdapter implements MessageListener, ChannelAwareMess if (delegate != this) { if (delegate instanceof ChannelAwareMessageListener) { if (channel != null) { - ((ChannelAwareMessageListener) delegate).onMessage(message, channel); + ((ChannelAwareMessageListener) delegate).onMessage(message, channel); return; } else if (!(delegate instanceof MessageListener)) { diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/support/RabbitGatewaySupportTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/support/RabbitGatewaySupportTests.java index 259d573e..25a5d57a 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/support/RabbitGatewaySupportTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/support/RabbitGatewaySupportTests.java @@ -16,7 +16,7 @@ public class RabbitGatewaySupportTests { public void testRabbitGatewaySupportWithConnectionFactory() throws Exception { org.springframework.amqp.rabbit.connection.ConnectionFactory mockConnectionFactory = mock(org.springframework.amqp.rabbit.connection.ConnectionFactory.class); - final List test = new ArrayList(); + final List test = new ArrayList(); RabbitGatewaySupport gateway = new RabbitGatewaySupport() { protected void initGateway() { test.add("test"); @@ -32,7 +32,7 @@ public class RabbitGatewaySupportTests { @Test public void testRabbitGatewaySupportWithJmsTemplate() throws Exception { RabbitTemplate template = new RabbitTemplate(); - final List test = new ArrayList(); + final List test = new ArrayList(); RabbitGatewaySupport gateway = new RabbitGatewaySupport() { protected void initGateway() { test.add("test");