From 5c190ab202a5fedc61c2e0f55bd0516bb4c1a71e Mon Sep 17 00:00:00 2001 From: daidai <2017501503@qq.com> Date: Tue, 2 Jun 2026 17:02:04 +0800 Subject: [PATCH] Replace deprecated-for-removal primitive-wrapper constructors in geode-cq distributed tests with equivalent valueOf calls. --- .../cache/query/cq/dunit/CqDataDUnitTest.java | 4 ++-- .../cq/dunit/CqDataUsingPoolDUnitTest.java | 2 +- .../query/cq/dunit/CqQueryDUnitTest.java | 2 +- .../PartitionedRegionCqQueryDUnitTest.java | 2 +- .../cq/dunit/PrCqUsingPoolDUnitTest.java | 2 +- .../sockets/ClientToServerDeltaDUnitTest.java | 20 +++++++++---------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java index 01d6c56e37cb..da1577ea07fa 100644 --- a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java @@ -910,7 +910,7 @@ public void run2() throws CacheException { // Check if the events from CqListener are in order. int oldId = 0; for (Object cqEvent : cqListener.events.toArray()) { - int newId = new Integer(cqEvent.toString()); + int newId = Integer.valueOf(cqEvent.toString()); if (oldId > newId) { fail("Queued events for CQ Listener during execution with " + "Initial results is not in the order in which they are created."); @@ -1067,7 +1067,7 @@ public void run2() throws CacheException { // Check if the events from CqListener are in order. int oldId = 0; for (Object cqEvent : cqListener.events.toArray()) { - int newId = new Integer(cqEvent.toString()); + int newId = Integer.valueOf(cqEvent.toString()); if (oldId > newId) { fail("Queued events for CQ Listener during execution with " + "Initial results is not in the order in which they are created."); diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java index 570e30e921ff..315b4f2bea30 100644 --- a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java @@ -785,7 +785,7 @@ public String description() { // Check if the events from CqListener are in order. int oldId = 0; for (Object cqEvent : cqListener.events.toArray()) { - int newId = new Integer(cqEvent.toString()); + int newId = Integer.valueOf(cqEvent.toString()); if (oldId > newId) { fail("Queued events for CQ Listener during execution with " + "Initial results is not in the order in which they are created."); diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java index 951e9c641bec..5cc2d6177fe2 100644 --- a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java @@ -473,7 +473,7 @@ public void run2() throws CacheException { Region region1 = getRootRegion().getSubregion(regionName); for (int i = 1; i <= size; i++) { Portfolio portfolio = new Portfolio(i); - portfolio.shortID = new Short("" + i); + portfolio.shortID = Short.valueOf("" + i); region1.put(KEY + i, portfolio); } logger.info("### Number of Entries in Region :" + region1.keySet().size()); diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java index a33c1fd53df7..29ab33901ca7 100644 --- a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java @@ -1124,7 +1124,7 @@ public void run2() throws CacheException { // Check if the events from CqListener are in order. int oldId = 0; for (Object cqEvent : cqListener.events.toArray()) { - int newId = new Integer(cqEvent.toString()); + int newId = Integer.valueOf(cqEvent.toString()); if (oldId > newId) { fail("Queued events for CQ Listener during execution with " + "Initial results is not in the order in which they are created."); diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java index 87de0bbc1f7e..89aab8e1a197 100644 --- a/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java @@ -1160,7 +1160,7 @@ public void run2() throws CacheException { // Check if the events from CqListener are in order. int oldId = 0; for (Object cqEvent : cqListener.events.toArray()) { - int newId = new Integer(cqEvent.toString()); + int newId = Integer.valueOf(cqEvent.toString()); if (oldId > newId) { fail("Queued events for CQ Listener during execution with " + "Initial results is not in the order in which they are created."); diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java index e5b3c41c43c5..0ae7d03a8b63 100755 --- a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java @@ -172,11 +172,11 @@ public void initialise(Boolean clone, String[] queries, Boolean cq, Boolean RI, .createServerCache(Boolean.TRUE, Boolean.FALSE, clone, enableDelta)); client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.FALSE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.FALSE, Boolean.FALSE, Boolean.FALSE)); client2.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2), Boolean.TRUE, + NetworkUtils.getServerHostName(server2.getHost()), Integer.valueOf(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI)); } @@ -190,11 +190,11 @@ public void initialise2(Boolean clone, String[] queries, Boolean cq, Boolean RI, .createServerCache(Boolean.FALSE, Boolean.FALSE, clone, enableDelta)); client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.FALSE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.FALSE, Boolean.FALSE, Boolean.FALSE)); client2.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2), Boolean.TRUE, + NetworkUtils.getServerHostName(server2.getHost()), Integer.valueOf(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI)); } @@ -301,7 +301,7 @@ public void testClientDeltaPropogationPutFetchesTheLatestValueWhenClientVersionI .createServerCache(Boolean.TRUE, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE)); ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.FALSE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, null, Boolean.FALSE); Region r = cache.getRegion(REGION_NAME); DeltaTestImpl val = new DeltaTestImpl(0, "0", (double) 0, new byte[0], @@ -835,7 +835,7 @@ public void testEmptyClientAsFeederToServer() { .invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(Boolean.FALSE, Boolean.FALSE)); client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.FALSE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE)); /* @@ -866,7 +866,7 @@ public void testEmptyServerAsFeederToPeer() { .invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(Boolean.FALSE, Boolean.FALSE)); client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.FALSE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE)); client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta(KEY1)); @@ -892,11 +892,11 @@ public void testClientsConnectedToEmptyServer() { .invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(Boolean.FALSE, Boolean.FALSE)); client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.TRUE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.TRUE, Boolean.TRUE, Boolean.FALSE)); client2.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.TRUE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.TRUE, Boolean.FALSE, Boolean.FALSE)); int deltaSent = @@ -922,7 +922,7 @@ public void testClientNonEmptyEmptyServerAsFeederToPeer() { .invoke(() -> ClientToServerDeltaDUnitTest.createServerCache(Boolean.FALSE, Boolean.FALSE)); client.invoke(() -> ClientToServerDeltaDUnitTest.createClientCache( - NetworkUtils.getServerHostName(server.getHost()), new Integer(PORT1), Boolean.FALSE, + NetworkUtils.getServerHostName(server.getHost()), Integer.valueOf(PORT1), Boolean.FALSE, Boolean.FALSE, Boolean.FALSE)); client.invoke(() -> ClientToServerDeltaDUnitTest.putDelta(KEY1));