add unit test

Signed-off-by: joecqupt <[email protected]>

Author: JoeCqupt

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfiguration.java

@@ -31,11 +31,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
-import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
-import org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration;
-import org.springframework.boot.tracing.autoconfigure.MicrometerTracingAutoConfiguration;
-import org.springframework.boot.tracing.autoconfigure.TracingProperties;
+import org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
+import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration;
+import org.springframework.boot.micrometer.tracing.autoconfigure.MicrometerTracingAutoConfiguration;
+import org.springframework.boot.micrometer.tracing.autoconfigure.TracingProperties;
 import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
 import org.springframework.cloud.gateway.filter.GatewayMetricsFilter;
 import org.springframework.cloud.gateway.filter.headers.observation.GatewayObservationConvention;

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/route/CachingRouteLocator.java

@@ -91,13 +91,13 @@ public void onApplicationEvent(RefreshRoutesEvent event) {
 					.onErrorResume(s -> Mono.just(List.of()));
 
 				Map<String, Long> routeIdToIdxMap = getRoutes().index()
-						.collectMap(t -> t.getT2().getId(), Tuple2::getT1)
-						.block();
+					.collectMap(t -> t.getT2().getId(), Tuple2::getT1)
+					.block();
 
 				scopedRoutes.subscribe(scopedRoutesList -> {
 					updateCache(Flux.concat(Flux.fromIterable(scopedRoutesList), getNonScopedRoutes(event))
-							.sort(Comparator.comparing(r -> routeIdToIdxMap.getOrDefault(r.getId(), Long.MIN_VALUE)))
-							.sort(AnnotationAwareOrderComparator.INSTANCE));
+						.sort(Comparator.comparing(r -> routeIdToIdxMap.getOrDefault(r.getId(), Long.MIN_VALUE)))
+						.sort(AnnotationAwareOrderComparator.INSTANCE));
 				}, this::handleRefreshError);
 			}
 			else {

spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java

@@ -44,8 +44,8 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ssl.SslBundleRegistrar;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
-import org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
+import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
 import org.springframework.boot.security.oauth2.client.autoconfigure.reactive.ReactiveOAuth2ClientAutoConfiguration;
 import org.springframework.boot.ssl.DefaultSslBundleRegistry;

spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/route/CachingRouteLocatorTests.java

@@ -17,7 +17,9 @@
 package org.springframework.cloud.gateway.route;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -117,6 +119,23 @@ else if (i == 2) {
 
 	}
 
+	@Test
+	public void updateScopedRoutes() {
+		Map<String, Object> metadata = Map.of("metadata-key1", "metadata-value1");
+		int order = 0;
+		Route route1 = route(1, order, Collections.EMPTY_MAP);
+		Route route2 = route(2, order, metadata);
+		CachingRouteLocator locator = new CachingRouteLocator(() -> Flux.just(route1, route2));
+
+		List<Route> routes = locator.getRoutes().collectList().block();
+		assertThat(routes).containsExactly(route1, route2);
+
+		RefreshRoutesEvent event = new RefreshRoutesEvent(this, metadata);
+		locator.onApplicationEvent(event);
+		routes = locator.getRoutes().collectList().block();
+		assertThat(routes).containsExactly(route1, route2);
+	}
+
 	private void waitUntilRefreshFinished(CachingRouteLocator locator, List<RefreshRoutesResultEvent> resultEvents)
 			throws InterruptedException {
 		CountDownLatch cdl = new CountDownLatch(1);
@@ -129,6 +148,16 @@ private void waitUntilRefreshFinished(CachingRouteLocator locator, List<RefreshR
 		assertThat(cdl.await(5, TimeUnit.SECONDS)).isTrue();
 	}
 
+	Route route(int id, int order, Map<String, Object> metadata) {
+		return Route.async()
+				.id(String.valueOf(id))
+				.uri("http://localhost/" + id)
+				.order(order)
+				.predicate(exchange -> true)
+				.metadata(metadata)
+				.build();
+	}
+
 	Route route(int id) {
 		return Route.async()
 			.id(String.valueOf(id))