From 3d04ede89dc575a2ce5a7fea5f52733dcd97f257 Mon Sep 17 00:00:00 2001 From: dheeraj-kholia-cs Date: Thu, 22 Jan 2026 11:12:43 +0530 Subject: [PATCH] Upgrade guava to version 32.0.0-jre --- .../src/main/java/io/cdap/common/ImmutablePair.java | 3 ++- .../src/main/java/io/cdap/common/http/HttpRequest.java | 7 +++---- .../java/io/cdap/common/http/HttpRequestsStreamTest.java | 4 ++-- .../test/java/io/cdap/common/http/HttpRequestsTest.java | 4 ++-- .../test/java/io/cdap/common/http/HttpsRequestsTest.java | 4 ++-- .../src/test/java/io/cdap/common/http/TestHttpService.java | 7 +++---- .../io/cdap/common/internal/io/TypeRepresentation.java | 5 +++-- .../src/main/java/io/cdap/common/lang/ClassLoaders.java | 3 ++- pom.xml | 2 +- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/common-core/src/main/java/io/cdap/common/ImmutablePair.java b/common-core/src/main/java/io/cdap/common/ImmutablePair.java index a70cfe1..11699cb 100644 --- a/common-core/src/main/java/io/cdap/common/ImmutablePair.java +++ b/common-core/src/main/java/io/cdap/common/ImmutablePair.java @@ -16,6 +16,7 @@ package io.cdap.common; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -79,7 +80,7 @@ public B getSecond() { */ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("first", first) .add("second", second) .toString(); diff --git a/common-http/src/main/java/io/cdap/common/http/HttpRequest.java b/common-http/src/main/java/io/cdap/common/http/HttpRequest.java index 96a87f6..0e3569c 100644 --- a/common-http/src/main/java/io/cdap/common/http/HttpRequest.java +++ b/common-http/src/main/java/io/cdap/common/http/HttpRequest.java @@ -20,10 +20,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import com.google.common.io.InputSupplier; +import com.google.common.io.ByteSource; import io.cdap.common.ContentProvider; import io.cdap.common.io.ByteBufferInputStream; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -166,11 +165,11 @@ public Builder addHeaders(@Nullable Map headers) { return this; } - public Builder withBody(InputSupplier body) { + public Builder withBody(ByteSource body) { return withBody(new ContentProvider() { @Override public InputStream getInput() throws IOException { - return body.getInput(); + return body.openStream(); } }); } diff --git a/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java b/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java index 561dda3..5765e18 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java @@ -30,12 +30,12 @@ public class HttpRequestsStreamTest extends HttpRequestsTestBase { @Before public void setUp() throws Exception { httpService = new TestHttpService(false); - httpService.startAndWait(); + httpService.startAsync().awaitRunning(); } @After public void tearDown() { - httpService.stopAndWait(); + httpService.stopAsync().awaitTerminated(); } @Override diff --git a/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java b/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java index 7dc3e58..fb043b1 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java @@ -33,12 +33,12 @@ public class HttpRequestsTest extends HttpRequestsTestBase { @Before public void setUp() throws Exception { httpService = new TestHttpService(false); - httpService.startAndWait(); + httpService.startAsync().awaitRunning(); } @After public void tearDown() { - httpService.stopAndWait(); + httpService.stopAsync().awaitTerminated(); } @Override diff --git a/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java b/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java index d93ae43..1da54b7 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java @@ -33,12 +33,12 @@ public class HttpsRequestsTest extends HttpRequestsTestBase { @Before public void setUp() throws Exception { httpsService = new TestHttpService(true); - httpsService.startAndWait(); + httpsService.startAsync().awaitRunning(); } @After public void tearDown() { - httpsService.stopAndWait(); + httpsService.stopAsync().awaitTerminated(); } @Override diff --git a/common-http/src/test/java/io/cdap/common/http/TestHttpService.java b/common-http/src/test/java/io/cdap/common/http/TestHttpService.java index 0b0d3d5..8465880 100644 --- a/common-http/src/test/java/io/cdap/common/http/TestHttpService.java +++ b/common-http/src/test/java/io/cdap/common/http/TestHttpService.java @@ -16,7 +16,7 @@ package io.cdap.common.http; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.util.concurrent.AbstractIdleService; import io.cdap.http.ChannelPipelineModifier; import io.cdap.http.NettyHttpService; @@ -24,13 +24,12 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelPipeline; -import org.junit.Assert; - import java.io.File; import java.net.InetSocketAddress; import java.net.URISyntaxException; import java.net.URL; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.Assert; /** * Service for testing {@link HttpRequests}. @@ -90,7 +89,7 @@ public int getNumConnectionsOpened() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("bindAddress", httpService.getBindAddress()) .toString(); } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java b/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java index 5ccac1c..5274282 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java @@ -16,6 +16,7 @@ package io.cdap.common.internal.io; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.lang.reflect.ParameterizedType; @@ -117,8 +118,8 @@ public Type[] getActualTypeArguments() { @Override public Type getRawType() { try { - ClassLoader cl = Objects.firstNonNull(classLoader, - Objects.firstNonNull(Thread.currentThread().getContextClassLoader(), + ClassLoader cl = MoreObjects.firstNonNull(classLoader, + MoreObjects.firstNonNull(Thread.currentThread().getContextClassLoader(), getClass().getClassLoader())); return cl.loadClass(this.rawType); } catch (ClassNotFoundException e) { diff --git a/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java b/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java index 43479fc..b51ab6d 100644 --- a/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java +++ b/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java @@ -16,6 +16,7 @@ package io.cdap.common.lang; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.annotation.Nullable; @@ -39,7 +40,7 @@ private ClassLoaders() { } */ public static Class loadClass(String className, @Nullable ClassLoader classLoader, Object caller) throws ClassNotFoundException { - ClassLoader cl = Objects.firstNonNull(classLoader, caller.getClass().getClassLoader()); + ClassLoader cl = MoreObjects.firstNonNull(classLoader, caller.getClass().getClassLoader()); return cl.loadClass(className); } diff --git a/pom.xml b/pom.xml index c49ce0d..8e57891 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ the License. 7.1 2.0.1 2.0.0 - 13.0.1 + 32.0.0-jre 4.0 2.2.4 1.5.0