Skip to content

Fix warnings about deprecated constructors #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/com/mirth/connect/client/ui/MirthTheme.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/src/org/syntax/jedit/MirthPlainDocument.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public MirthPlainDocument() {
*/
public MirthPlainDocument(Content c) {
super(c);
putProperty(tabSizeAttribute, new Integer(4));
putProperty(tabSizeAttribute, 4);
defaultRoot = createDefaultRoot();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion manager/src/com/mirth/connect/manager/MirthTheme.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion server/src/com/mirth/connect/connectors/jdbc/Column.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down Expand Up @@ -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")) {
Expand Down
8 changes: 4 additions & 4 deletions server/src/com/mirth/connect/util/MirthXmlUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
30 changes: 15 additions & 15 deletions server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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);
}

/*
Expand All @@ -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);
}

/*
Expand Down Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 })))));
Expand Down