From b204ad7137389ee587a9fcc052b67062b558a74d Mon Sep 17 00:00:00 2001
From: wulingxiao <1251605638@qqcom>
Date: Mon, 4 Jul 2022 20:25:42 +0800
Subject: [PATCH] resolve the conflicts and add CHANGELOG

---
 CHANGELOG.md                                                   | 1 +
 .../tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 772273f0a..c5a8d1160 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,3 +30,4 @@
 - [docs: Update Readme.md](https://github.com/Tencent/spring-cloud-tencent/pull/381)
 - [docs:optimize example](https://github.com/Tencent/spring-cloud-tencent/pull/386)
 - [Feature: support spring cloud gateway routers](https://github.com/Tencent/spring-cloud-tencent/pull/388)
+- [Optimize:optimize load balancer code and add testcase](https://github.com/Tencent/spring-cloud-tencent/pull/379)
diff --git a/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java b/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java
index fd4a511d5..ed60df003 100644
--- a/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java
+++ b/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java
@@ -18,9 +18,8 @@
 
 package com.tencent.cloud.polaris.loadbalancer;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.tencent.cloud.common.metadata.MetadataContext;