From 3794cd2de37352fc2c48544046f2b979996b382d Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 11 Aug 2020 14:37:44 -0400 Subject: [PATCH] Renames classes to reduce duplicate names. This will make test failures easier to diagnose. --- ...StandaloneClientApplication.java => BusApplication.java} | 4 ++-- ...ClientApplicationTests.java => BusApplicationTests.java} | 2 +- ...eClientApplication.java => ConfigClientApplication.java} | 4 ++-- ...licationTests.java => ConfigClientApplicationTests.java} | 2 +- ...ntApplication.java => ConfigClientRetryApplication.java} | 4 ++-- ...ionTests.java => ConfigClientRetryApplicationTests.java} | 2 +- ...ests.java => ConfigServerBootstrapApplicationTests.java} | 2 +- ...neClientApplication.java => EurekaNoWebApplication.java} | 6 +++--- ...onTests.java => DefaultEurekaNoWebApplicationTests.java} | 2 +- ...plicationTests.java => EurekaNoWebApplicationTests.java} | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename bus/src/main/java/demo/{StandaloneClientApplication.java => BusApplication.java} (68%) rename bus/src/test/java/demo/{StandaloneClientApplicationTests.java => BusApplicationTests.java} (93%) rename config-client/src/main/java/demo/{StandaloneClientApplication.java => ConfigClientApplication.java} (68%) rename config-client/src/test/java/demo/{StandaloneClientApplicationTests.java => ConfigClientApplicationTests.java} (93%) rename config-retry/src/main/java/demo/{StandaloneClientApplication.java => ConfigClientRetryApplication.java} (72%) rename config-retry/src/test/java/demo/{StandaloneClientApplicationTests.java => ConfigClientRetryApplicationTests.java} (98%) rename configserver-bootstrap/src/test/java/demo/{ConfigServerEurekaApplicationTests.java => ConfigServerBootstrapApplicationTests.java} (87%) rename eureka-noweb/src/main/java/demo/{StandaloneClientApplication.java => EurekaNoWebApplication.java} (79%) rename eureka-noweb/src/test/java/demo/{DefaultStandaloneClientApplicationTests.java => DefaultEurekaNoWebApplicationTests.java} (93%) rename eureka-noweb/src/test/java/demo/{StandaloneClientApplicationTests.java => EurekaNoWebApplicationTests.java} (95%) diff --git a/bus/src/main/java/demo/StandaloneClientApplication.java b/bus/src/main/java/demo/BusApplication.java similarity index 68% rename from bus/src/main/java/demo/StandaloneClientApplication.java rename to bus/src/main/java/demo/BusApplication.java index 79855f8..3717d15 100644 --- a/bus/src/main/java/demo/StandaloneClientApplication.java +++ b/bus/src/main/java/demo/BusApplication.java @@ -7,9 +7,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author Dave Syer */ @SpringBootApplication -public class StandaloneClientApplication { +public class BusApplication { public static void main(String[] args) { - SpringApplication.run(StandaloneClientApplication.class, args); + SpringApplication.run(BusApplication.class, args); } } \ No newline at end of file diff --git a/bus/src/test/java/demo/StandaloneClientApplicationTests.java b/bus/src/test/java/demo/BusApplicationTests.java similarity index 93% rename from bus/src/test/java/demo/StandaloneClientApplicationTests.java rename to bus/src/test/java/demo/BusApplicationTests.java index 8c3e9c5..cb7e436 100644 --- a/bus/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/bus/src/test/java/demo/BusApplicationTests.java @@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class StandaloneClientApplicationTests { +public class BusApplicationTests { @Autowired private ConfigServicePropertySourceLocator locator; diff --git a/config-client/src/main/java/demo/StandaloneClientApplication.java b/config-client/src/main/java/demo/ConfigClientApplication.java similarity index 68% rename from config-client/src/main/java/demo/StandaloneClientApplication.java rename to config-client/src/main/java/demo/ConfigClientApplication.java index 5e1a142..9fa1d27 100644 --- a/config-client/src/main/java/demo/StandaloneClientApplication.java +++ b/config-client/src/main/java/demo/ConfigClientApplication.java @@ -7,9 +7,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author Dave Syer */ @SpringBootApplication -public class StandaloneClientApplication { +public class ConfigClientApplication { public static void main(String[] args) { - SpringApplication.run(StandaloneClientApplication.class, args); + SpringApplication.run(ConfigClientApplication.class, args); } } diff --git a/config-client/src/test/java/demo/StandaloneClientApplicationTests.java b/config-client/src/test/java/demo/ConfigClientApplicationTests.java similarity index 93% rename from config-client/src/test/java/demo/StandaloneClientApplicationTests.java rename to config-client/src/test/java/demo/ConfigClientApplicationTests.java index 8c3e9c5..61369ea 100644 --- a/config-client/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/config-client/src/test/java/demo/ConfigClientApplicationTests.java @@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class StandaloneClientApplicationTests { +public class ConfigClientApplicationTests { @Autowired private ConfigServicePropertySourceLocator locator; diff --git a/config-retry/src/main/java/demo/StandaloneClientApplication.java b/config-retry/src/main/java/demo/ConfigClientRetryApplication.java similarity index 72% rename from config-retry/src/main/java/demo/StandaloneClientApplication.java rename to config-retry/src/main/java/demo/ConfigClientRetryApplication.java index 7795144..ef292c6 100644 --- a/config-retry/src/main/java/demo/StandaloneClientApplication.java +++ b/config-retry/src/main/java/demo/ConfigClientRetryApplication.java @@ -8,10 +8,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder; * @author Dave Syer */ @SpringBootApplication -public class StandaloneClientApplication { +public class ConfigClientRetryApplication { public static void main(String[] args) { - new SpringApplicationBuilder(StandaloneClientApplication.class).properties( + new SpringApplicationBuilder(ConfigClientRetryApplication.class).properties( "spring.cloud.config.enabled=true").run(args); } } diff --git a/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java b/config-retry/src/test/java/demo/ConfigClientRetryApplicationTests.java similarity index 98% rename from config-retry/src/test/java/demo/StandaloneClientApplicationTests.java rename to config-retry/src/test/java/demo/ConfigClientRetryApplicationTests.java index 4070c80..0f591f6 100644 --- a/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/config-retry/src/test/java/demo/ConfigClientRetryApplicationTests.java @@ -34,7 +34,7 @@ import apps.ConfigServer; @SpringBootTest(properties={ "spring.cloud.config.enabled=true", "logging.level.org.springframework.retry=TRACE" }) @DirtiesContext -public class StandaloneClientApplicationTests { +public class ConfigClientRetryApplicationTests { @Autowired private ConfigServicePropertySourceLocator locator; diff --git a/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java b/configserver-bootstrap/src/test/java/demo/ConfigServerBootstrapApplicationTests.java similarity index 87% rename from configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java rename to configserver-bootstrap/src/test/java/demo/ConfigServerBootstrapApplicationTests.java index 9120268..822ac10 100644 --- a/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java +++ b/configserver-bootstrap/src/test/java/demo/ConfigServerBootstrapApplicationTests.java @@ -9,7 +9,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class ConfigServerEurekaApplicationTests { +public class ConfigServerBootstrapApplicationTests { @Test public void contextLoads() { diff --git a/eureka-noweb/src/main/java/demo/StandaloneClientApplication.java b/eureka-noweb/src/main/java/demo/EurekaNoWebApplication.java similarity index 79% rename from eureka-noweb/src/main/java/demo/StandaloneClientApplication.java rename to eureka-noweb/src/main/java/demo/EurekaNoWebApplication.java index 7719215..6a77973 100644 --- a/eureka-noweb/src/main/java/demo/StandaloneClientApplication.java +++ b/eureka-noweb/src/main/java/demo/EurekaNoWebApplication.java @@ -17,9 +17,9 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; */ @SpringBootApplication @EnableDiscoveryClient -public class StandaloneClientApplication implements CommandLineRunner { +public class EurekaNoWebApplication implements CommandLineRunner { - private static Log logger = LogFactory.getLog(StandaloneClientApplication.class); + private static Log logger = LogFactory.getLog(EurekaNoWebApplication.class); @Autowired private DiscoveryClient client; @@ -31,6 +31,6 @@ public class StandaloneClientApplication implements CommandLineRunner { } public static void main(String[] args) { - SpringApplication.run(StandaloneClientApplication.class, args); + SpringApplication.run(EurekaNoWebApplication.class, args); } } diff --git a/eureka-noweb/src/test/java/demo/DefaultStandaloneClientApplicationTests.java b/eureka-noweb/src/test/java/demo/DefaultEurekaNoWebApplicationTests.java similarity index 93% rename from eureka-noweb/src/test/java/demo/DefaultStandaloneClientApplicationTests.java rename to eureka-noweb/src/test/java/demo/DefaultEurekaNoWebApplicationTests.java index ef83ed9..4d86e47 100644 --- a/eureka-noweb/src/test/java/demo/DefaultStandaloneClientApplicationTests.java +++ b/eureka-noweb/src/test/java/demo/DefaultEurekaNoWebApplicationTests.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringRunner.class) @SpringBootTest(properties = "eureka.client.enabled=false") @DirtiesContext -public class DefaultStandaloneClientApplicationTests { +public class DefaultEurekaNoWebApplicationTests { @Autowired private DiscoveryClient discoveryClient; diff --git a/eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java b/eureka-noweb/src/test/java/demo/EurekaNoWebApplicationTests.java similarity index 95% rename from eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java rename to eureka-noweb/src/test/java/demo/EurekaNoWebApplicationTests.java index 1418817..ab42e50 100644 --- a/eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/eureka-noweb/src/test/java/demo/EurekaNoWebApplicationTests.java @@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class StandaloneClientApplicationTests { +public class EurekaNoWebApplicationTests { @Autowired private DiscoveryClient discoveryClient;