diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/HelloWorldService.java index baea40d432f..e7ba565979d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator.log4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleActuatorApplication.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorApplication.java rename to spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleActuatorApplication.java index c7e73fff1c3..510ff7307cb 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleActuatorApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator.log4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleController.java b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleController.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleController.java rename to spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleController.java index 65494c6db0e..5e9c0a96206 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.log4j; +package sample.actuator.log4j; import java.util.Collections; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/ServiceProperties.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/ServiceProperties.java index 5b111e166ec..4a8dcee1e4d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/ServiceProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator.log4j; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java index 96947cc7225..27a1b680c49 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.log4j; +package sample.actuator.log4j; import java.io.IOException; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java index baea40d432f..e383208ce06 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplication.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/SampleActuatorNoWebApplication.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplication.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/SampleActuatorNoWebApplication.java index eee9972708e..79903b28f97 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/SampleActuatorNoWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java index 5b111e166ec..d2de3465e28 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java index 8711f8a4563..15107b99fb2 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import static org.junit.Assert.assertNotNull; diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplication.java rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java index 927a2ba5228..08ee15404ac 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.ui; +package sample.actuator.ui; import java.util.Date; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index bf310ced5e9..46b88bab3c0 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.ui; +package sample.actuator.ui; import static org.junit.Assert.assertEquals; @@ -29,7 +29,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.actuator.ui.SampleActuatorUiApplication; +import sample.actuator.ui.SampleActuatorUiApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java index 6d731abbdca..c9581851b15 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.ui; +package sample.actuator.ui; import java.io.IOException; import java.util.Arrays; @@ -28,7 +28,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.actuator.ui.SampleActuatorUiApplication; +import sample.actuator.ui.SampleActuatorUiApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/HelloWorldService.java index e0d7f442a24..e383208ce06 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.log4j; +package sample.actuator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplication.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java index 30faf9b935c..ac8387a8412 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.log4j; +package sample.actuator; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleController.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleController.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java index 4c79ca8ca55..e68f8fcceb4 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import java.util.Collections; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/ServiceProperties.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/ServiceProperties.java index 94f6f179f61..d2de3465e28 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/ServiceProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator.log4j; +package sample.actuator; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index b4991a7fe1d..56f47078361 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java index b5019067469..4c2278a744c 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java index 561b65d3171..ba9646806ac 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import java.io.IOException; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/NoManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java index 3e11caf2c72..d7af548a8ca 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java index 28762898536..6b1ca98bb55 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,7 +36,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ShutdownSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java index 3d7f35471cc..8e004924737 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.security.SecurityProperties; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java index dc619da376b..d7c05dba510 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -31,7 +31,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java index bac04e3fce5..c3be4763e46 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.actuator; +package sample.actuator; import java.io.IOException; import java.util.Map; @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.actuator.SampleActuatorApplication; +import sample.actuator.SampleActuatorApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/SampleAmqpSimpleApplication.java b/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/SampleAmqpSimpleApplication.java rename to spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java index 6213cb27803..a11777ef0d9 100644 --- a/spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/SampleAmqpSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.amqp; +package sample.amqp; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.amqp.rabbit.connection.ConnectionFactory; diff --git a/spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/Sender.java b/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/Sender.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/Sender.java rename to spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/Sender.java index e91cbc3471f..4d8f0e19806 100644 --- a/spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/Sender.java +++ b/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/Sender.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.amqp; +package sample.amqp; import javax.annotation.PostConstruct; diff --git a/spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/SampleAopApplication.java b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/SampleAopApplication.java rename to spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java index 54a89188a77..011497b8166 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/SampleAopApplication.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.sample.aop; +package sample.aop; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.sample.aop.service.HelloWorldService; +import sample.aop.service.HelloWorldService; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/monitor/ServiceMonitor.java b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/monitor/ServiceMonitor.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/monitor/ServiceMonitor.java rename to spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/monitor/ServiceMonitor.java index 11e1ee5c06c..3f90659aaed 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/monitor/ServiceMonitor.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/monitor/ServiceMonitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.aop.monitor; +package sample.aop.monitor; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/service/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/service/HelloWorldService.java index ec3beaeb5dd..d88594c8d6f 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.aop.service; +package sample.aop.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-aop/src/test/java/org/springframework/boot/sample/aop/SampleAopApplicationTests.java b/spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-aop/src/test/java/org/springframework/boot/sample/aop/SampleAopApplicationTests.java rename to spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java index 4c56bcdea98..4204125c7f8 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/test/java/org/springframework/boot/sample/aop/SampleAopApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.sample.aop; +package sample.aop; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.springframework.boot.OutputCapture; -import org.springframework.boot.sample.aop.SampleAopApplication; +import sample.aop.SampleAopApplication; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java b/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java rename to spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java index 55296c92aaa..d83e508159e 100644 --- a/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java +++ b/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.batch; +package sample.batch; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; diff --git a/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java b/spring-boot-samples/spring-boot-sample-batch/src/test/java/sample/batch/SampleBatchApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java rename to spring-boot-samples/spring-boot-sample-batch/src/test/java/sample/batch/SampleBatchApplicationTests.java index 5e7c08a6c5b..5d87949eabc 100644 --- a/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-batch/src/test/java/sample/batch/SampleBatchApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.batch; +package sample.batch; import org.junit.Rule; import org.junit.Test; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java index 4b4f8b3bff3..da643050cb1 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa; +package sample.data.jpa; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/City.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/City.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/City.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/City.java index ecec6f829bf..55ebea85823 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/City.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; import java.io.Serializable; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Hotel.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Hotel.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Hotel.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Hotel.java index 7e37908133b..f3cb6ab8bb5 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Hotel.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Hotel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; import java.io.Serializable; import java.util.Set; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/HotelSummary.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/HotelSummary.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/HotelSummary.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/HotelSummary.java index b16182dea7f..3af7204e716 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/HotelSummary.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/HotelSummary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Rating.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Rating.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Rating.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Rating.java index aca7b05de34..dfbb6c56013 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Rating.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Rating.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; public enum Rating { TERRIBLE, POOR, AVERAGE, GOOD, EXCELLENT, diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/RatingCount.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/RatingCount.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/RatingCount.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/RatingCount.java index f8476fb08f7..5b1471eb222 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/RatingCount.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/RatingCount.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; import java.io.Serializable; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Review.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Review.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Review.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Review.java index 20ccd2f171f..6e280242738 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Review.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/Review.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; import java.io.Serializable; import java.util.Date; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/ReviewDetails.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/ReviewDetails.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/ReviewDetails.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/ReviewDetails.java index e9275be21fd..c19c9cf5f6b 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/ReviewDetails.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/ReviewDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; import java.io.Serializable; import java.util.Date; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/TripType.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/TripType.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/TripType.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/TripType.java index 9404ad8effd..ca1cb6992f6 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/TripType.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/TripType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.domain; +package sample.data.jpa.domain; public enum TripType { BUSINESS, COUPLES, FAMILY, FRIENDS, SOLO diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java similarity index 89% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java index 1215913794c..a376f63e50d 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; -import org.springframework.boot.sample.data.jpa.domain.City; +import sample.data.jpa.domain.City; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CitySearchCriteria.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CitySearchCriteria.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CitySearchCriteria.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CitySearchCriteria.java index 9966704574e..cd74f536cd9 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CitySearchCriteria.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CitySearchCriteria.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; import java.io.Serializable; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityService.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java similarity index 83% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityService.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java index 1ad412218ba..9a052cddd22 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityService.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; -import org.springframework.boot.sample.data.jpa.domain.City; -import org.springframework.boot.sample.data.jpa.domain.HotelSummary; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.HotelSummary; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityServiceImpl.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java index 46a64d92fc3..fd4470efc96 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.data.jpa.domain.City; -import org.springframework.boot.sample.data.jpa.domain.HotelSummary; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.HotelSummary; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelRepository.java similarity index 69% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelRepository.java index 1ddd4f9ec92..847e483c848 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelRepository.java @@ -14,28 +14,29 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; import java.util.List; -import org.springframework.boot.sample.data.jpa.domain.City; -import org.springframework.boot.sample.data.jpa.domain.Hotel; -import org.springframework.boot.sample.data.jpa.domain.HotelSummary; -import org.springframework.boot.sample.data.jpa.domain.RatingCount; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.Repository; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.Hotel; +import sample.data.jpa.domain.HotelSummary; +import sample.data.jpa.domain.RatingCount; + interface HotelRepository extends Repository { Hotel findByCityAndName(City city, String name); - @Query("select new org.springframework.boot.sample.data.jpa.domain.HotelSummary(h.city, h.name, avg(r.rating)) " + @Query("select new sample.data.jpa.domain.HotelSummary(h.city, h.name, avg(r.rating)) " + "from Hotel h left outer join h.reviews r where h.city = ?1 group by h") Page findByCity(City city, Pageable pageable); - @Query("select new org.springframework.boot.sample.data.jpa.domain.RatingCount(r.rating, count(r)) " + @Query("select new sample.data.jpa.domain.RatingCount(r.rating, count(r)) " + "from Review r where r.hotel = ?1 group by r.rating order by r.rating DESC") List findRatingCounts(Hotel hotel); } diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelService.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java similarity index 76% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelService.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java index abd11c6afdf..d3a9f7dddaa 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelService.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; -import org.springframework.boot.sample.data.jpa.domain.City; -import org.springframework.boot.sample.data.jpa.domain.Hotel; -import org.springframework.boot.sample.data.jpa.domain.Review; -import org.springframework.boot.sample.data.jpa.domain.ReviewDetails; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.Hotel; +import sample.data.jpa.domain.Review; +import sample.data.jpa.domain.ReviewDetails; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java similarity index 86% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelServiceImpl.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java index fcb2f937586..0a8f2f13368 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.data.jpa.domain.City; -import org.springframework.boot.sample.data.jpa.domain.Hotel; -import org.springframework.boot.sample.data.jpa.domain.Rating; -import org.springframework.boot.sample.data.jpa.domain.RatingCount; -import org.springframework.boot.sample.data.jpa.domain.Review; -import org.springframework.boot.sample.data.jpa.domain.ReviewDetails; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.Hotel; +import sample.data.jpa.domain.Rating; +import sample.data.jpa.domain.RatingCount; +import sample.data.jpa.domain.Review; +import sample.data.jpa.domain.ReviewDetails; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java similarity index 84% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java index 52d441c9c32..cebfa4e21c6 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; -import org.springframework.boot.sample.data.jpa.domain.Hotel; -import org.springframework.boot.sample.data.jpa.domain.Review; +import sample.data.jpa.domain.Hotel; +import sample.data.jpa.domain.Review; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewsSummary.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewsSummary.java similarity index 85% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewsSummary.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewsSummary.java index 80df2b5ea7d..4300aa1b39c 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewsSummary.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewsSummary.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; -import org.springframework.boot.sample.data.jpa.domain.Rating; +import sample.data.jpa.domain.Rating; public interface ReviewsSummary { diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/web/SampleController.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java similarity index 90% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java index 7c8bfd0d3c5..645a79368ec 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.web; +package sample.data.jpa.web; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.data.jpa.service.CityService; +import sample.data.jpa.service.CityService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java index ce176c4054c..697dfc9ed17 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.data.jpa; +package sample.data.jpa; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java similarity index 89% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/CityRepositoryIntegrationTests.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java index d8bb3538ac4..d4fe48051f2 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/CityRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; @@ -22,8 +22,8 @@ import static org.junit.Assert.assertThat; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.data.jpa.SampleDataJpaApplication; -import org.springframework.boot.sample.data.jpa.domain.City; +import sample.data.jpa.SampleDataJpaApplication; +import sample.data.jpa.domain.City; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/HotelRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java similarity index 83% rename from spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/HotelRepositoryIntegrationTests.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java index 7c6435c3999..acf7be89712 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/HotelRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.boot.sample.data.jpa.service; +package sample.data.jpa.service; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; @@ -25,12 +25,12 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.data.jpa.SampleDataJpaApplication; -import org.springframework.boot.sample.data.jpa.domain.City; -import org.springframework.boot.sample.data.jpa.domain.Hotel; -import org.springframework.boot.sample.data.jpa.domain.HotelSummary; -import org.springframework.boot.sample.data.jpa.domain.Rating; -import org.springframework.boot.sample.data.jpa.domain.RatingCount; +import sample.data.jpa.SampleDataJpaApplication; +import sample.data.jpa.domain.City; +import sample.data.jpa.domain.Hotel; +import sample.data.jpa.domain.HotelSummary; +import sample.data.jpa.domain.Rating; +import sample.data.jpa.domain.RatingCount; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/Customer.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/Customer.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/Customer.java rename to spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/Customer.java index a99bed6d409..09ba965ee2b 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/Customer.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/Customer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.mongo; +package sample.data.mongo; import org.springframework.data.annotation.Id; diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/CustomerRepository.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/CustomerRepository.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/CustomerRepository.java rename to spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/CustomerRepository.java index 90b44f0161c..86602eef982 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/CustomerRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/CustomerRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.mongo; +package sample.data.mongo; import java.util.List; diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/SampleMongoApplication.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/SampleMongoApplication.java rename to spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java index ff675772311..eaae22f90da 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/SampleMongoApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.mongo; +package sample.data.mongo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java rename to spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java index 4ae9c384cbf..990a6d046ae 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.mongo; +package sample.data.mongo; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/org/springframework/boot/sample/data/redis/SampleRedisApplication.java b/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-data-redis/src/main/java/org/springframework/boot/sample/data/redis/SampleRedisApplication.java rename to spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java index 8e757e68c90..f8daf3e5a5a 100644 --- a/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/org/springframework/boot/sample/data/redis/SampleRedisApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.redis; +package sample.data.redis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; diff --git a/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/org/springframework/boot/sample/data/redis/SampleRedisApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-data-redis/src/test/java/org/springframework/boot/sample/data/redis/SampleRedisApplicationTests.java rename to spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java index b72aa170d7e..cd9f8c0b24c 100644 --- a/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/org/springframework/boot/sample/data/redis/SampleRedisApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.data.redis; +package sample.data.redis; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.springframework.boot.OutputCapture; -import org.springframework.boot.sample.data.redis.SampleRedisApplication; +import sample.data.redis.SampleRedisApplication; import org.springframework.core.NestedCheckedException; /** diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/HelloWorldService.java index a9584eeeba0..f904d07dab0 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.integration; +package sample.integration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleEndpoint.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleEndpoint.java index 14217e01165..852d9797b6f 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.integration; +package sample.integration; import java.io.File; import java.io.FileInputStream; diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleIntegrationApplication.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleIntegrationApplication.java index e7e6eade7ad..f995ca63c59 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleIntegrationApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.integration; +package sample.integration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/ServiceProperties.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/ServiceProperties.java index 1f1eb735574..90674b60fe2 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/ServiceProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.integration; +package sample.integration; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java rename to spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java index d03a4f80f5e..03bb50e32db 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.integration.consumer; +package sample.integration.consumer; import java.util.concurrent.Callable; import java.util.concurrent.Executors; @@ -25,8 +25,8 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.integration.SampleIntegrationApplication; -import org.springframework.boot.sample.integration.producer.ProducerApplication; +import sample.integration.SampleIntegrationApplication; +import sample.integration.producer.ProducerApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; diff --git a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java rename to spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java index 997bfee2d73..2907b73acff 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.integration.producer; +package sample.integration.producer; import java.io.File; import java.io.FileOutputStream; diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/SampleJettyApplication.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java rename to spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/SampleJettyApplication.java index 95e4bac84bb..2f7aee959e5 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/SampleJettyApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.jetty; +package sample.jetty; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/service/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/service/HelloWorldService.java index 3fc6049343f..3fe540e33e5 100644 --- a/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.xml.service; +package sample.jetty.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java similarity index 89% rename from spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java index aac4c49e17e..1de6e6d71c7 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.sample.jetty.web; +package sample.jetty.web; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.jetty.service.HelloWorldService; +import sample.jetty.service.HelloWorldService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java rename to spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java index c8be5c5c4dd..25488812605 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.jetty; +package sample.jetty; import java.io.IOException; import java.util.concurrent.Callable; diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java index efc09dd4d1c..100462ebe22 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.sample.profile; +package sample.profile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.sample.profile.service.MessageService; +import sample.profile.service.MessageService; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GenericService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GenericService.java index 83dbced34f2..215fe3cf497 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GenericService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.profile.service; +package sample.profile.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GoodbyeWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GoodbyeWorldService.java index 1a28e894440..013349675d1 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GoodbyeWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.profile.service; +package sample.profile.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/HelloWorldService.java index 371b2927876..c3c6609cdfc 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.profile.service; +package sample.profile.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/MessageService.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/MessageService.java index 5c53c583296..d322b7a50e1 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/MessageService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.profile.service; +package sample.profile.service; /** * @author Dave Syer diff --git a/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java b/spring-boot-samples/spring-boot-sample-profile/src/test/java/sample/profile/SampleProfileApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java rename to spring-boot-samples/spring-boot-sample-profile/src/test/java/sample/profile/SampleProfileApplicationTests.java index bd666bbe663..09657c72dda 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/test/java/sample/profile/SampleProfileApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.profile; +package sample.profile; import org.junit.After; import org.junit.Before; diff --git a/spring-boot-samples/spring-boot-sample-secure/src/main/java/org/springframework/boot/sample/ops/ui/SampleSecureApplication.java b/spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/ops/ui/SampleSecureApplication.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-secure/src/main/java/org/springframework/boot/sample/ops/ui/SampleSecureApplication.java rename to spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/ops/ui/SampleSecureApplication.java index 672bc5baf1f..69d5103da98 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/main/java/org/springframework/boot/sample/ops/ui/SampleSecureApplication.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/ops/ui/SampleSecureApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.ops.ui; +package sample.ops.ui; import java.util.Date; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-secure/src/test/java/org/springframework/boot/sample/ops/ui/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-secure/src/test/java/org/springframework/boot/sample/ops/ui/SampleSecureApplicationTests.java rename to spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java index fb2e1ca84b1..c73f7bced86 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/test/java/org/springframework/boot/sample/ops/ui/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.ops.ui; +package sample.ops.ui; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/main/java/org/springframework/boot/sample/servlet/SampleServletApplication.java b/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-servlet/src/main/java/org/springframework/boot/sample/servlet/SampleServletApplication.java rename to spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java index 770e6c455d1..7f9f8467951 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/src/main/java/org/springframework/boot/sample/servlet/SampleServletApplication.java +++ b/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.servlet; +package sample.servlet; import java.io.IOException; diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/test/java/org/springframework/boot/sample/servlet/SampleServletApplicationTests.java b/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-servlet/src/test/java/org/springframework/boot/sample/servlet/SampleServletApplicationTests.java rename to spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java index 70a9cc58ea6..4e178a76636 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/src/test/java/org/springframework/boot/sample/servlet/SampleServletApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.servlet; +package sample.servlet; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java deleted file mode 100644 index d3edbe180b6..00000000000 --- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.sample.simple.service; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -@Component -public class HelloWorldService { - - @Value("${name:World}") - private String name; - - public String getHelloMessage() { - return "Hello " + this.name; - } - -} diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java rename to spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java index 743c57ec71b..a58c845748a 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.sample.simple; +package sample.simple; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.sample.simple.service.HelloWorldService; +import sample.simple.service.HelloWorldService; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/service/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/service/HelloWorldService.java index 1ace3897811..751a5cff474 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.jetty.service; +package sample.simple.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java rename to spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java index 3c1ccf9cd72..93226709ec5 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.simple; +package sample.simple; import org.junit.After; import org.junit.Before; diff --git a/spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SpringTestSampleSimpleApplicationTests.java b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SpringTestSampleSimpleApplicationTests.java rename to spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java index 2d4c8db807f..708ad709573 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SpringTestSampleSimpleApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.simple; +package sample.simple; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/SampleTomcatApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/SampleTomcatApplication.java index 6bfed61b7d8..e5aea4b4041 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/SampleTomcatApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.tomcat; +package sample.tomcat; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/service/HelloWorldService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/service/HelloWorldService.java index 0f5e2515e15..780965c269d 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.tomcat.service; +package sample.tomcat.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java similarity index 89% rename from spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java index 45e422bc592..ca42ed4fdd1 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.sample.tomcat.web; +package sample.tomcat.web; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.tomcat.service.HelloWorldService; +import sample.tomcat.service.HelloWorldService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index c173c4277cd..dfcd78ddbf7 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.tomcat; +package sample.tomcat; import java.io.IOException; import java.util.concurrent.Callable; @@ -31,8 +31,8 @@ import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfigura import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.boot.sample.tomcat.service.HelloWorldService; -import org.springframework.boot.sample.tomcat.web.SampleController; +import sample.tomcat.service.HelloWorldService; +import sample.tomcat.web.SampleController; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java index d2f2ba8e8bb..21ce0198e0d 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.tomcat; +package sample.tomcat; import java.io.IOException; import java.util.concurrent.Callable; diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/SampleTraditionalApplication.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java rename to spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/SampleTraditionalApplication.java index d287dd195f8..cb7928cc74f 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/SampleTraditionalApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.traditional; +package sample.traditional; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java rename to spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java index e9b65214049..5535d7fa249 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.traditional.config; +package sample.traditional.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java rename to spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java index 032ae711439..40a02b75495 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.traditional; +package sample.traditional; import java.io.IOException; import java.util.concurrent.Callable; diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/SampleWebJspApplication.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java rename to spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/SampleWebJspApplication.java index 2aec7889e48..9a5d48e2903 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/SampleWebJspApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.jsp; +package sample.jsp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/WelcomeController.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java rename to spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/WelcomeController.java index 88c1ea1bda3..98eadcc8f80 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/WelcomeController.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.jsp; +package sample.jsp; import java.util.Date; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/org/springframework/boot/sample/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/org/springframework/boot/sample/jsp/SampleWebJspApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java index a50aef25d1e..5a7fa7e0b96 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/org/springframework/boot/sample/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.jsp; +package sample.jsp; import java.io.IOException; import java.util.concurrent.Callable; diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/main/java/org/springframework/boot/sample/ui/SampleWebStaticApplication.java b/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-web-static/src/main/java/org/springframework/boot/sample/ui/SampleWebStaticApplication.java rename to spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java index 9d2fc9df697..321e37251f3 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/main/java/org/springframework/boot/sample/ui/SampleWebStaticApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.ui; +package sample.ui; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java index c9c0242d746..9976b47ab83 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.ui; +package sample.ui; import java.io.IOException; import java.util.concurrent.Callable; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRespository.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRespository.java index c73aaf42853..074a9611672 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRespository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.ui; +package sample.ui; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/Message.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/Message.java index aab8cd49204..c3f4b1c60ff 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/Message.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.boot.sample.ui; +package sample.ui; import java.util.Calendar; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/MessageRepository.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/MessageRepository.java index 6e687569ce7..6bfd8199374 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/MessageRepository.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.boot.sample.ui; +package sample.ui; /** * @author Rob Winch diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/SampleWebUiApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/SampleWebUiApplication.java index 0238e1314fc..0dedf1c39fd 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/SampleWebUiApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.ui; +package sample.ui; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java index 672f5799221..0acbd2d91d0 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java @@ -11,13 +11,13 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.boot.sample.ui.mvc; +package sample.ui.mvc; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.sample.ui.Message; -import org.springframework.boot.sample.ui.MessageRepository; +import sample.ui.Message; +import sample.ui.MessageRepository; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTests.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java index 369380e49c1..0c537c80475 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.ui; +package sample.ui; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java index f0078900920..23437081674 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.boot.sample.ui; +package sample.ui; import java.io.IOException; import java.net.URI; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/GreetingService.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/GreetingService.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/GreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/GreetingService.java index e6b9f2982f3..25def4978f7 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/GreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/GreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.client; +package samples.websocket.client; public interface GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java index 2f0fdc7782f..6764c989778 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.client; +package samples.websocket.client; import java.util.concurrent.CountDownLatch; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleGreetingService.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleGreetingService.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleGreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleGreetingService.java index 2943f5c8580..94557e68491 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleGreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleGreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.client; +package samples.websocket.client; public class SimpleGreetingService implements GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java similarity index 79% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java index 34044c406cc..d346fcfa61b 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.config; +package samples.websocket.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.samples.websocket.client.GreetingService; -import org.springframework.boot.samples.websocket.client.SimpleGreetingService; -import org.springframework.boot.samples.websocket.echo.DefaultEchoService; -import org.springframework.boot.samples.websocket.echo.EchoService; -import org.springframework.boot.samples.websocket.echo.EchoWebSocketHandler; -import org.springframework.boot.samples.websocket.snake.SnakeWebSocketHandler; +import samples.websocket.client.GreetingService; +import samples.websocket.client.SimpleGreetingService; +import samples.websocket.echo.DefaultEchoService; +import samples.websocket.echo.EchoService; +import samples.websocket.echo.EchoWebSocketHandler; +import samples.websocket.snake.SnakeWebSocketHandler; import org.springframework.boot.web.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/DefaultEchoService.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/DefaultEchoService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/DefaultEchoService.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/DefaultEchoService.java index 9691d5b3454..37b91673edd 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/DefaultEchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/DefaultEchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.echo; +package samples.websocket.echo; public class DefaultEchoService implements EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoService.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoService.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoService.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoService.java index 36faaa55f83..db19c8d9947 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.echo; +package samples.websocket.echo; public interface EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java index d610b59ba35..82b338f1565 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.echo; +package samples.websocket.echo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Direction.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Direction.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Direction.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Direction.java index 286d9d768a1..b5295270e26 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Direction.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Direction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; public enum Direction { NONE, NORTH, SOUTH, EAST, WEST diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Location.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Location.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java index 06dbf8ba303..be6cfc1f8c2 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Location.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; public class Location { diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Snake.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Snake.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Snake.java index 05918ba3403..1bba0047323 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Snake.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Snake.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; import java.util.ArrayDeque; import java.util.Collection; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeTimer.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeTimer.java index 8d4c2854a98..0533b6eac2e 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeTimer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; import java.util.Collection; import java.util.Collections; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeUtils.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeUtils.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeUtils.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeUtils.java index 514c195c789..b114992ce89 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeUtils.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; import java.awt.Color; import java.util.Random; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java index 022eaff380d..a278eb09bee 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; import java.awt.Color; import java.util.Iterator; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java similarity index 90% rename from spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java index 16d8ec6bd35..96f58cdd648 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.echo; +package samples.websocket.echo; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -29,10 +29,10 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; -import org.springframework.boot.samples.websocket.client.GreetingService; -import org.springframework.boot.samples.websocket.client.SimpleClientWebSocketHandler; -import org.springframework.boot.samples.websocket.client.SimpleGreetingService; -import org.springframework.boot.samples.websocket.config.SampleWebSocketsApplication; +import samples.websocket.client.GreetingService; +import samples.websocket.client.SimpleClientWebSocketHandler; +import samples.websocket.client.SimpleGreetingService; +import samples.websocket.config.SampleWebSocketsApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/snake/SnakeTimerTests.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/snake/SnakeTimerTests.java rename to spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/snake/SnakeTimerTests.java index 0911b8bad0b..ac3cd7bc870 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/snake/SnakeTimerTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/snake/SnakeTimerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.samples.websocket.snake; +package samples.websocket.snake; import java.io.IOException; diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java similarity index 91% rename from spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java rename to spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java index 6f2f5ec246e..15521707b12 100644 --- a/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.sample.xml; +package sample.xml; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.xml.service.HelloWorldService; +import sample.xml.service.HelloWorldService; public class SampleSpringXmlApplication implements CommandLineRunner { diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/service/HelloWorldService.java new file mode 100644 index 00000000000..c3a980ef831 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/service/HelloWorldService.java @@ -0,0 +1,32 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sample.xml.service; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class HelloWorldService { + + @Value("${name:World}") + private String name; + + public String getHelloMessage() { + return "Hello " + this.name; + } + +} diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml b/spring-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml index 8b3ebbe4df9..dcc6e4b20bb 100644 --- a/spring-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml @@ -8,7 +8,7 @@ - - + + diff --git a/spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java b/spring-boot-samples/spring-boot-sample-xml/src/test/java/sample/xml/SampleSpringXmlApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java rename to spring-boot-samples/spring-boot-sample-xml/src/test/java/sample/xml/SampleSpringXmlApplicationTests.java index 637a417b8b6..aa695077182 100644 --- a/spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/test/java/sample/xml/SampleSpringXmlApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.sample.xml; +package sample.xml; import org.junit.Rule; import org.junit.Test;