From b3da1dc8198d2a5d36bebea89bde09e1061dc7eb Mon Sep 17 00:00:00 2001
From: Guillaume Lemont <guillaume.lemont@gmail.com>
Date: Thu, 25 Jun 2020 13:45:59 +0200
Subject: [PATCH] Changes ConfigurationService inner classes to static

Allows mocking of those classes.

Fixes gh-1797
---
 .../cloud/gateway/support/ConfigurationService.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ConfigurationService.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ConfigurationService.java
index 8b51888e..d1978755 100644
--- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ConfigurationService.java
+++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/ConfigurationService.java
@@ -114,7 +114,7 @@ public class ConfigurationService implements ApplicationEventPublisherAware {
 		return (T) candidate;
 	}
 
-	public class ConfigurableBuilder<T, C extends Configurable<T> & ShortcutConfigurable>
+	public static class ConfigurableBuilder<T, C extends Configurable<T> & ShortcutConfigurable>
 			extends AbstractBuilder<T, ConfigurableBuilder<T, C>> {
 
 		private final C configurable;
@@ -154,7 +154,7 @@ public class ConfigurationService implements ApplicationEventPublisherAware {
 
 	}
 
-	public class InstanceBuilder<T> extends AbstractBuilder<T, InstanceBuilder<T>> {
+	public static class InstanceBuilder<T> extends AbstractBuilder<T, InstanceBuilder<T>> {
 
 		private final T instance;
 
@@ -183,7 +183,7 @@ public class ConfigurationService implements ApplicationEventPublisherAware {
 
 	}
 
-	public abstract class AbstractBuilder<T, B extends AbstractBuilder<T, B>> {
+	public static abstract class AbstractBuilder<T, B extends AbstractBuilder<T, B>> {
 
 		protected final ConfigurationService service;