[Clean code] Remove unused imports

apolloconfig · Mar 30, 2023 · 817defe · 817defe
1 parent 4acee42
commit 817defe
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 23 deletions.
diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServiceRegistry.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServiceRegistry.java
@@ -18,7 +18,6 @@
 
 import com.ctrip.framework.apollo.biz.registry.ServiceInstance;
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.Map;
 import javax.persistence.Column;
 import javax.persistence.Convert;

diff --git a/...iz/src/main/java/com/ctrip/framework/apollo/biz/registry/DatabaseServiceRegistryImpl.java b/...iz/src/main/java/com/ctrip/framework/apollo/biz/registry/DatabaseServiceRegistryImpl.java
@@ -18,7 +18,6 @@
 
 import com.ctrip.framework.apollo.biz.entity.ServiceRegistry;
 import com.ctrip.framework.apollo.biz.service.ServiceRegistryService;
-import java.time.LocalDateTime;
 
 public class DatabaseServiceRegistryImpl implements DatabaseServiceRegistry {
 

diff --git a/...c/test/java/com/ctrip/framework/apollo/biz/registry/DatabaseDiscoveryIntegrationTest.java b/...c/test/java/com/ctrip/framework/apollo/biz/registry/DatabaseDiscoveryIntegrationTest.java
@@ -20,20 +20,15 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.biz.registry.DatabaseDiscoveryWithoutDecoratorIntegrationTest.ApolloServiceDiscoveryWithoutDecoratorAutoConfiguration;
 import com.ctrip.framework.apollo.biz.registry.configuration.ApolloServiceDiscoveryAutoConfiguration;
 import com.ctrip.framework.apollo.biz.registry.configuration.ApolloServiceRegistryAutoConfiguration;
-import com.ctrip.framework.apollo.biz.registry.configuration.support.ApolloServiceDiscoveryProperties;
 import com.ctrip.framework.apollo.biz.repository.ServiceRegistryRepository;
-import com.ctrip.framework.apollo.biz.service.ServiceRegistryService;
+
 import java.util.List;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;

diff --git a/...e/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java b/...e/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java
@@ -27,7 +27,6 @@
 import com.ctrip.framework.apollo.core.dto.ApolloConfig;
 import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
 import com.ctrip.framework.apollo.tracer.Tracer;
-import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

diff --git a/...c/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigFileController.java b/...c/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigFileController.java
@@ -28,7 +28,6 @@
 import com.ctrip.framework.apollo.core.utils.PropertiesUtil;
 import com.ctrip.framework.apollo.tracer.Tracer;
 import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

diff --git a/.../java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerTest.java b/.../java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerTest.java
@@ -139,7 +139,7 @@ public void testPollNotificationWithDefaultNamespaceAsFile() throws Exception {
 
   @Test
   public void testPollNotificationWithSomeNamespaceAsFile() throws Exception {
-    String namespace = String.format("someNamespace.xml");
+    String namespace = "someNamespace.xml";
 
     when(namespaceUtil.filterNamespaceName(namespace)).thenReturn(namespace);
 

diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java
@@ -16,7 +16,6 @@
  */
 package com.ctrip.framework.apollo.openapi.service;
 
-import com.ctrip.framework.apollo.common.dto.PageDTO;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.openapi.entity.Consumer;
 import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;

diff --git a/...l/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java b/...l/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java
@@ -21,7 +21,6 @@
 import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
 import com.ctrip.framework.apollo.portal.spi.UserService;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/...lo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLogoutHandler.java b/...lo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLogoutHandler.java
@@ -17,7 +17,7 @@
 package com.ctrip.framework.apollo.portal.spi.oidc;
 
 import com.ctrip.framework.apollo.portal.spi.LogoutHandler;
-import java.io.IOException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/NamespaceBOUtils.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/NamespaceBOUtils.java
@@ -22,17 +22,14 @@
 import com.ctrip.framework.apollo.common.dto.ItemDTO;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.core.utils.PropertiesUtil;
 import com.ctrip.framework.apollo.portal.controller.ConfigsExportController;
 import com.ctrip.framework.apollo.portal.entity.bo.ItemBO;
 import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
 
 import org.springframework.util.CollectionUtils;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**

diff --git a/...-portal/src/test/java/com/ctrip/framework/apollo/openapi/service/ConsumerServiceTest.java b/...-portal/src/test/java/com/ctrip/framework/apollo/openapi/service/ConsumerServiceTest.java
@@ -179,7 +179,7 @@ public void testCreateConsumer() {
 
   @Test
   public void testAssignNamespaceRoleToConsumer() {
-    Long consumerId = 1L;
+    long consumerId = 1L;
     String token = "token";
 
     doReturn(consumerId).when(consumerService).getConsumerIdByToken(token);

diff --git a/...st/java/com/ctrip/framework/apollo/portal/component/txtresolver/FileTextResolverTest.java b/...st/java/com/ctrip/framework/apollo/portal/component/txtresolver/FileTextResolverTest.java
@@ -25,7 +25,6 @@
 import org.junit.Test;
 import org.mockito.InjectMocks;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 public class FileTextResolverTest extends AbstractUnitTest {

diff --git a/...rtal/src/test/java/com/ctrip/framework/apollo/portal/controller/SearchControllerTest.java b/...rtal/src/test/java/com/ctrip/framework/apollo/portal/controller/SearchControllerTest.java
@@ -33,13 +33,11 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/...rc/test/java/com/ctrip/framework/apollo/portal/controller/ServerConfigControllerTest.java b/...rc/test/java/com/ctrip/framework/apollo/portal/controller/ServerConfigControllerTest.java
@@ -17,7 +17,6 @@
 package com.ctrip.framework.apollo.portal.controller;
 
 import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
 import com.ctrip.framework.apollo.portal.entity.po.ServerConfig;
 import com.ctrip.framework.apollo.portal.environment.Env;
 import com.ctrip.framework.apollo.portal.service.ServerConfigService;
@@ -35,7 +34,6 @@
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 /**