Simplified primitive boxing, parsing and formatting calls

amichair · amichair · commit 70d97af7a6a0 · 2016-06-05T15:42:49.000+03:00
diff --git a/quickfixj-codegenerator/src/main/java/org/quickfixj/codegenerator/MessageCodeGenerator.java b/quickfixj-codegenerator/src/main/java/org/quickfixj/codegenerator/MessageCodeGenerator.java
@@ -62,7 +62,7 @@ public class MessageCodeGenerator {
     private static final long SERIAL_UID = 20050617;
 
     // The String representation of the UID
-    private static final String SERIAL_UID_STR = String.valueOf(SERIAL_UID);
+    private static final String SERIAL_UID_STR = Long.toString(SERIAL_UID);
 
     // The name of the param in the .xsl files to pass the serialVersionUID
     private static final String XSLPARAM_SERIAL_UID = "serialVersionUID";
diff --git a/quickfixj-core/src/main/java/quickfix/BusinessRejectReasonText.java b/quickfixj-core/src/main/java/quickfix/BusinessRejectReasonText.java
@@ -50,7 +50,7 @@ public class BusinessRejectReasonText extends BusinessRejectReason {
      * @return the description or null if there isn't a description for that reason
      */
     public static String getMessage(int rejectReason) {
-        return rejectReasonText.get(Integer.valueOf(rejectReason));
+        return rejectReasonText.get(rejectReason);
     }
 
 }
diff --git a/quickfixj-core/src/main/java/quickfix/DataDictionary.java b/quickfixj-core/src/main/java/quickfix/DataDictionary.java
@@ -669,7 +669,7 @@ private void checkMsgType(String msgType) {
 
     // / Check if field tag number is defined in spec.
     void checkValidTagNumber(Field<?> field) {
-        if (!fields.contains(Integer.valueOf(field.getTag()))) {
+        if (!fields.contains(field.getTag())) {
             throw new FieldException(SessionRejectReason.INVALID_TAG_NUMBER, field.getField());
         }
     }
@@ -687,7 +687,7 @@ void checkField(Field<?> field, String msgType, boolean message) {
         }
         
         if (fail) {
-            if (fields.contains(Integer.valueOf(field.getTag()))) {
+            if (fields.contains(field.getTag())) {
                 throw new FieldException(SessionRejectReason.TAG_NOT_DEFINED_FOR_THIS_MESSAGE_TYPE, field.getField());
             } else {
                 throw new FieldException(SessionRejectReason.INVALID_TAG_NUMBER, field.getField());
diff --git a/quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java b/quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java
@@ -259,7 +259,7 @@ private SocketAcceptor createAcceptor(int i) throws ConfigError {
         acceptorProperties.put("ConnectionType", "acceptor");
         acceptorProperties.put("HeartBtInt", "5");
         acceptorProperties.put("SocketAcceptHost", "localhost");
-        acceptorProperties.put("SocketAcceptPort", String.valueOf(9999 + i) );
+        acceptorProperties.put("SocketAcceptPort", Integer.toString(9999 + i));
         acceptorProperties.put("ReconnectInterval", "2");
         acceptorProperties.put("StartTime", "00:00:00");
         acceptorProperties.put("EndTime", "00:00:00");
@@ -284,7 +284,7 @@ public SocketInitiator createInitiator(int i) throws ConfigError {
         acceptorProperties.put("ConnectionType", "initiator");
         acceptorProperties.put("HeartBtInt", "5");
         acceptorProperties.put("SocketConnectHost", "localhost");
-        acceptorProperties.put("SocketConnectPort", String.valueOf(9999 + i) );
+        acceptorProperties.put("SocketConnectPort", Integer.toString(9999 + i));
         acceptorProperties.put("ReconnectInterval", "2");
         acceptorProperties.put("StartTime", "00:00:00");
         acceptorProperties.put("EndTime", "00:00:00");
diff --git a/quickfixj-core/src/test/java/quickfix/test/acceptance/TestConnection.java b/quickfixj-core/src/test/java/quickfix/test/acceptance/TestConnection.java
@@ -62,7 +62,7 @@ public void sendMessage(int clientId, String message) throws IOException {
 
     private TestIoHandler getIoHandler(int clientId) {
         synchronized (ioHandlers) {
-            return ioHandlers.get(Integer.valueOf(clientId));
+            return ioHandlers.get(clientId);
         }
     }
 
diff --git a/quickfixj-dictgenerator/src/main/java/org/quickfixj/dictgenerator/Generator.java b/quickfixj-dictgenerator/src/main/java/org/quickfixj/dictgenerator/Generator.java
@@ -294,8 +294,8 @@ public static void main(String[] args) throws Exception {
             System.exit(1);
             return;
         }
-        int major = Integer.valueOf(args[1]);
-        int minor = Integer.valueOf(args[2]);
+        int major = Integer.parseInt(args[1]);
+        int minor = Integer.parseInt(args[2]);
 
         new Generator(repository, major, minor).generate();
     }
diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/BanzaiApplication.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/BanzaiApplication.java
@@ -219,8 +219,8 @@ private void executionReport(Message message, SessionID sessionID) throws FieldN
 
         if (fillSize.compareTo(BigDecimal.ZERO) > 0) {
             order.setOpen(order.getOpen() - (int) Double.parseDouble(fillSize.toPlainString()));
-            order.setExecuted(new Integer(message.getString(CumQty.FIELD)));
-            order.setAvgPx(new Double(message.getString(AvgPx.FIELD)));
+            order.setExecuted(Integer.parseInt(message.getString(CumQty.FIELD)));
+            order.setAvgPx(Double.parseDouble(message.getString(AvgPx.FIELD)));
         }
 
         OrdStatus ordStatus = (OrdStatus) message.getField(new OrdStatus());
@@ -253,7 +253,7 @@ private void executionReport(Message message, SessionID sessionID) throws FieldN
             execution.setSymbol(message.getField(new Symbol()).getValue());
             execution.setQuantity(fillSize.intValue());
             if (message.isSetField(LastPx.FIELD)) {
-                execution.setPrice(new Double(message.getString(LastPx.FIELD)));
+                execution.setPrice(Double.parseDouble(message.getString(LastPx.FIELD)));
             }
             Side side = (Side) message.getField(new Side());
             execution.setSide(FIXSideToSide(side));
diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/Execution.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/Execution.java
@@ -29,7 +29,7 @@ public class Execution {
     private static int nextID = 1;
 
     public Execution() {
-        ID = Integer.valueOf(nextID++).toString();
+        ID = Integer.toString(nextID++);
     }
 
     public Execution(String ID) {
diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ExecutionTableModel.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ExecutionTableModel.java
@@ -69,7 +69,7 @@ public Execution getExchangeExecution(String exchangeID) {
     }
 
     public Execution getExecution(int row) {
-        return rowToExecution.get(Integer.valueOf(row));
+        return rowToExecution.get(row);
     }
 
     public void setValueAt(Object value, int rowIndex, int columnIndex) { }
@@ -91,7 +91,7 @@ public String getColumnName(int columnIndex) {
     }
 
     public Object getValueAt(int rowIndex, int columnIndex) {
-        Execution execution = rowToExecution.get(Integer.valueOf(rowIndex));
+        Execution execution = rowToExecution.get(rowIndex);
 
         switch (columnIndex) {
         case SYMBOL:
diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/Order.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/Order.java
@@ -60,7 +60,7 @@ public Object clone() {
     }
 
     public String generateID() {
-        return Long.valueOf(System.currentTimeMillis() + (nextID++)).toString();
+        return Long.toString(System.currentTimeMillis() + (nextID++));
     }
 
     public SessionID getSessionID() {
@@ -139,7 +139,7 @@ public void setLimit(String limit) {
         if (limit == null || limit.equals("")) {
             this.limit = null;
         } else {
-            this.limit = new Double(limit);
+            this.limit = Double.parseDouble(limit);
         }
     }
 
@@ -155,7 +155,7 @@ public void setStop(String stop) {
         if (stop == null || stop.equals("")) {
             this.stop = null;
         } else {
-            this.stop = new Double(stop);
+            this.stop = Double.parseDouble(stop);
         }
     }
 
diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/OrderTableModel.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/OrderTableModel.java
@@ -104,7 +104,7 @@ public Order getOrder(String id) {
     }
 
     public Order getOrder(int row) {
-        return rowToOrder.get(Integer.valueOf(row));
+        return rowToOrder.get(row);
     }
 
     public void setValueAt(Object value, int rowIndex, int columnIndex) { }
@@ -126,7 +126,7 @@ public String getColumnName(int columnIndex) {
     }
 
     public Object getValueAt(int rowIndex, int columnIndex) {
-        Order order = rowToOrder.get(Integer.valueOf(rowIndex));
+        Order order = rowToOrder.get(rowIndex);
         switch (columnIndex) {
         case SYMBOL:
             return order.getSymbol();
diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ui/CancelReplacePanel.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ui/CancelReplacePanel.java
@@ -121,8 +121,7 @@ public void actionPerformed(ActionEvent e) {
             Order newOrder = (Order) order.clone();
             newOrder.setQuantity
             (Integer.parseInt(quantityTextField.getText()));
-            newOrder.setLimit
-            (new Double(limitPriceTextField.getText()));
+            newOrder.setLimit(Double.parseDouble(limitPriceTextField.getText()));
             newOrder.setRejected(false);
             newOrder.setCanceled(false);
             newOrder.setOpen(0);
diff --git a/quickfixj-examples/executor/src/main/java/quickfix/examples/executor/Application.java b/quickfixj-examples/executor/src/main/java/quickfix/examples/executor/Application.java
@@ -415,11 +415,11 @@ public void onMessage(quickfix.fix50.NewOrderSingle order, SessionID sessionID)
     }
 
     public OrderID genOrderID() {
-        return new OrderID(Integer.valueOf(++m_orderID).toString());
+        return new OrderID(Integer.toString(++m_orderID));
     }
 
     public ExecID genExecID() {
-        return new ExecID(Integer.valueOf(++m_execID).toString());
+        return new ExecID(Integer.toString(++m_execID));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public class BusinessRejectReasonText extends BusinessRejectReason {`
`50`	`50`	`* @return the description or null if there isn't a description for that reason`
`51`	`51`	`*/`
`52`	`52`	`public static String getMessage(int rejectReason) {`
`53`		`- return rejectReasonText.get(Integer.valueOf(rejectReason));`
	`53`	`+ return rejectReasonText.get(rejectReason);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ private void checkMsgType(String msgType) {`
`669`	`669`
`670`	`670`	`// / Check if field tag number is defined in spec.`
`671`	`671`	`void checkValidTagNumber(Field<?> field) {`
`672`		`- if (!fields.contains(Integer.valueOf(field.getTag()))) {`
	`672`	`+ if (!fields.contains(field.getTag())) {`
`673`	`673`	`throw new FieldException(SessionRejectReason.INVALID_TAG_NUMBER, field.getField());`
`674`	`674`	`}`
`675`	`675`	`}`
`@@ -687,7 +687,7 @@ void checkField(Field<?> field, String msgType, boolean message) {`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`if (fail) {`
`690`		`- if (fields.contains(Integer.valueOf(field.getTag()))) {`
	`690`	`+ if (fields.contains(field.getTag())) {`
`691`	`691`	`throw new FieldException(SessionRejectReason.TAG_NOT_DEFINED_FOR_THIS_MESSAGE_TYPE, field.getField());`
`692`	`692`	`} else {`
`693`	`693`	`throw new FieldException(SessionRejectReason.INVALID_TAG_NUMBER, field.getField());`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void sendMessage(int clientId, String message) throws IOException {`
`62`	`62`
`63`	`63`	`private TestIoHandler getIoHandler(int clientId) {`
`64`	`64`	`synchronized (ioHandlers) {`
`65`		`- return ioHandlers.get(Integer.valueOf(clientId));`
	`65`	`+ return ioHandlers.get(clientId);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,8 @@ public static void main(String[] args) throws Exception {`
`294`	`294`	`System.exit(1);`
`295`	`295`	`return;`
`296`	`296`	`}`
`297`		`- int major = Integer.valueOf(args[1]);`
`298`		`- int minor = Integer.valueOf(args[2]);`
	`297`	`+ int major = Integer.parseInt(args[1]);`
	`298`	`+ int minor = Integer.parseInt(args[2]);`
`299`	`299`
`300`	`300`	`new Generator(repository, major, minor).generate();`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class Execution {`
`29`	`29`	`private static int nextID = 1;`
`30`	`30`
`31`	`31`	`public Execution() {`
`32`		`- ID = Integer.valueOf(nextID++).toString();`
	`32`	`+ ID = Integer.toString(nextID++);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public Execution(String ID) {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public Execution getExchangeExecution(String exchangeID) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public Execution getExecution(int row) {`
`72`		`- return rowToExecution.get(Integer.valueOf(row));`
	`72`	`+ return rowToExecution.get(row);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public void setValueAt(Object value, int rowIndex, int columnIndex) { }`
`@@ -91,7 +91,7 @@ public String getColumnName(int columnIndex) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public Object getValueAt(int rowIndex, int columnIndex) {`
`94`		`- Execution execution = rowToExecution.get(Integer.valueOf(rowIndex));`
	`94`	`+ Execution execution = rowToExecution.get(rowIndex);`
`95`	`95`
`96`	`96`	`switch (columnIndex) {`
`97`	`97`	`case SYMBOL:`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public Object clone() {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public String generateID() {`
`63`		`- return Long.valueOf(System.currentTimeMillis() + (nextID++)).toString();`
	`63`	`+ return Long.toString(System.currentTimeMillis() + (nextID++));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public SessionID getSessionID() {`
`@@ -139,7 +139,7 @@ public void setLimit(String limit) {`
`139`	`139`	`if (limit == null \|\| limit.equals("")) {`
`140`	`140`	`this.limit = null;`
`141`	`141`	`} else {`
`142`		`- this.limit = new Double(limit);`
	`142`	`+ this.limit = Double.parseDouble(limit);`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`@@ -155,7 +155,7 @@ public void setStop(String stop) {`
`155`	`155`	`if (stop == null \|\| stop.equals("")) {`
`156`	`156`	`this.stop = null;`
`157`	`157`	`} else {`
`158`		`- this.stop = new Double(stop);`
	`158`	`+ this.stop = Double.parseDouble(stop);`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`