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

Standardize Javadoc headings and update dependencies

Author: mercyblitz

README.md

@@ -91,8 +91,8 @@ Choose the version that matches your Spring Framework line:
 
 | Branch | Spring Framework compatibility | Latest version |
 |--------|--------------------------------|----------------|
-| `main` | 6.0.x – 7.0.x                  | `0.2.33`       |
-| `1.x`  | 4.3.x – 5.3.x                  | `0.1.33`       |
+| `main` | 6.0.x – 7.0.x                  | `0.2.34`       |
+| `1.x`  | 4.3.x – 5.3.x                  | `0.1.34`       |
 
 ### 2. Add individual modules
 

microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/DelegatingFactoryBean.java

@@ -48,7 +48,7 @@
  *       {@link BeanNameAware}, delegating calls to the target object if applicable.</li>
  * </ul>
  *
- * <h3>Usage Example:</h3>
+ * <h3>Example Usage</h3>
  *
  * <pre>{@code
  * MyService myService = new MyServiceImpl();

microsphere-spring-context/src/main/java/io/microsphere/spring/cache/intereptor/TTLCacheResolver.java

@@ -16,7 +16,6 @@
  */
 package io.microsphere.spring.cache.intereptor;
 
-import io.microsphere.logging.Logger;
 import io.microsphere.spring.cache.TTLContext;
 import io.microsphere.spring.cache.annotation.TTLCachePut;
 import io.microsphere.spring.cache.annotation.TTLCacheable;
@@ -45,7 +44,6 @@
 import static io.microsphere.collection.ListUtils.newArrayList;
 import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.collection.Maps.ofMap;
-import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.spring.core.annotation.AnnotationUtils.getAnnotationAttributes;
 import static io.microsphere.util.ArrayUtils.isEmpty;
 import static java.time.Duration.ofMillis;
@@ -59,8 +57,6 @@
  */
 public class TTLCacheResolver extends OnceApplicationContextEventListener<ContextRefreshedEvent> implements CacheResolver {
 
-    private static final Logger logger = getLogger(TTLCacheResolver.class);
-
     public static final String BEAN_NAME = "ttlCacheResolver";
 
     private static final Map<Class<? extends CacheOperation>, Class<? extends Annotation>> ttlAnnotationTypes = ofMap(

microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/AnnotatedBeanCapableImportBeanDefinitionRegistrar.java

@@ -33,7 +33,7 @@
  * This class extends {@link AnnotatedBeanCapableImportCandidate} to provide annotation-driven import capabilities
  * and implements {@link ImportBeanDefinitionRegistrar} to handle bean definition registration.
  *
- * <h3>Usage Example</h3>
+ * <h3>Example Usage</h3>
  * <pre>{@code
  * public class MyFeatureRegistrar extends AnnotatedBeanCapableImportBeanDefinitionRegistrar<EnableMyFeature> {
  *

microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/AnnotatedBeanCapableImportCandidate.java

@@ -46,7 +46,7 @@
  *     <li>Provides resolved annotation attributes via {@link ResolvablePlaceholderAnnotationAttributes}.</li>
  * </ul>
  *
- * <h3>Usage Example</h3>
+ * <h3>Example Usage</h3>
  * <pre>{@code
  * // 1. Define your custom annotation
  * @Target(ElementType.TYPE)

microsphere-spring-context/src/main/java/io/microsphere/spring/context/annotation/AnnotatedBeanCapableImportSelector.java

@@ -35,7 +35,7 @@
  * for handling annotated bean capabilities and implements {@link ImportSelector} to integrate
  * with Spring's import mechanism.
  *
- * <h3>Usage Example</h3>
+ * <h3>Example Usage</h3>
  * Suppose you want to create an import selector for an annotation {@code @EnableMyFeature}:
  *
  * <pre>{@code

microsphere-spring-context/src/main/java/io/microsphere/spring/net/AbstractSpringResourceURLConnection.java

@@ -161,7 +161,7 @@ protected Entry<String, List<String>> getHeaderEntry(int n) {
         Set<Entry<String, List<String>>> entries = headers.entrySet();
         Iterator<Entry<String, List<String>>> iterator = entries.iterator();
         Entry<String, List<String>> entry = null;
-        for (int i = 0; i <= n & iterator.hasNext(); i++) {
+        for (int i = 0; i <= n && iterator.hasNext(); i++) {
             entry = iterator.next();
         }
         return entry;

microsphere-spring-parent/pom.xml

@@ -19,8 +19,8 @@
     <description>Microsphere Spring Parent</description>
 
     <properties>
-        <microsphere-java.version>0.3.11</microsphere-java.version>
-        <microsphere-logging.version>0.1.19</microsphere-logging.version>
+        <microsphere-java.version>0.3.14</microsphere-java.version>
+        <microsphere-logging.version>0.1.21</microsphere-logging.version>
         <jackson.version>2.21.3</jackson.version>
         <snakeyaml.version>2.6</snakeyaml.version>
         <p6spy.version>3.9.1</p6spy.version>
@@ -129,7 +129,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            
+
         </dependencies>
     </dependencyManagement>
 

microsphere-spring-web/src/main/java/io/microsphere/spring/web/method/support/DelegatingHandlerMethodAdvice.java

@@ -16,7 +16,6 @@
  */
 package io.microsphere.spring.web.method.support;
 
-import io.microsphere.logging.Logger;
 import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -26,7 +25,6 @@
 
 import java.util.List;
 
-import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static java.util.Collections.emptyList;
 
@@ -44,8 +42,6 @@ public class DelegatingHandlerMethodAdvice extends OnceApplicationContextEventLi
 
     public static final String BEAN_NAME = "delegatingHandlerMethodAdvice";
 
-    private static final Logger logger = getLogger(DelegatingHandlerMethodAdvice.class);
-
     private List<HandlerMethodArgumentInterceptor> argumentInterceptors = emptyList();
 
     private List<HandlerMethodInterceptor> methodInterceptors = emptyList();

microsphere-spring-webflux/src/main/java/io/microsphere/spring/webflux/method/InterceptingHandlerMethodProcessor.java

@@ -17,7 +17,6 @@
 package io.microsphere.spring.webflux.method;
 
 import io.microsphere.annotation.Nullable;
-import io.microsphere.logging.Logger;
 import io.microsphere.spring.context.event.OnceApplicationContextEventListener;
 import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
 import io.microsphere.spring.web.metadata.WebEndpointMapping;
@@ -51,7 +50,6 @@
 
 import static io.microsphere.collection.MapUtils.newHashMap;
 import static io.microsphere.lang.function.ThrowableAction.execute;
-import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.reflect.FieldUtils.getFieldValue;
 import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static io.microsphere.spring.web.util.MonoUtils.getValue;
@@ -83,8 +81,6 @@ public class InterceptingHandlerMethodProcessor extends OnceApplicationContextEv
 
     public static final String BEAN_NAME = "interceptingHandlerMethodProcessor";
 
-    private static final Logger logger = getLogger(InterceptingHandlerMethodProcessor.class);
-
     private static final RequestContextWebFilter delegateWebFilter = new RequestContextWebFilter();
 
     private final Map<MethodParameter, MethodParameterContext> parameterContextsCache = newHashMap(256);