From 114dae5df3af20a2701565f7677c35da57eda94c Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 12 Aug 2019 19:25:31 -0700 Subject: [PATCH] Rename 'example.app.near.caching' package to 'example.app.caching.near'. --- ...GeodeNearCachingClientCacheApplication.java | 2 +- .../client/config/GeodeConfiguration.java | 2 +- .../controller/YellowPagesController.java | 10 +++++----- .../near}/client/model/Person.java | 2 +- .../client/service/YellowPagesService.java | 18 +++++++++--------- .../support/AbstractCacheableService.java | 2 +- .../client/service/support/EmailGenerator.java | 2 +- .../service/support/PhoneNumberGenerator.java | 2 +- ...GeodeNearCachingCacheServerApplication.java | 4 ++-- ...ClientCacheApplicationIntegrationTests.java | 14 +++++++------- 10 files changed, 29 insertions(+), 29 deletions(-) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/BootGeodeNearCachingClientCacheApplication.java (98%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/config/GeodeConfiguration.java (98%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/controller/YellowPagesController.java (90%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/model/Person.java (96%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/service/YellowPagesService.java (77%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/service/support/AbstractCacheableService.java (97%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/service/support/EmailGenerator.java (97%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/client/service/support/PhoneNumberGenerator.java (97%) rename spring-geode-samples/caching/near/src/main/java/example/app/{near/caching => caching/near}/server/BootGeodeNearCachingCacheServerApplication.java (97%) rename spring-geode-samples/caching/near/src/test/java/example/app/{near/caching => caching/near}/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java (86%) diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/BootGeodeNearCachingClientCacheApplication.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java similarity index 98% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/BootGeodeNearCachingClientCacheApplication.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java index ea6b0751..5e41086c 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/BootGeodeNearCachingClientCacheApplication.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplication.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client; +package example.app.caching.near.client; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/config/GeodeConfiguration.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java similarity index 98% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/config/GeodeConfiguration.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java index fc1ef60b..255754e3 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/config/GeodeConfiguration.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/config/GeodeConfiguration.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.config; +package example.app.caching.near.client.config; import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.EntryEvent; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/controller/YellowPagesController.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java similarity index 90% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/controller/YellowPagesController.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java index 782d403c..59925d66 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/controller/YellowPagesController.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/controller/YellowPagesController.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.controller; +package example.app.caching.near.client.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import example.app.near.caching.client.model.Person; -import example.app.near.caching.client.service.YellowPagesService; +import example.app.caching.near.client.service.YellowPagesService; +import example.app.caching.near.client.model.Person; /** * Spring {@link RestController} class for implementing the UI to the Yellow Pages application. @@ -30,8 +30,8 @@ import example.app.near.caching.client.service.YellowPagesService; * @author John Blum * @see org.springframework.web.bind.annotation.GetMapping * @see org.springframework.web.bind.annotation.RestController - * @see example.app.near.caching.client.model.Person - * @see example.app.near.caching.client.service.YellowPagesService + * @see Person + * @see YellowPagesService * @since 1.1.0 */ // tag::class[] diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/model/Person.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java similarity index 96% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/model/Person.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java index 471c95d7..08ef11bb 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/model/Person.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/model/Person.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.model; +package example.app.caching.near.client.model; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/YellowPagesService.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java similarity index 77% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/YellowPagesService.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java index f5fbcc7d..8507c2a9 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/YellowPagesService.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/YellowPagesService.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.service; +package example.app.caching.near.client.service; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; @@ -21,10 +21,10 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import example.app.near.caching.client.model.Person; -import example.app.near.caching.client.service.support.AbstractCacheableService; -import example.app.near.caching.client.service.support.EmailGenerator; -import example.app.near.caching.client.service.support.PhoneNumberGenerator; +import example.app.caching.near.client.service.support.AbstractCacheableService; +import example.app.caching.near.client.model.Person; +import example.app.caching.near.client.service.support.EmailGenerator; +import example.app.caching.near.client.service.support.PhoneNumberGenerator; /** * Spring {@link Service} class implementing the Yellow Pages. @@ -32,10 +32,10 @@ import example.app.near.caching.client.service.support.PhoneNumberGenerator; * @author John Blum * @see org.springframework.cache.annotation.Cacheable * @see org.springframework.stereotype.Service - * @see example.app.near.caching.client.model.Person - * @see example.app.near.caching.client.service.support.AbstractCacheableService - * @see example.app.near.caching.client.service.support.EmailGenerator - * @see example.app.near.caching.client.service.support.PhoneNumberGenerator + * @see Person + * @see AbstractCacheableService + * @see EmailGenerator + * @see PhoneNumberGenerator * @since 1.1.0 */ // tag::class[] diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/AbstractCacheableService.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java similarity index 97% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/AbstractCacheableService.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java index c2b303e8..563bc9ff 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/AbstractCacheableService.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/AbstractCacheableService.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.service.support; +package example.app.caching.near.client.service.support; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/EmailGenerator.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java similarity index 97% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/EmailGenerator.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java index 88f4ecc9..3640d775 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/EmailGenerator.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/EmailGenerator.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.service.support; +package example.app.caching.near.client.service.support; import java.util.Arrays; import java.util.List; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/PhoneNumberGenerator.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java similarity index 97% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/PhoneNumberGenerator.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java index 42ca2925..b1566aa1 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/client/service/support/PhoneNumberGenerator.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client.service.support; +package example.app.caching.near.client.service.support; import java.util.Arrays; import java.util.List; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/server/BootGeodeNearCachingCacheServerApplication.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java similarity index 97% rename from spring-geode-samples/caching/near/src/main/java/example/app/near/caching/server/BootGeodeNearCachingCacheServerApplication.java rename to spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java index ea74ae0b..32c01856 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/near/caching/server/BootGeodeNearCachingCacheServerApplication.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/server/BootGeodeNearCachingCacheServerApplication.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.server; +package example.app.caching.near.server; import static org.assertj.core.api.Assertions.assertThat; @@ -37,7 +37,7 @@ import org.springframework.data.gemfire.config.annotation.CacheServerApplication import org.springframework.data.gemfire.config.annotation.EnableLocator; import org.springframework.data.gemfire.config.annotation.EnableManager; -import example.app.near.caching.client.model.Person; +import example.app.caching.near.client.model.Person; /** * Spring Boot application that configures and bootstraps an Apache Geode {@link CacheServer} application. diff --git a/spring-geode-samples/caching/near/src/test/java/example/app/near/caching/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java b/spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java similarity index 86% rename from spring-geode-samples/caching/near/src/test/java/example/app/near/caching/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java rename to spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java index 5b5cce03..8b14981b 100644 --- a/spring-geode-samples/caching/near/src/test/java/example/app/near/caching/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/near/src/test/java/example/app/caching/near/client/BootGeodeNearCachingClientCacheApplicationIntegrationTests.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package example.app.near.caching.client; +package example.app.caching.near.client; import static org.assertj.core.api.Assertions.assertThat; @@ -31,9 +31,9 @@ import org.springframework.data.gemfire.tests.integration.ForkingClientServerInt import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import example.app.near.caching.client.model.Person; -import example.app.near.caching.client.service.YellowPagesService; -import example.app.near.caching.server.BootGeodeNearCachingCacheServerApplication; +import example.app.caching.near.client.service.YellowPagesService; +import example.app.caching.near.server.BootGeodeNearCachingCacheServerApplication; +import example.app.caching.near.client.model.Person; /** * Integration Tests for the Spring Boot, {@link ClientCache} application example for {@literal Near Caching}. @@ -44,9 +44,9 @@ import example.app.near.caching.server.BootGeodeNearCachingCacheServerApplicatio * @see org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.junit4.SpringRunner - * @see example.app.near.caching.client.model.Person - * @see example.app.near.caching.client.service.YellowPagesService - * @see example.app.near.caching.server.BootGeodeNearCachingCacheServerApplication + * @see Person + * @see YellowPagesService + * @see BootGeodeNearCachingCacheServerApplication * @since 1.1.0 */ @ActiveProfiles("client")