diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/HelloWorldService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/HelloWorldService.java index e383208ce06..da61152bd2a 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.actuator; +package sample.actuator.noweb; 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/sample/actuator/SampleActuatorNoWebApplication.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/SampleActuatorNoWebApplication.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/SampleActuatorNoWebApplication.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/SampleActuatorNoWebApplication.java index edfdff8ed74..2964b9fdafc 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/SampleActuatorNoWebApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/SampleActuatorNoWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.actuator; +package sample.actuator.noweb; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/ServiceProperties.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/ServiceProperties.java index 44a0f581ebf..6db444cd6c5 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/noweb/ServiceProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.actuator; +package sample.actuator.noweb; 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/sample/actuator/SampleActuatorNoWebApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java index 7bff974be26..76fc14ecebc 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.actuator; +package sample.actuator.noweb; import org.junit.Test; import org.junit.runner.RunWith; @@ -24,6 +24,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import sample.actuator.noweb.SampleActuatorNoWebApplication; import static org.junit.Assert.assertNotNull; /** diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java index 08ee15404ac..b367b77c1bb 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java @@ -45,10 +45,6 @@ public class SampleActuatorUiApplication { throw new RuntimeException("Expected exception in controller"); } - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleActuatorUiApplication.class, args); - } - @Bean public SecurityProperties securityProperties() { SecurityProperties security = new SecurityProperties(); @@ -56,4 +52,8 @@ public class SampleActuatorUiApplication { return security; } + public static void main(String[] args) throws Exception { + SpringApplication.run(SampleActuatorUiApplication.class, args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java index 9623ad4f073..58cd520e514 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java @@ -24,13 +24,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class SampleActuatorApplication implements HealthIndicator { - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleActuatorApplication.class, args); - } - @Override public Health health() { return Health.up().withDetail("hello", "world").build(); } + public static void main(String[] args) throws Exception { + SpringApplication.run(SampleActuatorApplication.class, args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java index 0204645008c..28284b2be34 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java @@ -72,6 +72,7 @@ public class SampleController { public void setValue(String value) { this.value = value; } + } } diff --git a/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java b/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java index ebd8432fcae..13551031c29 100644 --- a/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java @@ -64,4 +64,5 @@ public class SampleAmqpSimpleApplication { public static void main(String[] args) throws Exception { SpringApplication.run(SampleAmqpSimpleApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java index d4678c0338e..f46e1ce7e4e 100644 --- a/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java +++ b/spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java @@ -39,4 +39,5 @@ public class SampleAopApplication implements CommandLineRunner { public static void main(String[] args) throws Exception { SpringApplication.run(SampleAopApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/ChatService.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/ChatService.java rename to spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java index 7a6ad57ac5f..cccf7b774e8 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/ChatService.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.atmosphere; import java.io.IOException; diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/Message.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/Message.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/Message.java rename to spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/Message.java index 9442b9543b6..5b78b025369 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/Message.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.atmosphere; import java.util.Date; @@ -49,4 +49,5 @@ public class Message { public void setTime(long time) { this.time = time; } + } diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java similarity index 99% rename from spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java rename to spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java index 752687be271..c8dd14a3a7a 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.atmosphere; import java.util.Collections; @@ -80,4 +80,5 @@ public class SampleAtmosphereApplication { public static void main(String[] args) throws Exception { SpringApplication.run(SampleAtmosphereApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/SampleAtmosphereApplicationTests.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/SampleAtmosphereApplicationTests.java rename to spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java index e4afd6665ac..2bcaf2b4bdd 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/SampleAtmosphereApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.atmosphere; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -41,6 +41,7 @@ import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; import org.springframework.web.socket.handler.TextWebSocketHandler; +import sample.atmosphere.SampleAtmosphereApplication; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java b/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java index ca0394a5bed..5b45d6b4e04 100644 --- a/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java +++ b/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java @@ -67,4 +67,5 @@ public class SampleBatchApplication { System.exit(SpringApplication.exit(SpringApplication.run( SampleBatchApplication.class, args))); } + } diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/CacheManagerCheck.java b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/CacheManagerCheck.java similarity index 87% rename from spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/CacheManagerCheck.java rename to spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/CacheManagerCheck.java index e6bdeb789bd..bd114389490 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/CacheManagerCheck.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/CacheManagerCheck.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package sample; +package sample.cache; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.cache.CacheManager; @@ -24,6 +26,9 @@ import org.springframework.stereotype.Component; @Component public class CacheManagerCheck implements CommandLineRunner { + private static final Logger logger = LoggerFactory + .getLogger(SampleCacheApplication.class); + private final CacheManager cacheManager; @Autowired @@ -33,7 +38,7 @@ public class CacheManagerCheck implements CommandLineRunner { @Override public void run(String... strings) throws Exception { - SampleCacheApplication.logger.info("\n\n" + logger.info("\n\n" + "=========================================================\n" + "Using cache manager: " + this.cacheManager.getClass().getName() + "\n" + "=========================================================\n\n"); diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/Country.java b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/Country.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/Country.java rename to spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/Country.java index 24b2e2aec0a..4ce9660f297 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/Country.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/Country.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.cache; import java.io.Serializable; diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/CountryRepository.java b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/CountryRepository.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/CountryRepository.java rename to spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/CountryRepository.java index 71e561c4f84..d3e2e1cbf5f 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/CountryRepository.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/CountryRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.cache; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/SampleCacheApplication.java b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleCacheApplication.java similarity index 87% rename from spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/SampleCacheApplication.java rename to spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleCacheApplication.java index 9165bd45393..007be4d05c2 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/SampleCacheApplication.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleCacheApplication.java @@ -14,10 +14,8 @@ * limitations under the License. */ -package sample; +package sample.cache; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cache.annotation.EnableCaching; @@ -28,8 +26,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication public class SampleCacheApplication { - static final Logger logger = LoggerFactory.getLogger(SampleCacheApplication.class); - public static void main(String[] args) { new SpringApplicationBuilder().sources(SampleCacheApplication.class) .profiles("app").run(args); diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/SampleClient.java b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleClient.java similarity index 99% rename from spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/SampleClient.java rename to spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleClient.java index 47334eefde5..fd38e48573e 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/SampleClient.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.cache; import java.util.Arrays; import java.util.List; diff --git a/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/SampleCacheApplicationTests.java b/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/SampleCacheApplicationTests.java rename to spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java index 4b41c8e7fe8..ea7e990e810 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/SampleCacheApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.cache; import org.junit.Test; import org.junit.runner.RunWith; @@ -24,6 +24,9 @@ import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import sample.cache.Country; +import sample.cache.CountryRepository; +import sample.cache.SampleCacheApplication; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/SampleElasticsearchApplication.java b/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/SampleElasticsearchApplication.java index 002e9df81c4..b8cd318f5c0 100644 --- a/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/SampleElasticsearchApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/SampleElasticsearchApplication.java @@ -64,4 +64,5 @@ public class SampleElasticsearchApplication implements CommandLineRunner { public static void main(String[] args) throws Exception { SpringApplication.run(SampleElasticsearchApplication.class, "--debug").close(); } + } diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java index f27de6d43fd..10e8f18a70e 100644 --- a/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/service/GemstoneServiceImpl.java @@ -164,6 +164,7 @@ public class GemstoneServiceImpl implements GemstoneService { public IllegalGemstoneException(final String message, final Throwable cause) { super(message, cause); } + } } diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java index e99dde17db2..2db13bc8de1 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java @@ -29,7 +29,6 @@ public class SampleMongoApplication implements CommandLineRunner { @Override public void run(String... args) throws Exception { - this.repository.deleteAll(); // save a couple of customers @@ -54,10 +53,10 @@ public class SampleMongoApplication implements CommandLineRunner { for (Customer customer : this.repository.findByLastName("Smith")) { System.out.println(customer); } - } public static void main(String[] args) throws Exception { SpringApplication.run(SampleMongoApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java index a548beeecce..d7d85337a1c 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java @@ -23,7 +23,6 @@ import org.junit.Test; import org.springframework.boot.test.OutputCapture; import org.springframework.core.NestedCheckedException; -import com.mongodb.MongoServerSelectionException; import com.mongodb.MongoTimeoutException; import static org.junit.Assert.assertTrue; @@ -61,8 +60,7 @@ public class SampleMongoApplicationTests { NestedCheckedException nested = new NestedCheckedException("failed", ex) { }; Throwable root = nested.getRootCause(); - if (root instanceof MongoServerSelectionException - || root instanceof MongoTimeoutException) { + if (root instanceof MongoTimeoutException) { if (root.getMessage().contains("Unable to connect to any server")) { return true; } diff --git a/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java b/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java index cf8d7b51641..4cdb6473318 100644 --- a/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java @@ -43,4 +43,5 @@ public class SampleRedisApplication implements CommandLineRunner { // Close the context so it doesn't stay awake listening for redis SpringApplication.run(SampleRedisApplication.class, args).close(); } + } diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/SampleDataRestApplication.java b/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/SampleDataRestApplication.java deleted file mode 100644 index 9cd28fa3537..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/SampleDataRestApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class SampleDataRestApplication { - - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleDataRestApplication.class, args); - } - -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/domain/City.java b/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/domain/City.java deleted file mode 100644 index f1a57deda1c..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/domain/City.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa.domain; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -public class City implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - private Long id; - - @Column(nullable = false) - private String name; - - @Column(nullable = false) - private String state; - - @Column(nullable = false) - private String country; - - @Column(nullable = false) - private String map; - - protected City() { - } - - public City(String name, String country) { - super(); - this.name = name; - this.country = country; - } - - public String getName() { - return this.name; - } - - public String getState() { - return this.state; - } - - public String getCountry() { - return this.country; - } - - public String getMap() { - return this.map; - } - - @Override - public String toString() { - return getName() + "," + getState() + "," + getCountry(); - } -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/domain/Hotel.java b/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/domain/Hotel.java deleted file mode 100644 index 920142b0e46..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/domain/Hotel.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa.domain; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -import org.hibernate.annotations.NaturalId; - -@Entity -public class Hotel implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - private Long id; - - @ManyToOne(optional = false) - @NaturalId - private City city; - - @Column(nullable = false) - @NaturalId - private String name; - - @Column(nullable = false) - private String address; - - @Column(nullable = false) - private String zip; - - protected Hotel() { - } - - public Hotel(City city, String name) { - this.city = city; - this.name = name; - } - - public City getCity() { - return this.city; - } - - public String getName() { - return this.name; - } - - public String getAddress() { - return this.address; - } - - public String getZip() { - return this.zip; - } -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/CityRepository.java b/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/CityRepository.java deleted file mode 100644 index 42819566419..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/CityRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa.service; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.PagingAndSortingRepository; -import org.springframework.data.repository.query.Param; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -import sample.data.jpa.domain.City; - -@RepositoryRestResource(collectionResourceRel = "citys", path = "cities") -interface CityRepository extends PagingAndSortingRepository { - - Page findByNameContainingAndCountryContainingAllIgnoringCase( - @Param("name") String name, @Param("country") String country, - Pageable pageable); - - City findByNameAndCountryAllIgnoringCase(@Param("name") String name, - @Param("country") String country); - -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/CitySearchCriteria.java b/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/CitySearchCriteria.java deleted file mode 100644 index 852e445c379..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/CitySearchCriteria.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa.service; - -import java.io.Serializable; - -import org.springframework.util.Assert; - -public class CitySearchCriteria implements Serializable { - - private static final long serialVersionUID = 1L; - - private String name; - - public CitySearchCriteria() { - } - - public CitySearchCriteria(String name) { - Assert.notNull(name, "Name must not be null"); - this.name = name; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/HotelRepository.java b/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/HotelRepository.java deleted file mode 100644 index 87f76df22ba..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/main/java/sample/data/jpa/service/HotelRepository.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa.service; - -import org.springframework.data.repository.PagingAndSortingRepository; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -import sample.data.jpa.domain.City; -import sample.data.jpa.domain.Hotel; - -@RepositoryRestResource(collectionResourceRel = "hotels", path = "hotels") -interface HotelRepository extends PagingAndSortingRepository { - - Hotel findByCityAndName(City city, String name); - -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/jpa/SampleDataRestApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/jpa/SampleDataRestApplicationTests.java deleted file mode 100644 index f6530f87323..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/jpa/SampleDataRestApplicationTests.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2012-2015 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.data.jpa; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Integration test to run the application. - * - * @author Oliver Gierke - * @author Andy Wilkinson - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataRestApplication.class) -@WebAppConfiguration -@ActiveProfiles("scratch") -// Separate profile for web tests to avoid clashing databases -public class SampleDataRestApplicationTests { - - @Autowired - private WebApplicationContext context; - - private MockMvc mvc; - - @Before - public void setUp() { - this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build(); - } - - @Test - public void testHome() throws Exception { - - this.mvc.perform(get("/api")).andExpect(status().isOk()) - .andExpect(content().string(containsString("hotels"))); - } - - @Test - public void findByNameAndCountry() throws Exception { - - this.mvc.perform( - get("/api/cities/search/findByNameAndCountryAllIgnoringCase?name=Melbourne&country=Australia")) - .andExpect(status().isOk()) - .andExpect(jsonPath("state", equalTo("Victoria"))) - .andExpect(jsonPath("name", equalTo("Melbourne"))); - } - - @Test - public void findByContaining() throws Exception { - - this.mvc.perform( - get("/api/cities/search/findByNameContainingAndCountryContainingAllIgnoringCase?name=&country=UK")) - .andExpect(status().isOk()) - .andExpect(jsonPath("_embedded.citys", hasSize(3))); - } -} diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java deleted file mode 100644 index 6fba01038da..00000000000 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2012-2014 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.data.jpa.service; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import sample.data.jpa.SampleDataRestApplication; -import sample.data.jpa.domain.City; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; - -/** - * Integration tests for {@link CityRepository}. - * - * @author Oliver Gierke - * @author Andy Wilkinson - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataRestApplication.class) -public class CityRepositoryIntegrationTests { - - @Autowired - CityRepository repository; - - @Test - public void findsFirstPageOfCities() { - - Page cities = this.repository.findAll(new PageRequest(0, 10)); - assertThat(cities.getTotalElements(), is(greaterThan(20L))); - } - - @Test - public void findByNameAndCountry() { - City city = this.repository.findByNameAndCountryAllIgnoringCase("Melbourne", - "Australia"); - assertThat(city, notNullValue()); - assertThat(city.getName(), is(equalTo("Melbourne"))); - } - - @Test - public void findContaining() { - Page cities = this.repository - .findByNameContainingAndCountryContainingAllIgnoringCase("", "UK", - new PageRequest(0, 10)); - assertThat(cities.getTotalElements(), is(equalTo(3L))); - } -} diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/Message.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/Message.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/Message.java rename to spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/Message.java index 023781f9a62..ea16b5c1364 100644 --- a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/Message.java +++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package demo; +package sample.devtools; public class Message { diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/MyController.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/MyController.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/MyController.java rename to spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/MyController.java index a9d0f429177..f9ccbe258a5 100644 --- a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/MyController.java +++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/MyController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package demo; +package sample.devtools; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/SampleDevToolsApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java rename to spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/SampleDevToolsApplication.java index 9a9cca90d6f..8d2c1e47005 100644 --- a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java +++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/SampleDevToolsApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package demo; +package sample.devtools; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/Person.java b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/Person.java new file mode 100644 index 00000000000..f9c90eae84a --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/Person.java @@ -0,0 +1,52 @@ +/* + * Copyright 2012-2015 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.flyway; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +public class Person { + @Id + @GeneratedValue + private Long id; + private String firstName; + private String lastName; + + public String getFirstName() { + return this.firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return this.lastName; + } + + public void setLastName(String lastname) { + this.lastName = lastname; + } + + @Override + public String toString() { + return "Person [firstName=" + this.firstName + ", lastName=" + this.lastName + + "]"; + } +} diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/PersonRepository.java b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/PersonRepository.java new file mode 100644 index 00000000000..9b585324233 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/PersonRepository.java @@ -0,0 +1,25 @@ +/* + * Copyright 2012-2015 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.flyway; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface PersonRepository extends CrudRepository { + +} diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java index 4505921b6db..46ad92d00f7 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java +++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java @@ -16,16 +16,10 @@ package sample.flyway; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; @SpringBootApplication public class SampleFlywayApplication implements CommandLineRunner { @@ -41,40 +35,5 @@ public class SampleFlywayApplication implements CommandLineRunner { public static void main(String[] args) throws Exception { SpringApplication.run(SampleFlywayApplication.class, args); } -} - -@Repository -interface PersonRepository extends CrudRepository { - -} - -@Entity -class Person { - @Id - @GeneratedValue - private Long id; - private String firstName; - private String lastName; - - public String getFirstName() { - return this.firstName; - } - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return this.lastName; - } - - public void setLastName(String lastname) { - this.lastName = lastname; - } - - @Override - public String toString() { - return "Person [firstName=" + this.firstName + ", lastName=" + this.lastName - + "]"; - } } diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/SampleHateoasApplication.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/SampleHateoasApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/SampleHateoasApplication.java rename to spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/SampleHateoasApplication.java index ff3bad1ab4c..c5cd9afe900 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/SampleHateoasApplication.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/SampleHateoasApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.hateoas; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/Customer.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/Customer.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/Customer.java rename to spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/Customer.java index d978e03a20c..5a9e9bc91e6 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/Customer.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/Customer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.domain; +package sample.hateoas.domain; public class Customer { diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/CustomerRepository.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/CustomerRepository.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/CustomerRepository.java rename to spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/CustomerRepository.java index d183b173a1e..824e9635b0f 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/CustomerRepository.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/CustomerRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.domain; +package sample.hateoas.domain; import java.util.List; diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/InMemoryCustomerRepository.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/InMemoryCustomerRepository.java rename to spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java index ee791d22498..be3a090aa63 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/domain/InMemoryCustomerRepository.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.domain; +package sample.hateoas.domain; import java.util.ArrayList; import java.util.List; diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/web/CustomerController.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/web/CustomerController.java rename to spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java index aeda87376c1..49dec201ba5 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/web/CustomerController.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.web; +package sample.hateoas.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.EntityLinks; @@ -29,8 +29,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import sample.domain.Customer; -import sample.domain.CustomerRepository; +import sample.hateoas.domain.Customer; +import sample.hateoas.domain.CustomerRepository; @Controller @RequestMapping("/customers") diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/SampleHateoasApplicationTests.java b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/SampleHateoasApplicationTests.java rename to spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java index 419209b8220..39202c9d231 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/SampleHateoasApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample; +package sample.hateoas; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +28,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.hateoas.SampleHateoasApplication; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.startsWith; diff --git a/spring-boot-samples/spring-boot-sample-hornetq/src/main/java/sample/hornetq/SampleHornetQApplication.java b/spring-boot-samples/spring-boot-sample-hornetq/src/main/java/sample/hornetq/SampleHornetQApplication.java index b3fb7a4c3fc..4e9a33c6c37 100644 --- a/spring-boot-samples/spring-boot-sample-hornetq/src/main/java/sample/hornetq/SampleHornetQApplication.java +++ b/spring-boot-samples/spring-boot-sample-hornetq/src/main/java/sample/hornetq/SampleHornetQApplication.java @@ -61,4 +61,5 @@ public class SampleHornetQApplication { public static void main(String[] args) throws Exception { SpringApplication.run(SampleHornetQApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/SampleJettySslApplication.java b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/SampleJettySslApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/SampleJettySslApplication.java rename to spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/SampleJettySslApplication.java index 8953530d686..f91f54c7fd9 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/SampleJettySslApplication.java +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/SampleJettySslApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty; +package sample.jetty.ssl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/service/HelloWorldService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/service/HelloWorldService.java index 3fe540e33e5..c6c651e157c 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty.service; +package sample.jetty.ssl.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/web/SampleController.java b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/web/SampleController.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/web/SampleController.java index 6d8062d2b5a..4026a1385c6 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/ssl/web/SampleController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package sample.jetty.web; +package sample.jetty.ssl.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import sample.jetty.service.HelloWorldService; +import sample.jetty.ssl.service.HelloWorldService; @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/SampleJettySslApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/SampleJettySslApplicationTests.java rename to spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java index a682ed4e2ce..6ade3fb4c71 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/SampleJettySslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package sample.jetty; +package sample.jetty.ssl; import org.apache.http.client.HttpClient; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.impl.client.HttpClients; +import org.apache.http.ssl.SSLContextBuilder; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/SampleJetty8SslApplication.java b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/SampleJetty8SslApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/SampleJetty8SslApplication.java rename to spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/SampleJetty8SslApplication.java index a548f27b4cc..40e016117f8 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/SampleJetty8SslApplication.java +++ b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/SampleJetty8SslApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty; +package sample.jetty8.ssl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/service/HelloWorldService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/service/HelloWorldService.java index 3fe540e33e5..eede2b9dc94 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty.service; +package sample.jetty8.ssl.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/web/SampleController.java b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/web/SampleController.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/web/SampleController.java index 6d8062d2b5a..f695c18f64f 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty8/ssl/web/SampleController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package sample.jetty.web; +package sample.jetty8.ssl.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import sample.jetty.service.HelloWorldService; +import sample.jetty8.ssl.service.HelloWorldService; @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty/SampleJetty8SslApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty/SampleJetty8SslApplicationTests.java rename to spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java index 8ac26477e09..c854900e15f 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty/SampleJetty8SslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package sample.jetty; +package sample.jetty8.ssl; import org.apache.http.client.HttpClient; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.impl.client.HttpClients; +import org.apache.http.ssl.SSLContextBuilder; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/SampleJetty8Application.java b/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/SampleJetty8Application.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/SampleJetty8Application.java rename to spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/SampleJetty8Application.java index 9316f02f972..02adb0cef96 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/SampleJetty8Application.java +++ b/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/SampleJetty8Application.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty; +package sample.jetty8; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/service/HelloWorldService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/service/HelloWorldService.java index 3fe540e33e5..88b193f4e5a 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty.service; +package sample.jetty8.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/web/SampleController.java b/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/web/SampleController.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/web/SampleController.java index 6d8062d2b5a..dda790a0c3b 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty8/web/SampleController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package sample.jetty.web; +package sample.jetty8.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import sample.jetty.service.HelloWorldService; +import sample.jetty8.service.HelloWorldService; @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty/SampleJetty8ApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty/SampleJetty8ApplicationTests.java rename to spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java index 535df112179..7923d99e8f8 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty/SampleJetty8ApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jetty; +package sample.jetty8; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +28,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.jetty8.SampleJetty8Application; import static org.junit.Assert.assertEquals; /** diff --git a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java index 7f9d63b63a6..521ba0c3590 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java +++ b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java @@ -28,10 +28,6 @@ import org.springframework.context.annotation.Bean; @SpringBootApplication public class SampleOpenTsdbExportApplication { - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleOpenTsdbExportApplication.class, args); - } - @Bean @ConfigurationProperties("metrics.export") public MetricWriter openTsdbMetricWriter() { @@ -46,4 +42,8 @@ public class SampleOpenTsdbExportApplication { return new DefaultOpenTsdbNamingStrategy(); } + public static void main(String[] args) throws Exception { + SpringApplication.run(SampleOpenTsdbExportApplication.class, args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-metrics-redis/src/main/java/sample/metrics/redis/SampleRedisExportApplication.java b/spring-boot-samples/spring-boot-sample-metrics-redis/src/main/java/sample/metrics/redis/SampleRedisExportApplication.java index b9a54ddcc96..63419246791 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-redis/src/main/java/sample/metrics/redis/SampleRedisExportApplication.java +++ b/spring-boot-samples/spring-boot-sample-metrics-redis/src/main/java/sample/metrics/redis/SampleRedisExportApplication.java @@ -34,10 +34,6 @@ public class SampleRedisExportApplication { @Autowired private MetricExportProperties export; - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleRedisExportApplication.class, args); - } - @Bean @ExportMetricWriter public RedisMetricRepository redisMetricWriter( @@ -53,4 +49,8 @@ public class SampleRedisExportApplication { return new JmxMetricWriter(exporter); } + public static void main(String[] args) throws Exception { + SpringApplication.run(SampleRedisExportApplication.class, args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java b/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java index a2e6db67081..2a15bcd831e 100644 --- a/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java +++ b/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java @@ -26,15 +26,15 @@ import org.springframework.context.annotation.ImportResource; @EnableConfigurationProperties(ServiceProperties.class) public class SampleParentContextApplication { - public static void main(String[] args) throws Exception { - new SpringApplicationBuilder(Parent.class).child( - SampleParentContextApplication.class).run(args); - } - @EnableAutoConfiguration @ImportResource("integration-context.xml") protected static class Parent { } + public static void main(String[] args) throws Exception { + new SpringApplicationBuilder(Parent.class).child( + SampleParentContextApplication.class).run(args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java index 04ab569a584..53db41abf0a 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java @@ -41,4 +41,5 @@ public class SampleProfileApplication implements CommandLineRunner { public static void main(String[] args) throws Exception { SpringApplication.run(SampleProfileApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java b/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java index 1342853c639..5040486cc7b 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java +++ b/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java @@ -48,13 +48,13 @@ public class SampleServletApplication extends SpringBootServletInitializer { }; } - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleServletApplication.class, args); - } - @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(SampleServletApplication.class); } + public static void main(String[] args) throws Exception { + SpringApplication.run(SampleServletApplication.class, args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/HelloRestController.java b/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/HelloRestController.java new file mode 100644 index 00000000000..9ff6560b9e9 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/HelloRestController.java @@ -0,0 +1,39 @@ +/* + * Copyright 2012-2015 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.session.redis; + +import java.util.UUID; + +import javax.servlet.http.HttpSession; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloRestController { + + @RequestMapping("/") + String uid(HttpSession session) { + UUID uid = (UUID) session.getAttribute("uid"); + if (uid == null) { + uid = UUID.randomUUID(); + } + session.setAttribute("uid", uid); + return uid.toString(); + } + +} diff --git a/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/SampleSessionRedisApplication.java b/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/SampleSessionRedisApplication.java index cb52020687d..a0691f7b6f4 100644 --- a/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/SampleSessionRedisApplication.java +++ b/spring-boot-samples/spring-boot-sample-session-redis/src/main/java/sample/session/redis/SampleSessionRedisApplication.java @@ -16,14 +16,8 @@ package sample.session.redis; -import java.util.UUID; - -import javax.servlet.http.HttpSession; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; @SpringBootApplication public class SampleSessionRedisApplication { @@ -32,17 +26,4 @@ public class SampleSessionRedisApplication { SpringApplication.run(SampleSessionRedisApplication.class); } - @RestController - static class HelloRestController { - - @RequestMapping("/") - String uid(HttpSession session) { - UUID uid = (UUID) session.getAttribute("uid"); - if (uid == null) { - uid = UUID.randomUUID(); - } - session.setAttribute("uid", uid); - return uid.toString(); - } - } } diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java index 80604eba8d4..c5f76f3010e 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java @@ -41,4 +41,5 @@ public class SampleSimpleApplication implements CommandLineRunner { public static void main(String[] args) throws Exception { SpringApplication.run(SampleSimpleApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/jsp/SampleTomcatJspApplication.java b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/tomcat/jsp/SampleTomcatJspApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/jsp/SampleTomcatJspApplication.java rename to spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/tomcat/jsp/SampleTomcatJspApplication.java index ee530d70452..348e4d0edae 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/jsp/SampleTomcatJspApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/tomcat/jsp/SampleTomcatJspApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jsp; +package sample.tomcat.jsp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/velocity/WelcomeController.java b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/tomcat/jsp/WelcomeController.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/velocity/WelcomeController.java rename to spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/tomcat/jsp/WelcomeController.java index 0c9f449233a..8aaf6ca3296 100644 --- a/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/velocity/WelcomeController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/tomcat/jsp/WelcomeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.velocity; +package sample.tomcat.jsp; import java.util.Date; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java index eab03b070f7..067b4601b9d 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jsp; +package sample.tomcat.jsp; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +28,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.tomcat.jsp.SampleTomcatJspApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/SampleTomcatTwoConnectorsApplication.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/SampleTomcatTwoConnectorsApplication.java rename to spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java index 3bf7fb3bb25..fd6cfbf4aee 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/SampleTomcatTwoConnectorsApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.tomcat; +package sample.tomcat.multiconnector; import java.io.File; import java.io.FileOutputStream; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/web/SampleController.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/web/SampleController.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/web/SampleController.java index 0636bc2f763..5624b2f97b8 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/web/SampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.tomcat.web; +package sample.tomcat.multiconnector.web; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/SampleTomcatTwoConnectorsApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/SampleTomcatTwoConnectorsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java index 74cd46100f0..d4cd3d3a816 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/SampleTomcatTwoConnectorsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.tomcat; +package sample.tomcat.multiconnector; import java.io.IOException; import java.net.HttpURLConnection; @@ -42,6 +42,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.client.RestTemplate; +import sample.tomcat.multiconnector.SampleTomcatTwoConnectorsApplication; import static org.junit.Assert.assertEquals; /** diff --git a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/SampleTomcatSslApplication.java b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/SampleTomcatSslApplication.java rename to spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java index 2d8f666c256..06d6571fbca 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/SampleTomcatSslApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/ssl/SampleTomcatSslApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.tomcat; +package sample.tomcat.ssl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/web/SampleController.java b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java index ac00abeb98b..f4397a92256 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/java/sample/tomcat/ssl/web/SampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.tomcat.web; +package sample.tomcat.ssl.web; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java index b6c5fa35455..54cb3c7d479 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java @@ -18,9 +18,9 @@ package sample.tomcat; import org.apache.http.client.HttpClient; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.impl.client.HttpClients; +import org.apache.http.ssl.SSLContextBuilder; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; @@ -34,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.tomcat.ssl.SampleTomcatSslApplication; + import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/jsp/SampleTomcat7JspApplication.java b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/tomcat7/jsp/SampleTomcat7JspApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/jsp/SampleTomcat7JspApplication.java rename to spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/tomcat7/jsp/SampleTomcat7JspApplication.java index e51a0d06750..6e123a7ef87 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/jsp/SampleTomcat7JspApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/tomcat7/jsp/SampleTomcat7JspApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jsp; +package sample.tomcat7.jsp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/jsp/WelcomeController.java b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/tomcat7/jsp/WelcomeController.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/jsp/WelcomeController.java rename to spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/tomcat7/jsp/WelcomeController.java index 03d439caa3c..9a084e09909 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/jsp/WelcomeController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/main/java/sample/tomcat7/jsp/WelcomeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jsp; +package sample.tomcat7.jsp; import java.util.Date; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java index f51062a3ba1..c48aae2db47 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jsp; +package sample.tomcat7.jsp; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +28,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.tomcat7.jsp.SampleTomcat7JspApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/SampleUndertowSslApplication.java b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/SampleUndertowSslApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/SampleUndertowSslApplication.java rename to spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/SampleUndertowSslApplication.java index dbf58c94064..f32f2a65b11 100644 --- a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/SampleUndertowSslApplication.java +++ b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/SampleUndertowSslApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.undertow; +package sample.undertow.ssl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/service/HelloWorldService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/service/HelloWorldService.java index 5e5a3a43427..bb69adc2d4e 100644 --- a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.undertow.service; +package sample.undertow.ssl.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/web/SampleController.java b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/web/SampleController.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/web/SampleController.java index c16bb6dabdb..e44e3754a90 100644 --- a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/ssl/web/SampleController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package sample.undertow.web; +package sample.undertow.ssl.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import sample.undertow.service.HelloWorldService; +import sample.undertow.ssl.service.HelloWorldService; @Controller public class SampleController { diff --git a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/SampleUndertowSslApplicationTests.java b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/SampleUndertowSslApplicationTests.java rename to spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java index 3d5a12a07ee..4e11d1320e3 100644 --- a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/SampleUndertowSslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package sample.undertow; +package sample.undertow.ssl; import org.apache.http.client.HttpClient; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.impl.client.HttpClients; +import org.apache.http.ssl.SSLContextBuilder; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/InMemoryMessageRespository.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRespository.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/InMemoryMessageRespository.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRespository.java index c0433f0d2ad..9f2e31fe02f 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/InMemoryMessageRespository.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRespository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.groovytemplates; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/Message.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/Message.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/Message.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/Message.java index 9eacad874d5..71fa1ccf046 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/Message.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.groovytemplates; import java.util.Date; diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/MessageRepository.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/MessageRepository.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/MessageRepository.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/MessageRepository.java index eff57222743..948fedbe5c7 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/MessageRepository.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/MessageRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.groovytemplates; public interface MessageRepository { diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/SampleGroovyTemplateApplication.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/SampleGroovyTemplateApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/SampleGroovyTemplateApplication.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/SampleGroovyTemplateApplication.java index 6fb1683fb3b..418a6564b30 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/SampleGroovyTemplateApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/SampleGroovyTemplateApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.groovytemplates; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/mvc/MessageController.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/mvc/MessageController.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java index 8ff7cc5e68a..48e043d7dca 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/ui/mvc/MessageController.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package sample.ui.mvc; +package sample.groovytemplates.mvc; import java.util.HashMap; import java.util.Map; @@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import sample.ui.Message; -import sample.ui.MessageRepository; +import sample.groovytemplates.Message; +import sample.groovytemplates.MessageRepository; @Controller @RequestMapping("/") diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/ui/MessageControllerWebTests.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/ui/MessageControllerWebTests.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java index 7e0d7a427ef..9a11d04b16f 100755 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/ui/MessageControllerWebTests.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.groovytemplates; import java.util.regex.Pattern; @@ -32,6 +32,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import sample.groovytemplates.SampleGroovyTemplateApplication; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/ui/SampleGroovyTemplateApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/ui/SampleGroovyTemplateApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java index 7e8691164c8..eb8d765bb1c 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/ui/SampleGroovyTemplateApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.groovytemplates; import java.net.URI; @@ -32,6 +32,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import sample.groovytemplates.SampleGroovyTemplateApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/ui/method/SampleMethodSecurityApplication.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/ui/method/SampleMethodSecurityApplication.java rename to spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java index 6c1bb1ccf21..07f2742af67 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/ui/method/SampleMethodSecurityApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.method; +package sample.security.method; import java.util.Date; import java.util.Map; @@ -58,10 +58,6 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { } - public static void main(String[] args) throws Exception { - new SpringApplicationBuilder(SampleMethodSecurityApplication.class).run(args); - } - @Override public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/login").setViewName("login"); @@ -73,6 +69,10 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { return new ApplicationSecurity(); } + public static void main(String[] args) throws Exception { + new SpringApplicationBuilder(SampleMethodSecurityApplication.class).run(args); + } + @Order(Ordered.HIGHEST_PRECEDENCE) @Configuration protected static class AuthenticationSecurity extends @@ -80,12 +80,11 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { @Override public void init(AuthenticationManagerBuilder auth) throws Exception { - // @formatter:off auth.inMemoryAuthentication().withUser("admin").password("admin") .roles("ADMIN", "USER").and().withUser("user").password("user") .roles("USER"); - // @formatter:on } + } @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER) @@ -93,13 +92,11 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { - // @formatter:off http.authorizeRequests().antMatchers("/login").permitAll().anyRequest() .fullyAuthenticated().and().formLogin().loginPage("/login") .failureUrl("/login?error").and().logout() .logoutRequestMatcher(new AntPathRequestMatcher("/logout")).and() .exceptionHandling().accessDeniedPage("/access?error"); - // @formatter:on } } diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/ui/method/SampleMethodSecurityApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/ui/method/SampleMethodSecurityApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java index 4566c92ebda..09d1823f101 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/ui/method/SampleMethodSecurityApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.method; +package sample.security.method; import java.util.Arrays; import java.util.regex.Matcher; @@ -38,6 +38,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import sample.security.method.SampleMethodSecurityApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/ui/secure/SampleWebSecureCustomApplication.java b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/ui/secure/SampleWebSecureCustomApplication.java rename to spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java index 8aa8abb5672..6d2947b9c2e 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/ui/secure/SampleWebSecureCustomApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.secure; +package sample.web.secure.custom; import java.util.Date; import java.util.Map; @@ -52,10 +52,6 @@ public class SampleWebSecureCustomApplication extends WebMvcConfigurerAdapter { throw new RuntimeException("Expected exception in controller"); } - public static void main(String[] args) throws Exception { - new SpringApplicationBuilder(SampleWebSecureCustomApplication.class).run(args); - } - @Override public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/login").setViewName("login"); @@ -66,6 +62,10 @@ public class SampleWebSecureCustomApplication extends WebMvcConfigurerAdapter { return new ApplicationSecurity(); } + public static void main(String[] args) throws Exception { + new SpringApplicationBuilder(SampleWebSecureCustomApplication.class).run(args); + } + @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java index e71c443a1ab..cae217151f6 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java @@ -38,6 +38,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import sample.web.secure.custom.SampleWebSecureCustomApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/java/sample/ui/github/SampleGithubSecureApplication.java b/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/java/sample/web/secure/github/SampleGithubSecureApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-secure-github/src/main/java/sample/ui/github/SampleGithubSecureApplication.java rename to spring-boot-samples/spring-boot-sample-web-secure-github/src/main/java/sample/web/secure/github/SampleGithubSecureApplication.java index 46788715919..d67cea87b12 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/java/sample/ui/github/SampleGithubSecureApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/java/sample/web/secure/github/SampleGithubSecureApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.github; +package sample.web.secure.github; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/ui/github/SampleGithubApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/ui/github/SampleGithubApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java index 2f2e2fe18c7..31ea9a4b13a 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/ui/github/SampleGithubApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.github; +package sample.web.secure.github; import org.junit.Before; import org.junit.Test; @@ -30,6 +30,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; +import sample.web.secure.github.SampleGithubSecureApplication; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrlPattern; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/ui/secure/SampleWebSecureCustomApplication.java b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureCustomApplication.java similarity index 99% rename from spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/ui/secure/SampleWebSecureCustomApplication.java rename to spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureCustomApplication.java index 32b7427045e..ea81bf42e49 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/ui/secure/SampleWebSecureCustomApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureCustomApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.secure; +package sample.web.secure.jdbc; import java.util.Date; import java.util.Map; @@ -54,10 +54,6 @@ public class SampleWebSecureCustomApplication extends WebMvcConfigurerAdapter { throw new RuntimeException("Expected exception in controller"); } - public static void main(String[] args) throws Exception { - new SpringApplicationBuilder(SampleWebSecureCustomApplication.class).run(args); - } - @Override public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/login").setViewName("login"); @@ -68,6 +64,10 @@ public class SampleWebSecureCustomApplication extends WebMvcConfigurerAdapter { return new ApplicationSecurity(); } + public static void main(String[] args) throws Exception { + new SpringApplicationBuilder(SampleWebSecureCustomApplication.class).run(args); + } + @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java index e71c443a1ab..70e749b49df 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.secure; +package sample.web.secure.jdbc; import java.util.Arrays; import java.util.regex.Matcher; @@ -38,6 +38,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import sample.web.secure.jdbc.SampleWebSecureCustomApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java b/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java similarity index 99% rename from spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java rename to spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java index 186d3ef5c72..0778d606c50 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.secure; +package sample.web.secure; import java.util.Date; import java.util.Map; @@ -52,15 +52,15 @@ public class SampleWebSecureApplication extends WebMvcConfigurerAdapter { throw new RuntimeException("Expected exception in controller"); } - public static void main(String[] args) throws Exception { - new SpringApplicationBuilder(SampleWebSecureApplication.class).run(args); - } - @Override public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/login").setViewName("login"); } + public static void main(String[] args) throws Exception { + new SpringApplicationBuilder(SampleWebSecureApplication.class).run(args); + } + @Configuration @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ui/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ui/secure/SampleSecureApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java index ae106719b10..d1772e5e6d2 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/ui/secure/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui.secure; +package sample.web.secure; import java.util.Arrays; import java.util.regex.Matcher; @@ -38,6 +38,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import sample.web.secure.SampleWebSecureApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java b/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/web/staticcontent/SampleWebStaticApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java rename to spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/web/staticcontent/SampleWebStaticApplication.java index 9348477e694..46d5dff02fb 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/web/staticcontent/SampleWebStaticApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.web.staticcontent; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -24,13 +24,13 @@ import org.springframework.boot.context.web.SpringBootServletInitializer; @SpringBootApplication public class SampleWebStaticApplication extends SpringBootServletInitializer { - public static void main(String[] args) throws Exception { - SpringApplication.run(SampleWebStaticApplication.class, args); - } - @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(SampleWebStaticApplication.class); } + public static void main(String[] args) throws Exception { + SpringApplication.run(SampleWebStaticApplication.class, args); + } + } diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java index 3b031801a29..a71271fc70f 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.webstatic; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +29,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.web.staticcontent.SampleWebStaticApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRepository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRepository.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java index b923927218c..6a0bd028fc8 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRepository.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.web.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/sample/ui/Message.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/Message.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/Message.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/Message.java index c3f4b1c60ff..8b4ccf622c4 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/Message.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/Message.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package sample.ui; +package sample.web.ui; import java.util.Calendar; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/MessageRepository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/MessageRepository.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/MessageRepository.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/MessageRepository.java index 6bfd8199374..40842dc89b8 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/MessageRepository.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/MessageRepository.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package sample.ui; +package sample.web.ui; /** * @author Rob Winch diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/SampleWebUiApplication.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/SampleWebUiApplication.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/SampleWebUiApplication.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/SampleWebUiApplication.java index 46bebc61dab..80b36ad9180 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/SampleWebUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/SampleWebUiApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.ui; +package sample.web.ui; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/mvc/MessageController.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/mvc/MessageController.java index 5fe1f3992f1..561a3e27b91 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/mvc/MessageController.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/mvc/MessageController.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package sample.ui.mvc; +package sample.web.ui.mvc; import javax.validation.Valid; @@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import sample.ui.Message; -import sample.ui.MessageRepository; +import sample.web.ui.Message; +import sample.web.ui.MessageRepository; /** * @author Rob Winch diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java index 48cfa67d439..dca9453f47e 100755 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/MessageControllerWebTests.java @@ -31,6 +31,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import sample.web.ui.SampleWebUiApplication; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java index 07e7c943187..6834226d52d 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java @@ -32,6 +32,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import sample.web.ui.SampleWebUiApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/velocity/SampleWebVelocityApplication.java b/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/web/velocity/SampleWebVelocityApplication.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/velocity/SampleWebVelocityApplication.java rename to spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/web/velocity/SampleWebVelocityApplication.java index ecb35c9612f..ed29399f117 100644 --- a/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/velocity/SampleWebVelocityApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/web/velocity/SampleWebVelocityApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.velocity; +package sample.web.velocity; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/jsp/WelcomeController.java b/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/web/velocity/WelcomeController.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/jsp/WelcomeController.java rename to spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/web/velocity/WelcomeController.java index 03d439caa3c..7327bb57f6c 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/main/java/sample/jsp/WelcomeController.java +++ b/spring-boot-samples/spring-boot-sample-web-velocity/src/main/java/sample/web/velocity/WelcomeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.jsp; +package sample.web.velocity; import java.util.Date; import java.util.Map; diff --git a/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/velocity/SampleWebVelocityApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/velocity/SampleWebVelocityApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java index b3032d86230..b71d5001cb6 100644 --- a/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/velocity/SampleWebVelocityApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sample.velocity; +package sample.web.velocity; import java.util.Arrays; @@ -34,6 +34,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import sample.web.velocity.SampleWebVelocityApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/SampleJettyWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java similarity index 86% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/SampleJettyWebSocketsApplication.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java index b347d96e315..79f28f06f5e 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/SampleJettyWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket; +package samples.websocket.jetty; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,13 +29,13 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -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.reverse.ReverseWebSocketEndpoint; -import samples.websocket.snake.SnakeWebSocketHandler; +import samples.websocket.jetty.client.GreetingService; +import samples.websocket.jetty.client.SimpleGreetingService; +import samples.websocket.jetty.echo.DefaultEchoService; +import samples.websocket.jetty.echo.EchoService; +import samples.websocket.jetty.echo.EchoWebSocketHandler; +import samples.websocket.jetty.reverse.ReverseWebSocketEndpoint; +import samples.websocket.jetty.snake.SnakeWebSocketHandler; @Configuration @EnableAutoConfiguration diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/GreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/GreetingService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/GreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/GreetingService.java index e03d15d76ad..811d0eaccd7 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/GreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/GreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.jetty.client; public interface GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/SimpleClientWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/SimpleClientWebSocketHandler.java index 828291de186..160a6a8deb8 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/SimpleClientWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.jetty.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/SimpleGreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/SimpleGreetingService.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/SimpleGreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/SimpleGreetingService.java index e08ec78e34d..f258ce4d151 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/SimpleGreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/client/SimpleGreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.jetty.client; public class SimpleGreetingService implements GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/DefaultEchoService.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/DefaultEchoService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/DefaultEchoService.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/DefaultEchoService.java index c967613eb78..475253956ad 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/DefaultEchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/DefaultEchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.jetty.echo; public class DefaultEchoService implements EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/EchoService.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/EchoService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/EchoService.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/EchoService.java index c07323cd567..9bb10aff29a 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/EchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/EchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.jetty.echo; public interface EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/EchoWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/EchoWebSocketHandler.java index b97a5e01c53..2de57bf87c4 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/EchoWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.jetty.echo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/reverse/ReverseWebSocketEndpoint.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/reverse/ReverseWebSocketEndpoint.java index a7802edcd22..bd3b18735aa 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/reverse/ReverseWebSocketEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.reverse; +package samples.websocket.jetty.reverse; import java.io.IOException; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Direction.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Direction.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Direction.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Direction.java index b5295270e26..96871610fff 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Direction.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Direction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; public enum Direction { NONE, NORTH, SOUTH, EAST, WEST diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Location.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Location.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Location.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Location.java index 55a50853405..f2abe5faeb3 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Location.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Location.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; public class Location { diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java similarity index 99% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Snake.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java index 1bba0047323..28d941685f5 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Snake.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; import java.util.ArrayDeque; import java.util.Collection; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeTimer.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java index a11b12901e5..24ca48109d7 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeTimer.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; import java.util.Collection; import java.util.Collections; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeUtils.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeUtils.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeUtils.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeUtils.java index b114992ce89..01e4d7e80be 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeUtils.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; import java.awt.Color; import java.util.Random; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeWebSocketHandler.java index a278eb09bee..0c7c01fc9e9 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeWebSocketHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; import java.awt.Color; import java.util.Iterator; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java index c12b3109f83..9fb05b86fcb 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket; +package samples.websocket.jetty; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -39,10 +39,10 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; - +import samples.websocket.jetty.SampleJettyWebSocketsApplication; +import samples.websocket.jetty.client.GreetingService; +import samples.websocket.jetty.client.SimpleClientWebSocketHandler; +import samples.websocket.jetty.client.SimpleGreetingService; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java similarity index 93% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java index 0a204fbc7f5..69ab0fdf99f 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.jetty.echo; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -42,12 +42,11 @@ import org.springframework.util.SocketUtils; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; -import samples.websocket.SampleJettyWebSocketsApplication; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; -import samples.websocket.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration; - +import samples.websocket.jetty.SampleJettyWebSocketsApplication; +import samples.websocket.jetty.client.GreetingService; +import samples.websocket.jetty.client.SimpleClientWebSocketHandler; +import samples.websocket.jetty.client.SimpleGreetingService; +import samples.websocket.jetty.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/snake/SnakeTimerTests.java similarity index 90% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/snake/SnakeTimerTests.java index 298afbd807f..fb3de78e2aa 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/snake/SnakeTimerTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.jetty.snake; import java.io.IOException; import org.junit.Test; +import samples.websocket.jetty.snake.Snake; +import samples.websocket.jetty.snake.SnakeTimer; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.BDDMockito.willThrow; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/SampleTomcatWebSocketApplication.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java similarity index 86% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/SampleTomcatWebSocketApplication.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java index b0d48a9f12a..52bf3ceae70 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/SampleTomcatWebSocketApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket; +package samples.websocket.tomcat; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,13 +29,13 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -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.reverse.ReverseWebSocketEndpoint; -import samples.websocket.snake.SnakeWebSocketHandler; +import samples.websocket.tomcat.client.GreetingService; +import samples.websocket.tomcat.client.SimpleGreetingService; +import samples.websocket.tomcat.echo.DefaultEchoService; +import samples.websocket.tomcat.echo.EchoService; +import samples.websocket.tomcat.echo.EchoWebSocketHandler; +import samples.websocket.tomcat.reverse.ReverseWebSocketEndpoint; +import samples.websocket.tomcat.snake.SnakeWebSocketHandler; @Configuration @EnableAutoConfiguration diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/GreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/GreetingService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/GreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/GreetingService.java index de25204e0c1..ea32251d531 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/GreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/GreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.tomcat.client; public interface GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/SimpleClientWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/SimpleClientWebSocketHandler.java index a3bbfc2f1cf..06f3b163efa 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/SimpleClientWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.tomcat.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleGreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/SimpleGreetingService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleGreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/SimpleGreetingService.java index 6a1e994c81c..b12e1b33ec5 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleGreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/client/SimpleGreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.tomcat.client; public class SimpleGreetingService implements GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/DefaultEchoService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/DefaultEchoService.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/DefaultEchoService.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/DefaultEchoService.java index 87da340e54a..c41d471c918 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/DefaultEchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/DefaultEchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.tomcat.echo; public class DefaultEchoService implements EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/EchoService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoService.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/EchoService.java index 59c0f060128..922b216ea7b 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/EchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.tomcat.echo; public interface EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/EchoWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/EchoWebSocketHandler.java index 4f01f1288e4..9329335e917 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/EchoWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.tomcat.echo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java similarity index 96% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java index a7802edcd22..597ec2d6f3c 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.reverse; +package samples.websocket.tomcat.reverse; import java.io.IOException; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Direction.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Direction.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Direction.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Direction.java index b5295270e26..bd2c2e71b90 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Direction.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Direction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; public enum Direction { NONE, NORTH, SOUTH, EAST, WEST diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Location.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Location.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Location.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Location.java index 55a50853405..2d86ff41ba5 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Location.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Location.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; public class Location { diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Snake.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java index 1bba0047323..1b130370adf 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/Snake.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; import java.util.ArrayDeque; import java.util.Collection; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeTimer.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java index 0533b6eac2e..4946b9b9567 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeTimer.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; import java.util.Collection; import java.util.Collections; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeUtils.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeUtils.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeUtils.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeUtils.java index b114992ce89..f6ae703060b 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeUtils.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; import java.awt.Color; import java.util.Random; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeWebSocketHandler.java index a278eb09bee..dfd4690c90d 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeWebSocketHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; import java.awt.Color; import java.util.Iterator; diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java index bd252816923..de119448ce4 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket; +package samples.websocket.tomcat; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -39,10 +39,10 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; - +import samples.websocket.tomcat.SampleTomcatWebSocketApplication; +import samples.websocket.tomcat.client.GreetingService; +import samples.websocket.tomcat.client.SimpleClientWebSocketHandler; +import samples.websocket.tomcat.client.SimpleGreetingService; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java index 1844e4142f8..c4c2722cdac 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.tomcat.echo; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -42,12 +42,11 @@ import org.springframework.util.SocketUtils; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; -import samples.websocket.SampleTomcatWebSocketApplication; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; -import samples.websocket.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration; - +import samples.websocket.tomcat.SampleTomcatWebSocketApplication; +import samples.websocket.tomcat.client.GreetingService; +import samples.websocket.tomcat.client.SimpleClientWebSocketHandler; +import samples.websocket.tomcat.client.SimpleGreetingService; +import samples.websocket.tomcat.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/snake/SnakeTimerTests.java similarity index 90% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/snake/SnakeTimerTests.java rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/snake/SnakeTimerTests.java index 9a8305e46bd..3bb76ad2748 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/snake/SnakeTimerTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/snake/SnakeTimerTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.tomcat.snake; import java.io.IOException; import org.junit.Test; +import samples.websocket.tomcat.snake.Snake; +import samples.websocket.tomcat.snake.SnakeTimer; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.BDDMockito.willThrow; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/SampleUndertowWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java similarity index 86% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/SampleUndertowWebSocketsApplication.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java index 64454316c63..cc4533a1816 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/SampleUndertowWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket; +package samples.websocket.undertow; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,13 +29,13 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -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.reverse.ReverseWebSocketEndpoint; -import samples.websocket.snake.SnakeWebSocketHandler; +import samples.websocket.undertow.client.GreetingService; +import samples.websocket.undertow.client.SimpleGreetingService; +import samples.websocket.undertow.echo.DefaultEchoService; +import samples.websocket.undertow.echo.EchoService; +import samples.websocket.undertow.echo.EchoWebSocketHandler; +import samples.websocket.undertow.reverse.ReverseWebSocketEndpoint; +import samples.websocket.undertow.snake.SnakeWebSocketHandler; @Configuration @EnableAutoConfiguration diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/GreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/GreetingService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/GreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/GreetingService.java index e03d15d76ad..166b528f051 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/client/GreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/GreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.undertow.client; public interface GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/SimpleClientWebSocketHandler.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/SimpleClientWebSocketHandler.java index 828291de186..9020f8de5b5 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/SimpleClientWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.undertow.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/SimpleGreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/SimpleGreetingService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/SimpleGreetingService.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/SimpleGreetingService.java index e08ec78e34d..9b719704271 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/client/SimpleGreetingService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/client/SimpleGreetingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.client; +package samples.websocket.undertow.client; public class SimpleGreetingService implements GreetingService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/DefaultEchoService.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/DefaultEchoService.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/DefaultEchoService.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/DefaultEchoService.java index c967613eb78..f9a7a457e72 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/DefaultEchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/DefaultEchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.undertow.echo; public class DefaultEchoService implements EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/EchoService.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/EchoService.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/EchoService.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/EchoService.java index c07323cd567..4b10a5f3fc0 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/EchoService.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/EchoService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.undertow.echo; public interface EchoService { diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/EchoWebSocketHandler.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/EchoWebSocketHandler.java index b97a5e01c53..690dbd0d19e 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/EchoWebSocketHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.undertow.echo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/reverse/ReverseWebSocketEndpoint.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/reverse/ReverseWebSocketEndpoint.java index a7802edcd22..7823abf6e59 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/reverse/ReverseWebSocketEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.reverse; +package samples.websocket.undertow.reverse; import java.io.IOException; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Direction.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Direction.java similarity index 95% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Direction.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Direction.java index b5295270e26..c3542eaa999 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Direction.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Direction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; public enum Direction { NONE, NORTH, SOUTH, EAST, WEST diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Location.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Location.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Location.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Location.java index 55a50853405..ffe1e2dde27 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/snake/Location.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Location.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; public class Location { diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Snake.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java index 1bba0047323..583a0d2308b 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Snake.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; import java.util.ArrayDeque; import java.util.Collection; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeTimer.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java index a11b12901e5..2a1a35dbca7 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeTimer.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; import java.util.Collection; import java.util.Collections; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeUtils.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeUtils.java similarity index 97% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeUtils.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeUtils.java index b114992ce89..7fab90d8a10 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeUtils.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; import java.awt.Color; import java.util.Random; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeWebSocketHandler.java similarity index 98% rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeWebSocketHandler.java index a278eb09bee..8f5affebb21 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeWebSocketHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; import java.awt.Color; import java.util.Iterator; diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java similarity index 94% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java index f93e2fb5daa..0c36751e3d4 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket; +package samples.websocket.undertow; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -39,10 +39,10 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; - +import samples.websocket.undertow.SampleUndertowWebSocketsApplication; +import samples.websocket.undertow.client.GreetingService; +import samples.websocket.undertow.client.SimpleClientWebSocketHandler; +import samples.websocket.undertow.client.SimpleGreetingService; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java similarity index 92% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java index 4501e443238..e56d6dd4ce3 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package samples.websocket.echo; +package samples.websocket.undertow.echo; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -42,12 +42,11 @@ import org.springframework.util.SocketUtils; import org.springframework.web.socket.client.WebSocketConnectionManager; import org.springframework.web.socket.client.standard.StandardWebSocketClient; -import samples.websocket.SampleUndertowWebSocketsApplication; -import samples.websocket.client.GreetingService; -import samples.websocket.client.SimpleClientWebSocketHandler; -import samples.websocket.client.SimpleGreetingService; -import samples.websocket.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration; - +import samples.websocket.undertow.SampleUndertowWebSocketsApplication; +import samples.websocket.undertow.client.GreetingService; +import samples.websocket.undertow.client.SimpleClientWebSocketHandler; +import samples.websocket.undertow.client.SimpleGreetingService; +import samples.websocket.undertow.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/snake/SnakeTimerTests.java similarity index 89% rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/snake/SnakeTimerTests.java rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/snake/SnakeTimerTests.java index 9a8305e46bd..88171ef8b8a 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/snake/SnakeTimerTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/snake/SnakeTimerTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package samples.websocket.snake; +package samples.websocket.undertow.snake; import java.io.IOException; import org.junit.Test; +import samples.websocket.undertow.snake.Snake; +import samples.websocket.undertow.snake.SnakeTimer; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.BDDMockito.willThrow; diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java index a62a2b265b7..7069b692f65 100644 --- a/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java @@ -35,4 +35,5 @@ public class SampleSpringXmlApplication implements CommandLineRunner { public static void main(String[] args) throws Exception { SpringApplication.run("classpath:/META-INF/application-context.xml", args); } + }