diff --git a/client/src/com/mirth/connect/client/ui/MirthTheme.java b/client/src/com/mirth/connect/client/ui/MirthTheme.java index 441c79cd16..eb7f9f08e2 100644 --- a/client/src/com/mirth/connect/client/ui/MirthTheme.java +++ b/client/src/com/mirth/connect/client/ui/MirthTheme.java @@ -58,7 +58,7 @@ protected ColorUIResource getPrimary3() { */ public void addCustomEntriesToTable(UIDefaults table) { super.addCustomEntriesToTable(table); - Object[] uiDefaults = { PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, new Integer(30), }; + Object[] uiDefaults = { PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, 30, }; table.putDefaults(uiDefaults); } } diff --git a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java b/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java index 984145220e..8cdc106981 100644 --- a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java +++ b/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java @@ -476,7 +476,7 @@ public void done() { updateEventTable(events); if (!events.hasNextPage()) { - events.setItemCount(new Long(((retrievedPageNumber - 1) * events.getPageSize()) + events.size())); + events.setItemCount(Long.valueOf(((retrievedPageNumber - 1) * events.getPageSize()) + events.size())); enableCountButton = false; } } else { @@ -485,7 +485,7 @@ public void done() { model.refreshDataVector(new Object[0][0]); } - events.setItemCount(new Long((retrievedPageNumber - 1) * events.getPageSize())); + events.setItemCount(Long.valueOf((retrievedPageNumber - 1) * events.getPageSize())); enableCountButton = false; pageNumberField.setText("0"); } diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java b/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java index 35ce1547d2..25898c3e80 100644 --- a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java +++ b/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java @@ -968,11 +968,11 @@ public void done() { } if (!messages.hasNextPage()) { - messages.setItemCount(new Long(((retrievedPageNumber - 1) * messages.getPageSize()) + messages.size())); + messages.setItemCount(Long.valueOf(((retrievedPageNumber - 1) * messages.getPageSize()) + messages.size())); enableCountButton = false; } } else { - messages.setItemCount(new Long((retrievedPageNumber - 1) * messages.getPageSize())); + messages.setItemCount(Long.valueOf((retrievedPageNumber - 1) * messages.getPageSize())); enableCountButton = false; pageNumberField.setText("0"); } diff --git a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java b/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java index e1152427e5..0be3e5505e 100644 --- a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java +++ b/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java @@ -23,6 +23,6 @@ public MirthBlankableSpinner(Integer minimum, Integer maximum) { public Integer getIntegerValue() { Object value = getValue(); - return (value == null || value.equals("")) ? null : new Integer(value.toString()); + return (value == null || value.equals("")) ? null : Integer.valueOf(value.toString()); } } diff --git a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java b/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java index a82a462fe7..a5925ca25b 100644 --- a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java +++ b/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java @@ -36,12 +36,12 @@ public MirthBlankableSpinnerModel(Integer minimum, Integer maximum) { @Override public Object getNextValue() { - return (value.equals("")) ? startValue : min(new Integer(value.toString()) + 1, maximum); + return (value.equals("")) ? startValue : min(Integer.valueOf(value.toString()) + 1, maximum); } @Override public Object getPreviousValue() { - return (value.equals("")) ? startValue : max(new Integer(value.toString()) - 1, minimum); + return (value.equals("")) ? startValue : max(Integer.valueOf(value.toString()) - 1, minimum); } @Override @@ -55,7 +55,7 @@ public void setValue(Object object) { value = null; } else { try { - value = new Integer(object.toString()); + value = Integer.valueOf(object.toString()); if (minimum != null && (Integer) value < minimum) { value = minimum; diff --git a/client/src/org/syntax/jedit/MirthPlainDocument.java b/client/src/org/syntax/jedit/MirthPlainDocument.java index 344944d41d..255622a737 100644 --- a/client/src/org/syntax/jedit/MirthPlainDocument.java +++ b/client/src/org/syntax/jedit/MirthPlainDocument.java @@ -75,7 +75,7 @@ public MirthPlainDocument() { */ public MirthPlainDocument(Content c) { super(c); - putProperty(tabSizeAttribute, new Integer(4)); + putProperty(tabSizeAttribute, 4); defaultRoot = createDefaultRoot(); } diff --git a/donkey/src/main/java/com/mirth/connect/donkey/server/data/buffered/BufferedDao.java b/donkey/src/main/java/com/mirth/connect/donkey/server/data/buffered/BufferedDao.java index 413feae2ca..fc1c2efbaa 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/server/data/buffered/BufferedDao.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/server/data/buffered/BufferedDao.java @@ -77,7 +77,7 @@ public void commit() { @Override public void commit(boolean durable) { - commit(new Boolean(durable)); + commit(Boolean.valueOf(durable)); } private void commit(Boolean durable) { diff --git a/donkey/src/test/java/com/mirth/connect/donkey/test/DestinationConnectorTests.java b/donkey/src/test/java/com/mirth/connect/donkey/test/DestinationConnectorTests.java index 98f8d9cc41..1bac478ccd 100644 --- a/donkey/src/test/java/com/mirth/connect/donkey/test/DestinationConnectorTests.java +++ b/donkey/src/test/java/com/mirth/connect/donkey/test/DestinationConnectorTests.java @@ -328,7 +328,7 @@ private void testProcess(boolean queueNull, boolean queueEnabled, boolean queueS if (retryCount > 0) { // assert that the connector attempted to send the message the correct number of times - assertEquals(new Integer(dispatcherConnectorProperties.getRetryCount() + 1), TestUtils.getSendAttempts(channel.getChannelId(), dispatchResult.getMessageId())); + assertEquals(Integer.valueOf(dispatcherConnectorProperties.getRetryCount() + 1), TestUtils.getSendAttempts(channel.getChannelId(), dispatchResult.getMessageId())); } else { if (queueNull || !queueEnabled || queueSendFirst) { // Assert that the sent content was stored diff --git a/donkey/src/test/java/com/mirth/connect/donkey/test/DonkeyDaoTests.java b/donkey/src/test/java/com/mirth/connect/donkey/test/DonkeyDaoTests.java index 0ff21c9799..c7a4f8569c 100644 --- a/donkey/src/test/java/com/mirth/connect/donkey/test/DonkeyDaoTests.java +++ b/donkey/src/test/java/com/mirth/connect/donkey/test/DonkeyDaoTests.java @@ -1444,7 +1444,7 @@ public final void testGetMaxMessageId() throws Exception { try { dao = daoFactory.getDao(); - assertEquals(maxId, new Long(dao.getMaxMessageId(channel.getChannelId()))); + assertEquals(maxId, Long.valueOf(dao.getMaxMessageId(channel.getChannelId()))); } finally { TestUtils.close(dao); } @@ -1468,7 +1468,7 @@ public final void testGetMaxMessageId() throws Exception { try { dao = daoFactory.getDao(); - assertEquals(maxId, new Long(dao.getMaxMessageId(channel.getChannelId()))); + assertEquals(maxId, Long.valueOf(dao.getMaxMessageId(channel.getChannelId()))); } finally { TestUtils.close(dao); } diff --git a/manager/src/com/mirth/connect/manager/MirthTheme.java b/manager/src/com/mirth/connect/manager/MirthTheme.java index aa19c9d207..1c1431fad3 100644 --- a/manager/src/com/mirth/connect/manager/MirthTheme.java +++ b/manager/src/com/mirth/connect/manager/MirthTheme.java @@ -58,7 +58,7 @@ protected ColorUIResource getPrimary3() { */ public void addCustomEntriesToTable(UIDefaults table) { super.addCustomEntriesToTable(table); - Object[] uiDefaults = { PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, new Integer(30), }; + Object[] uiDefaults = { PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, 30, }; table.putDefaults(uiDefaults); } } diff --git a/server/src/com/mirth/connect/connectors/jdbc/Column.java b/server/src/com/mirth/connect/connectors/jdbc/Column.java index 515ae3c181..f231893d05 100644 --- a/server/src/com/mirth/connect/connectors/jdbc/Column.java +++ b/server/src/com/mirth/connect/connectors/jdbc/Column.java @@ -91,7 +91,7 @@ public int hashCode() { int hashCode = 1; hashCode = 31 * hashCode + (name == null ? 0 : name.hashCode()); hashCode = 31 * hashCode + (type == null ? 0 : type.hashCode()); - hashCode = 31 * hashCode + (new Integer(precision)).hashCode(); + hashCode = 31 * hashCode + precision; return hashCode; } diff --git a/server/src/com/mirth/connect/model/converters/DocumentSerializer.java b/server/src/com/mirth/connect/model/converters/DocumentSerializer.java index 0523be8473..ea5b8aa96c 100644 --- a/server/src/com/mirth/connect/model/converters/DocumentSerializer.java +++ b/server/src/com/mirth/connect/model/converters/DocumentSerializer.java @@ -58,7 +58,7 @@ public void toXML(Document source, Writer writer) { // When Saxon-B is on the classpath setting this attribute throws an // IllegalArgumentException. try { - factory.setAttribute("indent-number", new Integer(4)); + factory.setAttribute("indent-number", 4); } catch (IllegalArgumentException ex) { logger.warn("Could not set Document Serializer attribute: indent-number", ex); } diff --git a/server/src/com/mirth/connect/server/controllers/DonkeyEngineController.java b/server/src/com/mirth/connect/server/controllers/DonkeyEngineController.java index 48095c0acf..1dbeb66b03 100644 --- a/server/src/com/mirth/connect/server/controllers/DonkeyEngineController.java +++ b/server/src/com/mirth/connect/server/controllers/DonkeyEngineController.java @@ -966,11 +966,11 @@ public int compare(DashboardStatus o1, DashboardStatus o2) { } protected Long getSourceQueueSize(Channel channel) { - return new Long(channel.getSourceQueue().size()); + return Long.valueOf(channel.getSourceQueue().size()); } protected Long getDestinationQueueSize(DestinationConnector destinationConnector) { - return new Long(destinationConnector.getQueue().size()); + return Long.valueOf(destinationConnector.getQueue().size()); } @Override diff --git a/server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java b/server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java index e6a53e6677..476775c82b 100644 --- a/server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java +++ b/server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java @@ -170,7 +170,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se } else if (exampleRequested.equals("attachment_list")) { requestedObject = getAttachmentListExample(); } else if (exampleRequested.equals("boolean")) { - requestedObject = new Boolean(true); + requestedObject = true; } else if (exampleRequested.equals("calendar")) { requestedObject = getCalendarExample(); } else if (exampleRequested.equals("channel")) { @@ -290,7 +290,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se } else if (exampleRequested.equals("http_dispatcher_properties")) { requestedObject = getHttpDispatcherPropertiesExample(); } else if (exampleRequested.equals("integer")) { - requestedObject = new Integer(1); + requestedObject = 1; } else if (exampleRequested.equals("jms_template_name_set")) { requestedObject = getJmsTemplateNameSetExample(); } else if (exampleRequested.equals("jms_connector_properties")) { diff --git a/server/src/com/mirth/connect/util/MirthXmlUtil.java b/server/src/com/mirth/connect/util/MirthXmlUtil.java index 0d4fb849c2..10804100e7 100644 --- a/server/src/com/mirth/connect/util/MirthXmlUtil.java +++ b/server/src/com/mirth/connect/util/MirthXmlUtil.java @@ -57,7 +57,7 @@ public class MirthXmlUtil { // When Saxon-B is on the classpath setting this attribute throws an // IllegalArgumentException. try { - serializerTransformerFactory.setAttribute("indent-number", new Integer(4)); + serializerTransformerFactory.setAttribute("indent-number", 4); } catch (IllegalArgumentException ex) { logger.warn("Could not set serializer attribute: indent-number", ex); } @@ -125,7 +125,7 @@ public static String decode(String entity) { start++; radix = 16; } - Character c = new Character((char) Integer.parseInt(entity.substring(start), radix)); + Character c = (char) Integer.parseInt(entity.substring(start), radix); return c.toString(); } else { String s = decoder.get(entity); @@ -186,13 +186,13 @@ public static String encode(char[] text, int start, int length) { } private static void addEntity(String entity, int value) { - decoder.put(entity, (new Character((char) value)).toString()); + decoder.put(entity, Character.toString((char) value)); if (value < 0x100) encoder[value] = entity; } private static void addXmlEntity(String entity, int value) { - decoderXml.put(entity, (new Character((char) value)).toString()); + decoderXml.put(entity, Character.toString((char) value)); if (value < 0x100) encoderXml[value] = entity; } diff --git a/server/src/org/mozilla/javascript/tools/debugger/SwingGui.java b/server/src/org/mozilla/javascript/tools/debugger/SwingGui.java index 29cc6e6515..c5ea34742d 100644 --- a/server/src/org/mozilla/javascript/tools/debugger/SwingGui.java +++ b/server/src/org/mozilla/javascript/tools/debugger/SwingGui.java @@ -787,7 +787,7 @@ static void setResizeWeight(JSplitPane pane, double weight) { try { Method m = JSplitPane.class.getMethod("setResizeWeight", new Class[]{double.class}); - m.invoke(pane, new Object[]{new Double(weight)}); + m.invoke(pane, new Object[]{weight}); } catch (NoSuchMethodException exc) { } catch (IllegalAccessException exc) { } catch (java.lang.reflect.InvocationTargetException exc) { diff --git a/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java b/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java index b9dcb64fd4..1d733b1243 100644 --- a/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java +++ b/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java @@ -303,8 +303,8 @@ public void testMessageSentWhenOneOfMultipleClientsClosed() throws Exception { } } - assertEquals(new Integer(2), successfulSends); - assertEquals(new Integer(2), numberOfClients); + assertEquals(Integer.valueOf(2), successfulSends); + assertEquals(Integer.valueOf(2), numberOfClients); } /* @@ -350,9 +350,9 @@ public void testMLLPMessageSentWhenOneOfMultipleClientsClosed() throws Exception assertEquals(TEST_MESSAGE_TEMPLATE, socketResult.get("result" + entry.getKey())); } } - - assertEquals(new Integer(2), successfulSends); - assertEquals(new Integer(2), numberOfClients); + + assertEquals(Integer.valueOf(2), successfulSends); + assertEquals(Integer.valueOf(2), numberOfClients); } /* @@ -389,8 +389,8 @@ public void testMaxConnections() throws Exception { Integer numberOfClients = (Integer) message.getConnectorMap().get(CONNECTOR_MAP_NO_OF_CLIENTS_KEY); Integer successfulSends = (Integer) message.getConnectorMap().get(CONNECTOR_MAP_SUCCESSFUL_SENDS_KEY); - assertEquals(new Integer(1), successfulSends); - assertEquals(new Integer(1), numberOfClients); + assertEquals(Integer.valueOf(1), successfulSends); + assertEquals(Integer.valueOf(1), numberOfClients); } /* @@ -413,8 +413,8 @@ public void testMessageResponseWithNoConnections() throws Exception { Integer successfulSends = (Integer) message.getConnectorMap().get(CONNECTOR_MAP_SUCCESSFUL_SENDS_KEY); assertEquals(Status.QUEUED, response.getStatus()); - assertEquals(new Integer(0), successfulSends); - assertEquals(new Integer(0), numberOfClients); + assertEquals(Integer.valueOf(0), successfulSends); + assertEquals(Integer.valueOf(0), numberOfClients); } /* @@ -457,8 +457,8 @@ public void testMessageResponseWhenAllConnectionsClosed() throws Exception { Integer successfulSends = (Integer) message.getConnectorMap().get(CONNECTOR_MAP_SUCCESSFUL_SENDS_KEY); assertEquals(Status.QUEUED, response.getStatus()); - assertEquals(new Integer(0), successfulSends); - assertEquals(new Integer(0), numberOfClients); + assertEquals(Integer.valueOf(0), successfulSends); + assertEquals(Integer.valueOf(0), numberOfClients); } /* @@ -501,8 +501,8 @@ public void testMLLPMessageResponseWhenAllConnectionsClosed() throws Exception { Integer successfulSends = (Integer) message.getConnectorMap().get(CONNECTOR_MAP_SUCCESSFUL_SENDS_KEY); assertEquals(Status.QUEUED, response.getStatus()); - assertEquals(new Integer(0), successfulSends); - assertEquals(new Integer(0), numberOfClients); + assertEquals(Integer.valueOf(0), successfulSends); + assertEquals(Integer.valueOf(0), numberOfClients); } /* @@ -616,8 +616,8 @@ public void testWhenSendToOneOfMultipleClientsErrors() throws Exception { log(message.getConnectorMap().get(CONNECTOR_MAP_ALL_RESPONSES_KEY)); assertEquals(Status.SENT, response.getStatus()); - assertEquals(new Integer(2), successfulSends); - assertEquals(new Integer(3), numberOfClients); + assertEquals(Integer.valueOf(2), successfulSends); + assertEquals(Integer.valueOf(3), numberOfClients); } @Test diff --git a/server/test/com/mirth/connect/model/converters/TestUtil.java b/server/test/com/mirth/connect/model/converters/TestUtil.java index f8704fcb1a..405550a60f 100644 --- a/server/test/com/mirth/connect/model/converters/TestUtil.java +++ b/server/test/com/mirth/connect/model/converters/TestUtil.java @@ -40,7 +40,7 @@ public static String prettyPrintXml(String input) throws Exception { TransformerFactory factory = TransformerFactory.newInstance(); factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); - factory.setAttribute("indent-number", new Integer(4)); + factory.setAttribute("indent-number", 4); Transformer transformer = factory.newTransformer(); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); diff --git a/server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java b/server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java index 681b118787..cb264b600f 100644 --- a/server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java +++ b/server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java @@ -197,7 +197,7 @@ private void verifyChannel1(Channel channel, boolean includeCodeTemplateLibrarie ChannelExportData exportData = channel.getExportData(); assertTrue(exportData.getMetadata().isEnabled()); assertTrue(exportData.getMetadata().getPruningSettings().isArchiveEnabled()); - assertEquals(new Integer(7), exportData.getMetadata().getPruningSettings().getPruneContentDays()); + assertEquals(Integer.valueOf(7), exportData.getMetadata().getPruningSettings().getPruneContentDays()); assertEquals(2, exportData.getChannelTags().size()); assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag1", "Tag 1", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1, CHANNEL_ID_2 })))));