Merge branch '4.2.x-stable'

Author: acogoluegnes

pom.xml

@@ -186,6 +186,13 @@
             <groupId>org.codehaus.gmaven</groupId>
             <artifactId>groovy-maven-plugin</artifactId>
             <version>2.0</version>
+            <dependencies>
+              <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>2.4.8</version>
+              </dependency>
+            </dependencies>
             <executions>
               <!--
               We use "${rabbitmq.dir}/Makefile" to query the location of
@@ -727,6 +734,13 @@
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>groovy-maven-plugin</artifactId>
         <version>2.0</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>2.4.8</version>
+          </dependency>
+        </dependencies>
         <executions>
           <!--
           Generate Java source files from specifications found in

src/main/java/com/rabbitmq/tools/json/JSONReader.java

@@ -53,14 +53,14 @@ public class JSONReader {
 
     private static final Map<Character, Character> escapes = new HashMap<Character, Character>();
     static {
-        escapes.put(new Character('"'), new Character('"'));
-        escapes.put(new Character('\\'), new Character('\\'));
-        escapes.put(new Character('/'), new Character('/'));
-        escapes.put(new Character('b'), new Character('\b'));
-        escapes.put(new Character('f'), new Character('\f'));
-        escapes.put(new Character('n'), new Character('\n'));
-        escapes.put(new Character('r'), new Character('\r'));
-        escapes.put(new Character('t'), new Character('\t'));
+        escapes.put(Character.valueOf('"'), Character.valueOf('"'));
+        escapes.put(Character.valueOf('\\'), Character.valueOf('\\'));
+        escapes.put(Character.valueOf('/'), Character.valueOf('/'));
+        escapes.put(Character.valueOf('b'), Character.valueOf('\b'));
+        escapes.put(Character.valueOf('f'), Character.valueOf('\f'));
+        escapes.put(Character.valueOf('n'), Character.valueOf('\n'));
+        escapes.put(Character.valueOf('r'), Character.valueOf('\r'));
+        escapes.put(Character.valueOf('t'), Character.valueOf('\t'));
     }
 
     private CharacterIterator it;
@@ -191,9 +191,9 @@ private Object number() {
 
         String result = buf.toString();
         try {
-            return new Integer(result);
+            return Integer.valueOf(result);
         } catch (NumberFormatException nfe) {
-            return new Double(result);
+            return Double.valueOf(result);
         }
     }
 
@@ -208,7 +208,7 @@ private Object string(char sep) {
                 if (c == 'u') {
                     add(unicode());
                 } else {
-                    Object value = escapes.get(new Character(c));
+                    Object value = escapes.get(Character.valueOf(c));
                     if (value != null) {
                         add(((Character) value).charValue());
                     }

src/main/java/com/rabbitmq/tools/json/JSONWriter.java

@@ -86,15 +86,15 @@ public String write(Object object) {
     }
 
     public String write(long n) {
-        return write(new Long(n));
+        return write(Long.valueOf(n));
     }
 
     public Object write(double d) {
-        return write(new Double(d));
+        return write(Double.valueOf(d));
     }
 
     public String write(char c) {
-        return write(new Character(c));
+        return write(Character.valueOf(c));
     }
 
     public String write(boolean b) {

src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java

@@ -156,9 +156,9 @@ public static Object coerce(String val, String type)
 	    return Boolean.getBoolean(val) ? Boolean.TRUE : Boolean.FALSE;
 	} else if ("num".equals(type)) {
 	    try {
-		return new Integer(val);
+		return Integer.valueOf(val);
 	    } catch (NumberFormatException nfe) {
-		return new Double(val);
+		return Double.valueOf(val);
 	    }
 	} else if ("str".equals(type)) {
 	    return val;