Merge pull request #93 from mercyblitz/dev-1.x

Polish #88
microsphere-projects · Jan 11, 2025 · 38ba5ff · 38ba5ff
2 parents 10abbb4 + 39f8b8c
commit 38ba5ff
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/...e-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java b/...e-spring-context/src/main/java/io/microsphere/spring/core/annotation/AnnotationUtils.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static java.lang.String.valueOf;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
@@ -180,7 +179,7 @@ public static Map<String, Object> getAttributes(Map<String, Object> annotationAt
             }
 
             if (attributeValue instanceof String) {
-                attributeValue = resolvePlaceholders(valueOf(attributeValue), propertyResolver);
+                attributeValue = resolvePlaceholders((String) attributeValue, propertyResolver);
             } else if (attributeValue instanceof String[]) {
                 String[] values = (String[]) attributeValue;
                 for (int i = 0; i < values.length; i++) {

diff --git a/...spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java b/...spring/beans/factory/annotation/EnableConfigurationBeanBindingTestForMultipleBinding.java
@@ -32,9 +32,9 @@
 import java.util.Collection;
 
 import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
-import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @EnableConfigurationBeanBinding(prefix = "users", type = User.class, multiple = true, ignoreUnknownFields = false,
         ignoreInvalidFields = false)

diff --git a/...phere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java b/...phere-spring-context/src/test/java/io/microsphere/spring/util/SpringVersionUtilsTest.java
@@ -50,8 +50,8 @@ public void testGetSpringVersionOnIAE() {
     @Test
     public void testGetSpringVersion() {
         Version version = getSpringVersion(StringUtils.class);
-        assertEquals(version,SPRING_AOP_VERSION);
-        assertEquals(SPRING_CORE_VERSION,SPRING_AOP_VERSION);
+        assertEquals(version, SPRING_AOP_VERSION);
+        assertEquals(SPRING_CORE_VERSION, SPRING_AOP_VERSION);
         assertEquals(SPRING_AOP_VERSION, SPRING_BEANS_VERSION);
         assertEquals(SPRING_BEANS_VERSION, SPRING_CONTEXT_VERSION);
         assertEquals(SPRING_CONTEXT_VERSION, SPRING_CONTEXT_SUPPORT_VERSION);

diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml
@@ -63,7 +63,6 @@
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>${servlet-api.version}</version>
-                <scope>provided</scope>
             </dependency>
 
             <!-- JUnit -->
@@ -73,7 +72,7 @@
                 <version>${junit.version}</version>
             </dependency>
 
-            <!-- Mockito Bom -->
+            <!-- Mockito BOM -->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-bom</artifactId>

diff --git a/microsphere-spring-web/pom.xml b/microsphere-spring-web/pom.xml
@@ -67,7 +67,7 @@
             <artifactId>jackson-databind</artifactId>
             <optional>true</optional>
         </dependency>
-        
+
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>