From 4cb6536d61cbdb8aaa279a16fe5294f39fa0fad2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 3 Nov 2014 15:34:11 +0000 Subject: [PATCH] Uniquely name the main class of the two sample apps --- .../java/com/example/notes/GettingStartedDocumentation.java | 2 +- .../main/java/com/example/notes/RestNotesSpringDataRest.java | 4 ++-- .../java/com/example/notes/GettingStartedDocumentation.java | 2 +- .../main/java/com/example/notes/RestNotesSpringHateoas.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename rest-notes-spring-hateoas/src/main/java/com/example/notes/Application.java => rest-notes-spring-data-rest/src/main/java/com/example/notes/RestNotesSpringDataRest.java (90%) rename rest-notes-spring-data-rest/src/main/java/com/example/notes/Application.java => rest-notes-spring-hateoas/src/main/java/com/example/notes/RestNotesSpringHateoas.java (91%) diff --git a/rest-notes-spring-data-rest/src/documentation/java/com/example/notes/GettingStartedDocumentation.java b/rest-notes-spring-data-rest/src/documentation/java/com/example/notes/GettingStartedDocumentation.java index ae231f53..fe7e0e65 100644 --- a/rest-notes-spring-data-rest/src/documentation/java/com/example/notes/GettingStartedDocumentation.java +++ b/rest-notes-spring-data-rest/src/documentation/java/com/example/notes/GettingStartedDocumentation.java @@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(classes = RestNotesSpringDataRest.class) @WebAppConfiguration public class GettingStartedDocumentation { diff --git a/rest-notes-spring-hateoas/src/main/java/com/example/notes/Application.java b/rest-notes-spring-data-rest/src/main/java/com/example/notes/RestNotesSpringDataRest.java similarity index 90% rename from rest-notes-spring-hateoas/src/main/java/com/example/notes/Application.java rename to rest-notes-spring-data-rest/src/main/java/com/example/notes/RestNotesSpringDataRest.java index 0b7d1d5e..0c995e30 100644 --- a/rest-notes-spring-hateoas/src/main/java/com/example/notes/Application.java +++ b/rest-notes-spring-data-rest/src/main/java/com/example/notes/RestNotesSpringDataRest.java @@ -24,10 +24,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @EnableAutoConfiguration @ComponentScan @EnableJpaRepositories -public class Application { +public class RestNotesSpringDataRest { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(RestNotesSpringDataRest.class, args); } } diff --git a/rest-notes-spring-hateoas/src/documentation/java/com/example/notes/GettingStartedDocumentation.java b/rest-notes-spring-hateoas/src/documentation/java/com/example/notes/GettingStartedDocumentation.java index ae231f53..e2125426 100644 --- a/rest-notes-spring-hateoas/src/documentation/java/com/example/notes/GettingStartedDocumentation.java +++ b/rest-notes-spring-hateoas/src/documentation/java/com/example/notes/GettingStartedDocumentation.java @@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(classes = RestNotesSpringHateoas.class) @WebAppConfiguration public class GettingStartedDocumentation { diff --git a/rest-notes-spring-data-rest/src/main/java/com/example/notes/Application.java b/rest-notes-spring-hateoas/src/main/java/com/example/notes/RestNotesSpringHateoas.java similarity index 91% rename from rest-notes-spring-data-rest/src/main/java/com/example/notes/Application.java rename to rest-notes-spring-hateoas/src/main/java/com/example/notes/RestNotesSpringHateoas.java index 0b7d1d5e..c51ecee0 100644 --- a/rest-notes-spring-data-rest/src/main/java/com/example/notes/Application.java +++ b/rest-notes-spring-hateoas/src/main/java/com/example/notes/RestNotesSpringHateoas.java @@ -24,10 +24,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @EnableAutoConfiguration @ComponentScan @EnableJpaRepositories -public class Application { +public class RestNotesSpringHateoas { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(RestNotesSpringHateoas.class, args); } }