From be49fef33320e6772f2a18bb77148d9f99436ad7 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 20:59:44 +0100 Subject: [PATCH 01/13] JAVA-959: Migrate spring-katharsis to com.baeldung --- .../main/java/{org => com}/baeldung/Application.java | 2 +- .../src/main/java/{org => com}/baeldung/Setup.java | 10 +++++----- .../baeldung/persistence/dao/RoleRepository.java | 4 ++-- .../baeldung/persistence/dao/UserRepository.java | 4 ++-- .../persistence/katharsis/RoleResourceRepository.java | 6 +++--- .../persistence/katharsis/UserResourceRepository.java | 6 +++--- .../katharsis/UserToRoleRelationshipRepository.java | 10 +++++----- .../{org => com}/baeldung/persistence/model/Role.java | 2 +- .../{org => com}/baeldung/persistence/model/User.java | 2 +- .../java/{org => com}/baeldung/SpringContextTest.java | 3 +-- .../{org => com}/baeldung/test/JsonApiLiveTest.java | 2 +- 11 files changed, 25 insertions(+), 26 deletions(-) rename spring-katharsis/src/main/java/{org => com}/baeldung/Application.java (96%) rename spring-katharsis/src/main/java/{org => com}/baeldung/Setup.java (81%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/dao/RoleRepository.java (62%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/dao/UserRepository.java (62%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/katharsis/RoleResourceRepository.java (89%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/katharsis/UserResourceRepository.java (89%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java (89%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/model/Role.java (98%) rename spring-katharsis/src/main/java/{org => com}/baeldung/persistence/model/User.java (98%) rename spring-katharsis/src/test/java/{org => com}/baeldung/SpringContextTest.java (87%) rename spring-katharsis/src/test/java/{org => com}/baeldung/test/JsonApiLiveTest.java (94%) diff --git a/spring-katharsis/src/main/java/org/baeldung/Application.java b/spring-katharsis/src/main/java/com/baeldung/Application.java similarity index 96% rename from spring-katharsis/src/main/java/org/baeldung/Application.java rename to spring-katharsis/src/main/java/com/baeldung/Application.java index 5ce4ac7e08..6c4f047b26 100644 --- a/spring-katharsis/src/main/java/org/baeldung/Application.java +++ b/spring-katharsis/src/main/java/com/baeldung/Application.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import io.katharsis.spring.boot.v3.KatharsisConfigV3; diff --git a/spring-katharsis/src/main/java/org/baeldung/Setup.java b/spring-katharsis/src/main/java/com/baeldung/Setup.java similarity index 81% rename from spring-katharsis/src/main/java/org/baeldung/Setup.java rename to spring-katharsis/src/main/java/com/baeldung/Setup.java index c9088067eb..5363dd829a 100644 --- a/spring-katharsis/src/main/java/org/baeldung/Setup.java +++ b/spring-katharsis/src/main/java/com/baeldung/Setup.java @@ -1,14 +1,14 @@ -package org.baeldung; +package com.baeldung; import java.util.Arrays; import java.util.HashSet; import javax.annotation.PostConstruct; -import org.baeldung.persistence.dao.RoleRepository; -import org.baeldung.persistence.dao.UserRepository; -import org.baeldung.persistence.model.Role; -import org.baeldung.persistence.model.User; +import com.baeldung.persistence.dao.RoleRepository; +import com.baeldung.persistence.dao.UserRepository; +import com.baeldung.persistence.model.Role; +import com.baeldung.persistence.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java similarity index 62% rename from spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java index f4542ad097..6b7cc0204c 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java @@ -1,6 +1,6 @@ -package org.baeldung.persistence.dao; +package com.baeldung.persistence.dao; -import org.baeldung.persistence.model.Role; +import com.baeldung.persistence.model.Role; import org.springframework.data.jpa.repository.JpaRepository; public interface RoleRepository extends JpaRepository { diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java similarity index 62% rename from spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java index cfe857ec40..89c2f3ec07 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java @@ -1,6 +1,6 @@ -package org.baeldung.persistence.dao; +package com.baeldung.persistence.dao; -import org.baeldung.persistence.model.User; +import com.baeldung.persistence.model.User; import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java similarity index 89% rename from spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java index 1998c414bb..c5e6326075 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java @@ -1,12 +1,12 @@ -package org.baeldung.persistence.katharsis; +package com.baeldung.persistence.katharsis; +import com.baeldung.persistence.dao.RoleRepository; import io.katharsis.queryspec.QuerySpec; import io.katharsis.repository.ResourceRepositoryV2; import io.katharsis.resource.list.ResourceList; -import org.baeldung.persistence.dao.RoleRepository; -import org.baeldung.persistence.model.Role; +import com.baeldung.persistence.model.Role; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java similarity index 89% rename from spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java index 9b3de31601..616431f3f0 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java @@ -1,11 +1,11 @@ -package org.baeldung.persistence.katharsis; +package com.baeldung.persistence.katharsis; +import com.baeldung.persistence.dao.UserRepository; +import com.baeldung.persistence.model.User; import io.katharsis.queryspec.QuerySpec; import io.katharsis.repository.ResourceRepositoryV2; import io.katharsis.resource.list.ResourceList; -import org.baeldung.persistence.dao.UserRepository; -import org.baeldung.persistence.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java similarity index 89% rename from spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java index dbeb769fac..066292c00f 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java @@ -1,5 +1,8 @@ -package org.baeldung.persistence.katharsis; +package com.baeldung.persistence.katharsis; +import com.baeldung.persistence.dao.RoleRepository; +import com.baeldung.persistence.dao.UserRepository; +import com.baeldung.persistence.model.User; import io.katharsis.queryspec.QuerySpec; import io.katharsis.repository.RelationshipRepositoryV2; import io.katharsis.resource.list.ResourceList; @@ -7,10 +10,7 @@ import io.katharsis.resource.list.ResourceList; import java.util.HashSet; import java.util.Set; -import org.baeldung.persistence.dao.RoleRepository; -import org.baeldung.persistence.dao.UserRepository; -import org.baeldung.persistence.model.Role; -import org.baeldung.persistence.model.User; +import com.baeldung.persistence.model.Role; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java b/spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java similarity index 98% rename from spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java index f391efd37c..2f928993c2 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java @@ -1,4 +1,4 @@ -package org.baeldung.persistence.model; +package com.baeldung.persistence.model; import io.katharsis.resource.annotations.JsonApiId; import io.katharsis.resource.annotations.JsonApiRelation; diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java b/spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java similarity index 98% rename from spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java rename to spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java index 7c55e29599..111435c52e 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java +++ b/spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java @@ -1,4 +1,4 @@ -package org.baeldung.persistence.model; +package com.baeldung.persistence.model; import io.katharsis.resource.annotations.JsonApiId; import io.katharsis.resource.annotations.JsonApiRelation; diff --git a/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java b/spring-katharsis/src/test/java/com/baeldung/SpringContextTest.java similarity index 87% rename from spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java rename to spring-katharsis/src/test/java/com/baeldung/SpringContextTest.java index 769a436778..13c1c162f1 100644 --- a/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-katharsis/src/test/java/com/baeldung/SpringContextTest.java @@ -1,6 +1,5 @@ -package org.baeldung; +package com.baeldung; -import org.baeldung.Application; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java b/spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java similarity index 94% rename from spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java rename to spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java index e512202d96..a7c60d4a90 100644 --- a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java +++ b/spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java @@ -1,4 +1,4 @@ -package org.baeldung.test; +package com.baeldung.test; import static org.junit.Assert.assertEquals; From f7415f1da1d04c5bb319fd795ec6294944525af2 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:04:20 +0100 Subject: [PATCH 02/13] JAVA-959: Migrate spring-cucumber to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-cucumber/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-cucumber/src/test/java/org/baeldung/SpringContextTest.java b/spring-cucumber/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-cucumber/src/test/java/org/baeldung/SpringContextTest.java rename to spring-cucumber/src/test/java/com/baeldung/SpringContextTest.java index 7b8fa74fc9..3226da4bdc 100644 --- a/spring-cucumber/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 5a9ac3ce57c71d24f4163bc479ae92621a0df383 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:06:06 +0100 Subject: [PATCH 03/13] JAVA-959: Migrate spring-data-rest to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-data-rest/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-data-rest/src/test/java/org/baeldung/SpringContextTest.java b/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-data-rest/src/test/java/org/baeldung/SpringContextTest.java rename to spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java index 7e7fccadef..8fa0a4c239 100644 --- a/spring-data-rest/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-data-rest/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 6906bb047dde7a1be84b27fd6f6c907b4b443cc0 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:09:04 +0100 Subject: [PATCH 04/13] JAVA-959: Migrate spring-di to com.baeldung --- .../baeldung/store/AppConfig.java | 2 +- .../{org => com}/baeldung/store/Item.java | 2 +- .../baeldung/store/ItemImpl1.java | 2 +- .../{org => com}/baeldung/store/Store.java | 2 +- .../main/resources/ioc-context-by-type.xml | 4 +- spring-di/src/main/resources/ioc-context.xml | 14 ++-- .../baeldung/store/AppConfigUnitTest.java | 70 +++++++++---------- .../store/XmlAppConfigByTypeUnitTest.java | 2 +- .../baeldung/store/XmlAppConfigUnitTest.java | 2 +- 9 files changed, 50 insertions(+), 50 deletions(-) rename spring-di/src/main/java/{org => com}/baeldung/store/AppConfig.java (93%) rename spring-di/src/main/java/{org => com}/baeldung/store/Item.java (50%) rename spring-di/src/main/java/{org => com}/baeldung/store/ItemImpl1.java (61%) rename spring-di/src/main/java/{org => com}/baeldung/store/Store.java (92%) rename spring-di/src/test/java/{org => com}/baeldung/store/AppConfigUnitTest.java (94%) rename spring-di/src/test/java/{org => com}/baeldung/store/XmlAppConfigByTypeUnitTest.java (97%) rename spring-di/src/test/java/{org => com}/baeldung/store/XmlAppConfigUnitTest.java (98%) diff --git a/spring-di/src/main/java/org/baeldung/store/AppConfig.java b/spring-di/src/main/java/com/baeldung/store/AppConfig.java similarity index 93% rename from spring-di/src/main/java/org/baeldung/store/AppConfig.java rename to spring-di/src/main/java/com/baeldung/store/AppConfig.java index 80b6733dff..0debecfc47 100644 --- a/spring-di/src/main/java/org/baeldung/store/AppConfig.java +++ b/spring-di/src/main/java/com/baeldung/store/AppConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.store; +package com.baeldung.store; import org.springframework.context.annotation.Bean; diff --git a/spring-di/src/main/java/org/baeldung/store/Item.java b/spring-di/src/main/java/com/baeldung/store/Item.java similarity index 50% rename from spring-di/src/main/java/org/baeldung/store/Item.java rename to spring-di/src/main/java/com/baeldung/store/Item.java index 1d7292fc35..8598c2e1b3 100644 --- a/spring-di/src/main/java/org/baeldung/store/Item.java +++ b/spring-di/src/main/java/com/baeldung/store/Item.java @@ -1,4 +1,4 @@ -package org.baeldung.store; +package com.baeldung.store; public interface Item { diff --git a/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java b/spring-di/src/main/java/com/baeldung/store/ItemImpl1.java similarity index 61% rename from spring-di/src/main/java/org/baeldung/store/ItemImpl1.java rename to spring-di/src/main/java/com/baeldung/store/ItemImpl1.java index 8bda9f24c9..516882c99f 100644 --- a/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java +++ b/spring-di/src/main/java/com/baeldung/store/ItemImpl1.java @@ -1,4 +1,4 @@ -package org.baeldung.store; +package com.baeldung.store; public class ItemImpl1 implements Item { diff --git a/spring-di/src/main/java/org/baeldung/store/Store.java b/spring-di/src/main/java/com/baeldung/store/Store.java similarity index 92% rename from spring-di/src/main/java/org/baeldung/store/Store.java rename to spring-di/src/main/java/com/baeldung/store/Store.java index dcc2c3be48..cc40f74306 100644 --- a/spring-di/src/main/java/org/baeldung/store/Store.java +++ b/spring-di/src/main/java/com/baeldung/store/Store.java @@ -1,4 +1,4 @@ -package org.baeldung.store; +package com.baeldung.store; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-di/src/main/resources/ioc-context-by-type.xml b/spring-di/src/main/resources/ioc-context-by-type.xml index 1249ce51af..cba8b17a30 100644 --- a/spring-di/src/main/resources/ioc-context-by-type.xml +++ b/spring-di/src/main/resources/ioc-context-by-type.xml @@ -6,9 +6,9 @@ - + - + \ No newline at end of file diff --git a/spring-di/src/main/resources/ioc-context.xml b/spring-di/src/main/resources/ioc-context.xml index 0e1d0ac29c..64b1bc5443 100644 --- a/spring-di/src/main/resources/ioc-context.xml +++ b/spring-di/src/main/resources/ioc-context.xml @@ -6,28 +6,28 @@ - - + + - + - + - + - - + + diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java similarity index 94% rename from spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java rename to spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java index 3260114679..d433ac6bf0 100644 --- a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java +++ b/spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java @@ -1,35 +1,35 @@ -package org.baeldung.store; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = AppConfig.class) -public class AppConfigUnitTest { - - @Autowired - @Qualifier("storeThroughConstructorInjection") - private Store storeByConstructorInjection; - - @Autowired - @Qualifier("storeThroughSetterInjection") - private Store storeBySetterInjection; - - @Test - public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() { - assertNotNull(storeByConstructorInjection); - assertNotNull(storeByConstructorInjection.getItem()); - } - - @Test - public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() { - assertNotNull(storeBySetterInjection); - assertNotNull(storeByConstructorInjection.getItem()); - } -} +package com.baeldung.store; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = AppConfig.class) +public class AppConfigUnitTest { + + @Autowired + @Qualifier("storeThroughConstructorInjection") + private Store storeByConstructorInjection; + + @Autowired + @Qualifier("storeThroughSetterInjection") + private Store storeBySetterInjection; + + @Test + public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() { + assertNotNull(storeByConstructorInjection); + assertNotNull(storeByConstructorInjection.getItem()); + } + + @Test + public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() { + assertNotNull(storeBySetterInjection); + assertNotNull(storeByConstructorInjection.getItem()); + } +} diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java similarity index 97% rename from spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java rename to spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java index 036399e537..dbed822e46 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java +++ b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java @@ -1,4 +1,4 @@ -package org.baeldung.store; +package com.baeldung.store; import static org.junit.Assert.assertNotNull; diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java similarity index 98% rename from spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java rename to spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java index 2dd4d6ccd6..90c55c263c 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java +++ b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java @@ -1,4 +1,4 @@ -package org.baeldung.store; +package com.baeldung.store; import static org.junit.Assert.assertNotNull; From b562541229fdb85ace884ea8aeaacb0c6ddb6c3d Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:14:16 +0100 Subject: [PATCH 05/13] JAVA-959: Migrate spring-dispatcher-servlet to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-dispatcher-servlet/src/test/java/{org => com}/baeldung/SpringContextTest.java (96%) diff --git a/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextTest.java b/spring-dispatcher-servlet/src/test/java/com/baeldung/SpringContextTest.java similarity index 96% rename from spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextTest.java rename to spring-dispatcher-servlet/src/test/java/com/baeldung/SpringContextTest.java index d1de77b1e6..ba8040f81d 100644 --- a/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-dispatcher-servlet/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From d599c350b83c13acc9deb4b987246d2753604ec6 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:16:40 +0100 Subject: [PATCH 06/13] JAVA-959: Migrate spring-drools to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-drools/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-drools/src/test/java/org/baeldung/SpringContextTest.java b/spring-drools/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-drools/src/test/java/org/baeldung/SpringContextTest.java rename to spring-drools/src/test/java/com/baeldung/SpringContextTest.java index 9a36a521f1..fdaf0b17d0 100644 --- a/spring-drools/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-drools/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From f8d26a9a8a98ea6375ec45e386b6a3abf9e4f965 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:18:00 +0100 Subject: [PATCH 07/13] JAVA-959: Migrate spring-freemarker to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-freemarker/src/test/java/{org => com}/baeldung/SpringContextTest.java (96%) diff --git a/spring-freemarker/src/test/java/org/baeldung/SpringContextTest.java b/spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java similarity index 96% rename from spring-freemarker/src/test/java/org/baeldung/SpringContextTest.java rename to spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java index 49b8fe94d1..32db673519 100644 --- a/spring-freemarker/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 0b918bc8dd4a04e04a4a0503ec3829353baf805f Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:20:18 +0100 Subject: [PATCH 08/13] JAVA-959: Migrate spring-integration to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-integration/src/test/java/{org => com}/baeldung/SpringContextTest.java (96%) diff --git a/spring-integration/src/test/java/org/baeldung/SpringContextTest.java b/spring-integration/src/test/java/com/baeldung/SpringContextTest.java similarity index 96% rename from spring-integration/src/test/java/org/baeldung/SpringContextTest.java rename to spring-integration/src/test/java/com/baeldung/SpringContextTest.java index e45997b71e..60050eafa0 100644 --- a/spring-integration/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-integration/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From d1ea789403da273bc3aa06a5e6988b00a4192cb8 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:23:26 +0100 Subject: [PATCH 09/13] JAVA-959: Migrate spring-jenkins-pipeline to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-jenkins-pipeline/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextTest.java b/spring-jenkins-pipeline/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextTest.java rename to spring-jenkins-pipeline/src/test/java/com/baeldung/SpringContextTest.java index 79ab2f48b8..932d390201 100644 --- a/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-jenkins-pipeline/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From b08c55943a9d7aba5ea87cc6cbb12bd72139a7e9 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:27:26 +0100 Subject: [PATCH 10/13] JAVA-959: Migrate spring-jersey to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-jersey/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-jersey/src/test/java/org/baeldung/SpringContextTest.java b/spring-jersey/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-jersey/src/test/java/org/baeldung/SpringContextTest.java rename to spring-jersey/src/test/java/com/baeldung/SpringContextTest.java index f480e597b3..c6b026f466 100644 --- a/spring-jersey/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-jersey/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From ba96736a64563fafbc20309ecc288f0a00f681c7 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:30:56 +0100 Subject: [PATCH 11/13] JAVA-959: Migrate spring-jms to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-jms/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-jms/src/test/java/org/baeldung/SpringContextTest.java b/spring-jms/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-jms/src/test/java/org/baeldung/SpringContextTest.java rename to spring-jms/src/test/java/com/baeldung/SpringContextTest.java index 11c9d9bca6..000474754f 100644 --- a/spring-jms/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-jms/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From ccbdc55cf0473eb80452404d71666cc74d391561 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:32:51 +0100 Subject: [PATCH 12/13] JAVA-959: Migrate spring-jinq to com.baeldung --- .../src/test/java/{org => com}/baeldung/SpringContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spring-jinq/src/test/java/{org => com}/baeldung/SpringContextTest.java (95%) diff --git a/spring-jinq/src/test/java/org/baeldung/SpringContextTest.java b/spring-jinq/src/test/java/com/baeldung/SpringContextTest.java similarity index 95% rename from spring-jinq/src/test/java/org/baeldung/SpringContextTest.java rename to spring-jinq/src/test/java/com/baeldung/SpringContextTest.java index e0da75c7af..86c529e574 100644 --- a/spring-jinq/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-jinq/src/test/java/com/baeldung/SpringContextTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; From 90075c2f38e6becd03ab1cfa6cee6bb4817213b3 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Wed, 11 Mar 2020 21:34:23 +0100 Subject: [PATCH 13/13] JAVA-959: Migrate spring-kafka to com.baeldung --- .../test/java/{org => com}/baeldung/SpringContextLiveTest.java | 2 +- .../java/{org => com}/baeldung/SpringContextManualTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename spring-kafka/src/test/java/{org => com}/baeldung/SpringContextLiveTest.java (95%) rename spring-kafka/src/test/java/{org => com}/baeldung/SpringContextManualTest.java (95%) diff --git a/spring-kafka/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-kafka/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 95% rename from spring-kafka/src/test/java/org/baeldung/SpringContextLiveTest.java rename to spring-kafka/src/test/java/com/baeldung/SpringContextLiveTest.java index d8fb3131f5..60262df9d4 100644 --- a/spring-kafka/src/test/java/org/baeldung/SpringContextLiveTest.java +++ b/spring-kafka/src/test/java/com/baeldung/SpringContextLiveTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-kafka/src/test/java/org/baeldung/SpringContextManualTest.java b/spring-kafka/src/test/java/com/baeldung/SpringContextManualTest.java similarity index 95% rename from spring-kafka/src/test/java/org/baeldung/SpringContextManualTest.java rename to spring-kafka/src/test/java/com/baeldung/SpringContextManualTest.java index b8195633fd..0d2c19136f 100644 --- a/spring-kafka/src/test/java/org/baeldung/SpringContextManualTest.java +++ b/spring-kafka/src/test/java/com/baeldung/SpringContextManualTest.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith;