(rocketmq) branch develop updated: [ISSUE #7983] Use java optional (#7984)

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 28565a34a4 [ISSUE #7983] Use java optional (#7984)
28565a34a4 is described below

commit 28565a34a4bd6da61de28c0b10c49d89d82842b1
Author: ChineseTony <taowan...@163.com>
AuthorDate: Mon Apr 1 10:47:21 2024 +0800

    [ISSUE #7983] Use java optional (#7984)
    
    * Use java optional
    
    * Use java optional
---
 client/BUILD.bazel                                                   | 1 -
 client/pom.xml                                                       | 4 ----
 .../apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java  | 4 ++--
 .../org/apache/rocketmq/proxy/service/route/TopicRouteService.java   | 5 +++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/client/BUILD.bazel b/client/BUILD.bazel
index 46e29452b9..e491cfcef0 100644
--- a/client/BUILD.bazel
+++ b/client/BUILD.bazel
@@ -33,7 +33,6 @@ java_library(
         "@maven//:commons_collections_commons_collections",
         "@maven//:io_github_aliyunmq_rocketmq_slf4j_api",
         "@maven//:io_github_aliyunmq_rocketmq_logback_classic",
-        "@maven//:com_google_guava_guava",
     ],
 )
 
diff --git a/client/pom.xml b/client/pom.xml
index 6ad1ab8317..13a9281558 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -54,10 +54,6 @@
             <groupId>io.opentracing</groupId>
             <artifactId>opentracing-mock</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.github.aliyunmq</groupId>
             <artifactId>rocketmq-slf4j-api</artifactId>
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
index d1d9563dea..d171411d02 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -34,7 +35,6 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Optional;
 import org.apache.rocketmq.client.QueryResult;
 import org.apache.rocketmq.client.Validators;
 import org.apache.rocketmq.client.common.ClientErrorCode;
@@ -184,7 +184,7 @@ public class DefaultMQProducerImpl implements 
MQProducerInner {
     }
     private Optional<String> pickTopic() {
         if (topicPublishInfoTable.isEmpty()) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.of(topicPublishInfoTable.keySet().iterator().next());
     }
diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/TopicRouteService.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/TopicRouteService.java
index ccf094c03a..bcdf8140bc 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/TopicRouteService.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/TopicRouteService.java
@@ -19,9 +19,10 @@ package org.apache.rocketmq.proxy.service.route;
 import com.github.benmanes.caffeine.cache.CacheLoader;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
-import com.google.common.base.Optional;
+
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -139,7 +140,7 @@ public abstract class TopicRouteService extends 
AbstractStartAndShutdown {
     // pickup one topic in the topic cache
     private Optional<String> pickTopic() {
         if (topicCache.asMap().isEmpty()) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.of(topicCache.asMap().keySet().iterator().next());
     }