fix: resolve PMD Checks, unnecessary imports, unused package.

sofastack · Mar 20, 2024 · 3659ba8 · 3659ba8
1 parent b2b0243
commit 3659ba8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 36 deletions.
diff --git a/sofa-boot-project/sofa-boot/pom.xml b/sofa-boot-project/sofa-boot/pom.xml
@@ -45,12 +45,7 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>RELEASE</version>
-            <scope>test</scope>
-        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/...t/sofa-boot/src/test/java/com/alipay/sofa/boot/compatibility/VerificationResultTests.java b/...t/sofa-boot/src/test/java/com/alipay/sofa/boot/compatibility/VerificationResultTests.java
@@ -1,9 +1,8 @@
 package com.alipay.sofa.boot.compatibility;
 
-import com.alipay.sofa.boot.compatibility.VerificationResult;
-import com.alipay.sofa.boot.util.SofaBootEnvUtils;
 import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link VerificationResult}.

diff --git a/...a-boot/src/test/java/com/alipay/sofa/boot/context/SofaGenericApplicationContextTests.java b/...a-boot/src/test/java/com/alipay/sofa/boot/context/SofaGenericApplicationContextTests.java
@@ -132,8 +132,6 @@ public void afterRefresh(SofaGenericApplicationContext context, Throwable throwa
             failed = throwable != null;
         }
 
-
-
         public boolean isStarted() {
             return started;
         }

diff --git a/...ot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/startup/StartupReporterTests.java b/...ot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/startup/StartupReporterTests.java
@@ -1,16 +1,14 @@
 package com.alipay.sofa.boot.startup;
 
-import com.alipay.sofa.boot.env.SofaBootEnvironmentPostProcessor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Tests for {@link StartupReporter}.
@@ -24,12 +22,13 @@ public class StartupReporterTests {
     ConfigurableApplicationContext mockContext;
 
     @Mock
-    ConfigurableEnvironment mockEnvironment;
+    ConfigurableEnvironment        mockEnvironment;
 
     @BeforeEach
     public void setup() {
         MockitoAnnotations.openMocks(this);
     }
+
     @Test
     public void testApplicationBootFinish() {
         StartupReporter startupReporter = new StartupReporter();
@@ -45,13 +44,10 @@ public void testAddCommonStartupStat() {
         });
     }
 
-
     @Test
     public void testDrainStartupStaticsModel() {
         StartupReporter startupReporter = new StartupReporter();
         assertNotNull(startupReporter.drainStartupStaticsModel());
     }
 
-
-
 }
diff --git a/...boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/util/SofaBootEnvUtilsTests.java b/...boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/util/SofaBootEnvUtilsTests.java
@@ -17,15 +17,10 @@
 package com.alipay.sofa.boot.util;
 
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.springframework.cloud.util.PropertyUtils;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Tests for {@link SofaBootEnvUtils}.
@@ -73,16 +68,16 @@ public void testInitSpringTestEnv() {
     }
 
     private boolean isInitSpringTestEnv() {
-        StackTraceElement[] stackTrace = new StackTraceElement[]{
+        StackTraceElement[] stackTrace = new StackTraceElement[] {
                 new StackTraceElement("SomeClass", "someMethod", "SomeClass.java", 10),
                 new StackTraceElement("AnotherClass", "loadContext", "AnotherClass.java", 20),
-                new StackTraceElement("org.springframework.boot.test.context.SpringBootContextLoader",
-                        "loadContext", "SpringBootContextLoader.java", 30)
-        };
+                new StackTraceElement(
+                    "org.springframework.boot.test.context.SpringBootContextLoader", "loadContext",
+                    "SpringBootContextLoader.java", 30) };
         boolean TEST_ENV = false;
         for (StackTraceElement stackTraceElement : stackTrace) {
             if ("loadContext".equals(stackTraceElement.getMethodName())
-                    && "org.springframework.boot.test.context.SpringBootContextLoader"
+                && "org.springframework.boot.test.context.SpringBootContextLoader"
                     .equals(stackTraceElement.getClassName())) {
                 TEST_ENV = true;
                 break;
@@ -91,8 +86,3 @@ private boolean isInitSpringTestEnv() {
         return TEST_ENV;
     }
 }
-
-
-
-
-