Replace NonNull with Nonnull & tidy imports

Use io.microsphere.annotation.Nonnull in GatewayUtils instead of org.springframework.lang.NonNull and update the corresponding method annotations. Reorder and clean up imports in GatewayAutoConfiguration and DisabledHeartbeatEventRouteRefreshListenerInterceptor. Remove several unused imports from test classes. These are non-functional cleanup changes to standardize annotations and reduce import noise.

Author: mercyblitz

microsphere-spring-cloud-gateway-server-webflux/src/main/java/io/microsphere/spring/cloud/gateway/server/webflux/autoconfigure/GatewayAutoConfiguration.java

@@ -16,8 +16,8 @@
  */
 package io.microsphere.spring.cloud.gateway.server.webflux.autoconfigure;
 
-import io.microsphere.spring.cloud.gateway.server.webflux.annotation.ConditionalOnGatewayEnabled;
 import io.microsphere.spring.cloud.gateway.commons.annotation.ConditionalOnMicrosphereGatewayEnabled;
+import io.microsphere.spring.cloud.gateway.server.webflux.annotation.ConditionalOnGatewayEnabled;
 import io.microsphere.spring.cloud.gateway.server.webflux.event.DisabledHeartbeatEventRouteRefreshListenerInterceptor;
 import io.microsphere.spring.cloud.gateway.server.webflux.event.PropagatingRefreshRoutesEventApplicationListener;
 import io.microsphere.spring.cloud.gateway.server.webflux.filter.WebEndpointMappingGlobalFilter;

microsphere-spring-cloud-gateway-server-webflux/src/main/java/io/microsphere/spring/cloud/gateway/server/webflux/event/DisabledHeartbeatEventRouteRefreshListenerInterceptor.java

@@ -16,9 +16,9 @@
  */
 package io.microsphere.spring.cloud.gateway.server.webflux.event;
 
+import io.microsphere.logging.Logger;
 import io.microsphere.spring.context.event.ApplicationListenerInterceptor;
 import io.microsphere.spring.context.event.ApplicationListenerInterceptorChain;
-import io.microsphere.logging.Logger;
 import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
 import org.springframework.cloud.client.discovery.event.ParentHeartbeatEvent;
 import org.springframework.cloud.gateway.route.RouteRefreshListener;

microsphere-spring-cloud-gateway-server-webflux/src/main/java/io/microsphere/spring/cloud/gateway/server/webflux/util/GatewayUtils.java

@@ -16,14 +16,14 @@
  */
 package io.microsphere.spring.cloud.gateway.server.webflux.util;
 
+import io.microsphere.annotation.Nonnull;
 import io.microsphere.util.Utils;
 import org.springframework.cloud.gateway.config.GatewayProperties;
 import org.springframework.cloud.gateway.event.RefreshRoutesResultEvent;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
-import org.springframework.lang.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -50,7 +50,7 @@ public abstract class GatewayUtils implements Utils {
      * @param environment {@link ConfigurableEnvironment}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static Map<String, Object> getGatewayProperties(ConfigurableEnvironment environment) {
         return getSubProperties(environment, PREFIX);
     }
@@ -63,7 +63,7 @@ public static Map<String, Object> getGatewayProperties(ConfigurableEnvironment e
      * @param routeId     the id of {@link RouteDefinition}
      * @return non-null
      */
-    @NonNull
+    @Nonnull
     public static Map<String, Object> getRouteProperties(ConfigurableEnvironment environment, String routeId) {
         Map<String, Object> gatewayProperties = getGatewayProperties(environment);
         String prefix = null;

microsphere-spring-cloud-gateway-server-webflux/src/test/java/io/microsphere/spring/cloud/gateway/server/webflux/constants/GatewayPropertyConstantsTest.java

@@ -18,7 +18,6 @@
 package io.microsphere.spring.cloud.gateway.server.webflux.constants;
 
 
-import io.microsphere.spring.cloud.gateway.server.webflux.constants.GatewayPropertyConstants;
 import org.junit.jupiter.api.Test;
 
 import static io.microsphere.constants.PropertyConstants.ENABLED_PROPERTY_NAME;

microsphere-spring-cloud-gateway-server-webflux/src/test/java/io/microsphere/spring/cloud/gateway/server/webflux/filter/WebEndpointMappingGlobalFilterStaticTest.java

@@ -17,7 +17,6 @@
 
 package io.microsphere.spring.cloud.gateway.server.webflux.filter;
 
-import io.microsphere.spring.cloud.gateway.server.webflux.filter.WebEndpointMappingGlobalFilter;
 import org.junit.jupiter.api.Test;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;

microsphere-spring-cloud-gateway-server-webflux/src/test/java/io/microsphere/spring/cloud/gateway/server/webflux/handler/CachingFilteringWebHandlerTest.java

@@ -16,7 +16,6 @@
  */
 package io.microsphere.spring.cloud.gateway.server.webflux.handler;
 
-import io.microsphere.spring.cloud.gateway.server.webflux.handler.CachingFilteringWebHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.cloud.gateway.event.RefreshRoutesResultEvent;

microsphere-spring-cloud-gateway-server-webflux/src/test/java/io/microsphere/spring/cloud/gateway/server/webflux/util/GatewayUtilsTest.java

@@ -18,7 +18,6 @@
 package io.microsphere.spring.cloud.gateway.server.webflux.util;
 
 
-import io.microsphere.spring.cloud.gateway.server.webflux.util.GatewayUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.env.YamlPropertySourceLoader;