diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml index f89a093f30..12b6972a79 100644 --- a/spring-core-2/pom.xml +++ b/spring-core-2/pom.xml @@ -201,7 +201,7 @@ - org.baeldung.sample.App + com.baeldung.sample.App 5.0.6.RELEASE 1.3.2 diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java similarity index 90% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java index ed0c90d5b1..18ff11a49c 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java similarity index 66% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java index 117dfe1027..f948e2bf8e 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java @@ -1,10 +1,10 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("org.baeldung.autowire.sample") +@ComponentScan("com.baeldung.autowire.sample") public class AppConfig { } diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java similarity index 83% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java index f7e730fdc6..e67a376d25 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java new file mode 100644 index 0000000000..aec26202ab --- /dev/null +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java @@ -0,0 +1,5 @@ +package com.baeldung.autowire.sample; + +public class FooDAO { + +} diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java similarity index 83% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java index 5fdacbadd4..57f93a53d7 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java similarity index 88% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java index a3638960cc..c55d93da11 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java similarity index 59% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java index 05cd5f1c26..59d718050a 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; public interface Formatter { diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java rename to spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java index ea1eec055a..f2961745b5 100644 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java +++ b/spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java b/spring-core-2/src/main/java/com/baeldung/bean/config/ConstructorBasedShipConfig.java similarity index 73% rename from spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java rename to spring-core-2/src/main/java/com/baeldung/bean/config/ConstructorBasedShipConfig.java index f0e6e8868e..f9f23ee304 100644 --- a/spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/bean/config/ConstructorBasedShipConfig.java @@ -1,7 +1,7 @@ -package org.baeldung.bean.config; +package com.baeldung.bean.config; -import org.baeldung.bean.injection.Helm; -import org.baeldung.bean.injection.Ship; +import com.baeldung.bean.injection.Helm; +import com.baeldung.bean.injection.Ship; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java b/spring-core-2/src/main/java/com/baeldung/bean/config/SetterBasedShipConfig.java similarity index 66% rename from spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java rename to spring-core-2/src/main/java/com/baeldung/bean/config/SetterBasedShipConfig.java index 7cd6de1c74..cea6385fd9 100644 --- a/spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/bean/config/SetterBasedShipConfig.java @@ -1,7 +1,7 @@ -package org.baeldung.bean.config; +package com.baeldung.bean.config; -import org.baeldung.bean.injection.Helm; -import org.baeldung.bean.injection.Ship; +import com.baeldung.bean.injection.Helm; +import com.baeldung.bean.injection.Ship; import org.springframework.context.annotation.Bean; public class SetterBasedShipConfig { diff --git a/spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java b/spring-core-2/src/main/java/com/baeldung/bean/injection/Helm.java similarity index 86% rename from spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java rename to spring-core-2/src/main/java/com/baeldung/bean/injection/Helm.java index 86f71ce795..e1477bd0d9 100644 --- a/spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java +++ b/spring-core-2/src/main/java/com/baeldung/bean/injection/Helm.java @@ -1,4 +1,4 @@ -package org.baeldung.bean.injection; +package com.baeldung.bean.injection; public class Helm { diff --git a/spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java b/spring-core-2/src/main/java/com/baeldung/bean/injection/Ship.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java rename to spring-core-2/src/main/java/com/baeldung/bean/injection/Ship.java index 69d9fa1276..f69a3a51ca 100644 --- a/spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java +++ b/spring-core-2/src/main/java/com/baeldung/bean/injection/Ship.java @@ -1,4 +1,4 @@ -package org.baeldung.bean.injection; +package com.baeldung.bean.injection; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java b/spring-core-2/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java similarity index 68% rename from spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java rename to spring-core-2/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java index b8f312d778..2e42a3f744 100644 --- a/spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java +++ b/spring-core-2/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java @@ -1,9 +1,9 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("org.baeldung.customannotation") +@ComponentScan("com.baeldung.customannotation") public class CustomAnnotationConfiguration { } diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccess.java similarity index 90% rename from spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java rename to spring-core-2/src/main/java/com/baeldung/customannotation/DataAccess.java index 9a8a493a6d..4160bad16d 100644 --- a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java +++ b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccess.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java similarity index 97% rename from spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java rename to spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java index c792073745..27008176a8 100644 --- a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java +++ b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java similarity index 99% rename from spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java rename to spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java index 8cb62affc4..07b5298ea9 100644 --- a/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java +++ b/spring-core-2/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java b/spring-core-2/src/main/java/com/baeldung/customannotation/GenericDAO.java similarity index 94% rename from spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java rename to spring-core-2/src/main/java/com/baeldung/customannotation/GenericDAO.java index 1916b7de6e..0edd33b049 100644 --- a/spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java +++ b/spring-core-2/src/main/java/com/baeldung/customannotation/GenericDAO.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import java.util.Collections; import java.util.List; diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBean.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantBean.java index 874fcda9f2..e892ae9d9b 100644 --- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java +++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBean.java @@ -1,4 +1,4 @@ -package org.baeldung.customscope; +package com.baeldung.customscope; public class TenantBean { diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeanFactoryPostProcessor.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantBeanFactoryPostProcessor.java index 2757399fa6..84ed0b46d7 100644 --- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java +++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeanFactoryPostProcessor.java @@ -1,4 +1,4 @@ -package org.baeldung.customscope; +package com.baeldung.customscope; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeansConfig.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantBeansConfig.java index be3ac001fb..c219000fe6 100644 --- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantBeansConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.customscope; +package com.baeldung.customscope; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScope.java similarity index 97% rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantScope.java index 144d092be6..f3077bc4c2 100644 --- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java +++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScope.java @@ -1,4 +1,4 @@ -package org.baeldung.customscope; +package com.baeldung.customscope; import java.util.Collections; import java.util.HashMap; diff --git a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScopeConfig.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java rename to spring-core-2/src/main/java/com/baeldung/customscope/TenantScopeConfig.java index d1159b0f60..1829e1e8c4 100644 --- a/spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/customscope/TenantScopeConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.customscope; +package com.baeldung.customscope; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.context.annotation.Bean; diff --git a/spring-core-2/src/main/java/org/baeldung/nullibility/Person.java b/spring-core-2/src/main/java/com/baeldung/nullibility/Person.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/nullibility/Person.java rename to spring-core-2/src/main/java/com/baeldung/nullibility/Person.java index 08c77c9e9c..8fb60fb7a7 100644 --- a/spring-core-2/src/main/java/org/baeldung/nullibility/Person.java +++ b/spring-core-2/src/main/java/com/baeldung/nullibility/Person.java @@ -1,4 +1,4 @@ -package org.baeldung.nullibility; +package com.baeldung.nullibility; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java b/spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java similarity index 77% rename from spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java rename to spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java index 446f2e316e..11a3f7c7aa 100644 --- a/spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java +++ b/spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java @@ -1,6 +1,6 @@ @NonNullApi @NonNullFields -package org.baeldung.nullibility; +package com.baeldung.nullibility; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-core-2/src/main/java/org/baeldung/order/Average.java b/spring-core-2/src/main/java/com/baeldung/order/Average.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/order/Average.java rename to spring-core-2/src/main/java/com/baeldung/order/Average.java index 3deffaf1ae..0f84f1b436 100644 --- a/spring-core-2/src/main/java/org/baeldung/order/Average.java +++ b/spring-core-2/src/main/java/com/baeldung/order/Average.java @@ -1,4 +1,4 @@ -package org.baeldung.order; +package com.baeldung.order; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/spring-core-2/src/main/java/org/baeldung/order/Excellent.java b/spring-core-2/src/main/java/com/baeldung/order/Excellent.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/order/Excellent.java rename to spring-core-2/src/main/java/com/baeldung/order/Excellent.java index 96fea4ac9b..5fd1d18796 100644 --- a/spring-core-2/src/main/java/org/baeldung/order/Excellent.java +++ b/spring-core-2/src/main/java/com/baeldung/order/Excellent.java @@ -1,4 +1,4 @@ -package org.baeldung.order; +package com.baeldung.order; import org.springframework.stereotype.Component; import org.springframework.core.annotation.Order; diff --git a/spring-core-2/src/main/java/org/baeldung/order/Good.java b/spring-core-2/src/main/java/com/baeldung/order/Good.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/order/Good.java rename to spring-core-2/src/main/java/com/baeldung/order/Good.java index 4b3e268504..a176904c64 100644 --- a/spring-core-2/src/main/java/org/baeldung/order/Good.java +++ b/spring-core-2/src/main/java/com/baeldung/order/Good.java @@ -1,4 +1,4 @@ -package org.baeldung.order; +package com.baeldung.order; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/order/Rating.java b/spring-core-2/src/main/java/com/baeldung/order/Rating.java similarity index 66% rename from spring-core-2/src/main/java/org/baeldung/order/Rating.java rename to spring-core-2/src/main/java/com/baeldung/order/Rating.java index 10f2780522..9125019b5c 100644 --- a/spring-core-2/src/main/java/org/baeldung/order/Rating.java +++ b/spring-core-2/src/main/java/com/baeldung/order/Rating.java @@ -1,4 +1,4 @@ -package org.baeldung.order; +package com.baeldung.order; public interface Rating { diff --git a/spring-core-2/src/main/java/org/baeldung/persistence/Setup.java b/spring-core-2/src/main/java/com/baeldung/persistence/Setup.java similarity index 94% rename from spring-core-2/src/main/java/org/baeldung/persistence/Setup.java rename to spring-core-2/src/main/java/com/baeldung/persistence/Setup.java index 5cba4e70fb..251ea4654c 100644 --- a/spring-core-2/src/main/java/org/baeldung/persistence/Setup.java +++ b/spring-core-2/src/main/java/com/baeldung/persistence/Setup.java @@ -1,4 +1,4 @@ -package org.baeldung.persistence; +package com.baeldung.persistence; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; diff --git a/spring-core-2/src/main/java/org/baeldung/primary/Config.java b/spring-core-2/src/main/java/com/baeldung/primary/Config.java similarity index 84% rename from spring-core-2/src/main/java/org/baeldung/primary/Config.java rename to spring-core-2/src/main/java/com/baeldung/primary/Config.java index bdcfe019e6..eec9fb2ceb 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/Config.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/Config.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @Configuration -@ComponentScan(basePackages="org.baeldung.primary") +@ComponentScan(basePackages="com.baeldung.primary") public class Config { @Bean diff --git a/spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java b/spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java similarity index 87% rename from spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java rename to spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java index 2603951b4e..161b39337b 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/primary/Employee.java b/spring-core-2/src/main/java/com/baeldung/primary/Employee.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/primary/Employee.java rename to spring-core-2/src/main/java/com/baeldung/primary/Employee.java index 9168387613..48c5502921 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/Employee.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/Employee.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; /** * Created by Gebruiker on 7/17/2018. diff --git a/spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java b/spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java rename to spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java index 0a94f0f96a..80b5a79471 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/primary/Manager.java b/spring-core-2/src/main/java/com/baeldung/primary/Manager.java similarity index 77% rename from spring-core-2/src/main/java/org/baeldung/primary/Manager.java rename to spring-core-2/src/main/java/com/baeldung/primary/Manager.java index 4666a1babf..45e02b2b05 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/Manager.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/Manager.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; /** * Created by Gebruiker on 7/19/2018. diff --git a/spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java b/spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java rename to spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java index 94ea6785c9..86390327c2 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java b/spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java rename to spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java index ffa2a4028d..f66bf8285b 100644 --- a/spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java +++ b/spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.primary; +package com.baeldung.primary; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java similarity index 64% rename from spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java rename to spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java index 8fde925fd8..9724477666 100644 --- a/spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; public interface DatasourceConfig { void setup(); diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java rename to spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java index e357280c43..b4b14eaf50 100644 --- a/spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java similarity index 91% rename from spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java rename to spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java index f1adff9c96..57943d1b17 100644 --- a/spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java b/spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java rename to spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java index b4cb10e690..81d4592782 100644 --- a/spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java +++ b/spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java b/spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java similarity index 80% rename from spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java rename to spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java index 2d1905ee9c..cdd96ad953 100644 --- a/spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java @@ -1,11 +1,11 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @Configuration -@ComponentScan("org.baeldung.profiles") +@ComponentScan("com.baeldung.profiles") @PropertySource(value = "classpath:application.properties") public class SpringProfilesConfig { diff --git a/spring-core-2/src/main/java/com/baeldung/sample/Bar.java b/spring-core-2/src/main/java/com/baeldung/sample/Bar.java new file mode 100644 index 0000000000..42302b5563 --- /dev/null +++ b/spring-core-2/src/main/java/com/baeldung/sample/Bar.java @@ -0,0 +1,5 @@ +package com.baeldung.sample; + +public class Bar { + +} diff --git a/spring-core-2/src/main/java/com/baeldung/sample/Foo.java b/spring-core-2/src/main/java/com/baeldung/sample/Foo.java new file mode 100644 index 0000000000..b25c9ecfb5 --- /dev/null +++ b/spring-core-2/src/main/java/com/baeldung/sample/Foo.java @@ -0,0 +1,5 @@ +package com.baeldung.sample; + +public class Foo { + +} diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BallService.java similarity index 94% rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/BallService.java index 9a75de7fa1..0d951aac8b 100644 --- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java +++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BallService.java @@ -1,4 +1,4 @@ -package org.baeldung.sampleabstract; +package com.baeldung.sampleabstract; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BasketballService.java similarity index 88% rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/BasketballService.java index c117231d3c..4d6345b069 100644 --- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java +++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/BasketballService.java @@ -1,4 +1,4 @@ -package org.baeldung.sampleabstract; +package com.baeldung.sampleabstract; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/DemoApp.java similarity index 82% rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/DemoApp.java index 615d354ecf..5a308b2671 100644 --- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java +++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/DemoApp.java @@ -1,4 +1,4 @@ -package org.baeldung.sampleabstract; +package com.baeldung.sampleabstract; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan(basePackages = "org.baeldung.sampleabstract") +@ComponentScan(basePackages = "com.baeldung.sampleabstract") public class DemoApp { diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/LogRepository.java similarity index 82% rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/LogRepository.java index 3a65671493..84979768b5 100644 --- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java +++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/LogRepository.java @@ -1,4 +1,4 @@ -package org.baeldung.sampleabstract; +package com.baeldung.sampleabstract; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java b/spring-core-2/src/main/java/com/baeldung/sampleabstract/RuleRepository.java similarity index 82% rename from spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java rename to spring-core-2/src/main/java/com/baeldung/sampleabstract/RuleRepository.java index fd42178ab6..a1c5b5067f 100644 --- a/spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java +++ b/spring-core-2/src/main/java/com/baeldung/sampleabstract/RuleRepository.java @@ -1,4 +1,4 @@ -package org.baeldung.sampleabstract; +package com.baeldung.sampleabstract; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java b/spring-core-2/src/main/java/com/baeldung/scopes/HelloMessageGenerator.java similarity index 88% rename from spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java rename to spring-core-2/src/main/java/com/baeldung/scopes/HelloMessageGenerator.java index 562069bc9a..9b912fc04e 100644 --- a/spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java +++ b/spring-core-2/src/main/java/com/baeldung/scopes/HelloMessageGenerator.java @@ -1,4 +1,4 @@ -package org.baeldung.scopes; +package com.baeldung.scopes; public class HelloMessageGenerator { diff --git a/spring-core-2/src/main/java/org/baeldung/scopes/Person.java b/spring-core-2/src/main/java/com/baeldung/scopes/Person.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/scopes/Person.java rename to spring-core-2/src/main/java/com/baeldung/scopes/Person.java index b070007a5c..e2ea2ce1d7 100644 --- a/spring-core-2/src/main/java/org/baeldung/scopes/Person.java +++ b/spring-core-2/src/main/java/com/baeldung/scopes/Person.java @@ -1,4 +1,4 @@ -package org.baeldung.scopes; +package com.baeldung.scopes; public class Person { private String name; diff --git a/spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-core-2/src/main/java/com/baeldung/scopes/ScopesController.java similarity index 98% rename from spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java rename to spring-core-2/src/main/java/com/baeldung/scopes/ScopesController.java index 9257a3aa3a..1ca4dc4050 100644 --- a/spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java +++ b/spring-core-2/src/main/java/com/baeldung/scopes/ScopesController.java @@ -1,4 +1,4 @@ -package org.baeldung.scopes; +package com.baeldung.scopes; import javax.annotation.Resource; diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java b/spring-core-2/src/main/java/com/baeldung/spring/config/CleanupBean.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java rename to spring-core-2/src/main/java/com/baeldung/spring/config/CleanupBean.java index ac90319745..155b8af9c4 100644 --- a/spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java +++ b/spring-core-2/src/main/java/com/baeldung/spring/config/CleanupBean.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.config; +package com.baeldung.spring.config; import java.util.concurrent.ExecutorService; diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/CoreConfig.java similarity index 92% rename from spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java rename to spring-core-2/src/main/java/com/baeldung/spring/config/CoreConfig.java index 0d753dc447..35d245a17e 100644 --- a/spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/spring/config/CoreConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.config; +package com.baeldung.spring.config; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -@ComponentScan("org.baeldung.core") +@ComponentScan("com.baeldung.core") public class CoreConfig implements WebMvcConfigurer { public CoreConfig() { diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java b/spring-core-2/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java rename to spring-core-2/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java index 9f4b73f609..dd396a653f 100644 --- a/spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java +++ b/spring-core-2/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.config; +package com.baeldung.spring.config; import java.util.Set; @@ -26,7 +26,7 @@ public class MainWebAppInitializer implements WebApplicationInitializer // Create the 'root' Spring application context final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); - root.scan("org.baeldung.spring.config"); + root.scan("com.baeldung.spring.config"); // root.getEnvironment().setDefaultProfiles("embedded"); sc.addListener(new ContextLoaderListener(root)); diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/MvcConfig.java similarity index 96% rename from spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java rename to spring-core-2/src/main/java/com/baeldung/spring/config/MvcConfig.java index e550733c47..cd31cd1128 100644 --- a/spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/spring/config/MvcConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.config; +package com.baeldung.spring.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/PersistenceConfig.java similarity index 94% rename from spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java rename to spring-core-2/src/main/java/com/baeldung/spring/config/PersistenceConfig.java index ffe88596fa..f27543af46 100644 --- a/spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/spring/config/PersistenceConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.config; +package com.baeldung.spring.config; import java.util.Properties; @@ -20,7 +20,7 @@ import com.google.common.base.Preconditions; // @Configuration @EnableTransactionManagement @PropertySource({ "classpath:persistence-mysql.properties" }) -@ComponentScan({ "org.baeldung.persistence" }) +@ComponentScan({ "com.baeldung.persistence" }) public class PersistenceConfig { @Autowired @@ -34,7 +34,7 @@ public class PersistenceConfig { public LocalSessionFactoryBean sessionFactory() { final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean(); sessionFactory.setDataSource(restDataSource()); - sessionFactory.setPackagesToScan(new String[] { "org.baeldung.spring.persistence.model" }); + sessionFactory.setPackagesToScan(new String[] { "com.baeldung.spring.persistence.model" }); sessionFactory.setHibernateProperties(hibernateProperties()); return sessionFactory; diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-core-2/src/main/java/com/baeldung/spring/config/ScopesConfig.java similarity index 100% rename from spring-core-2/src/main/java/org/baeldung/spring/config/ScopesConfig.java rename to spring-core-2/src/main/java/com/baeldung/spring/config/ScopesConfig.java diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java b/spring-core-2/src/main/java/com/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java rename to spring-core-2/src/main/java/com/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java index 082a986974..085f3b0706 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.asynchronous; +package com.baeldung.springevents.asynchronous; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -8,7 +8,7 @@ import org.springframework.context.event.SimpleApplicationEventMulticaster; import org.springframework.core.task.SimpleAsyncTaskExecutor; @Configuration -@ComponentScan("org.baeldung.springevents.synchronous") +@ComponentScan("com.baeldung.springevents.synchronous") public class AsynchronousSpringEventsConfig { @Bean(name = "applicationEventMulticaster") diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java similarity index 97% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java index f750c40a6e..bbb2b5f008 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.event.ContextStartedEvent; import org.springframework.context.event.EventListener; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/ContextRefreshedListener.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/ContextRefreshedListener.java index 9f8b2e6e83..31a6c78d00 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/ContextRefreshedListener.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEvent.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEvent.java index 1631801ffe..3cf4980be3 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEvent.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.ApplicationEvent; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventListener.java similarity index 89% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventListener.java index 69f96966ec..ff7ca7fe39 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventListener.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventPublisher.java similarity index 96% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventPublisher.java index 3182090d5d..e4d7fcdc99 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/CustomSpringEventPublisher.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringAppEvent.java similarity index 87% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringAppEvent.java index 6804312189..8a50a55f31 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringAppEvent.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.ApplicationEvent; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEvent.java similarity index 88% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEvent.java index ce2c223fec..86471221d2 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEvent.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; public class GenericSpringEvent { diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEventListener.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEventListener.java index 1f5e3e7068..7b0a9727e4 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericSpringEventListener.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.ApplicationListener; import org.springframework.lang.NonNull; diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java similarity index 80% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java index fd214696e7..74839b4708 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; class GenericStringSpringAppEvent extends GenericSpringAppEvent { diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringEvent.java similarity index 80% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringEvent.java index dd4e4e3ed4..70dda99aa3 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/GenericStringSpringEvent.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; public class GenericStringSpringEvent extends GenericSpringEvent { diff --git a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java similarity index 64% rename from spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java rename to spring-core-2/src/main/java/com/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java index fff8a7e4b5..58cb220ecb 100644 --- a/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java @@ -1,10 +1,10 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("org.baeldung.springevents.synchronous") +@ComponentScan("com.baeldung.springevents.synchronous") public class SynchronousSpringEventsConfig { } diff --git a/spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java similarity index 96% rename from spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java index f36b8703ea..e08309d474 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/EventListenerExampleBean.java similarity index 94% rename from spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/EventListenerExampleBean.java index 58e42337cc..a76fc6a2b2 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/EventListenerExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/InitMethodExampleBean.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/InitMethodExampleBean.java index f3d30011f8..a3b12028d1 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/InitMethodExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import java.util.Arrays; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java similarity index 96% rename from spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java index 5d6f8c9d88..c625a172fd 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import java.util.Arrays; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java similarity index 93% rename from spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java index 0b9c6f0c7d..d31aee8acd 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java index d25a83942a..ade7573bbe 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import java.util.Arrays; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java b/spring-core-2/src/main/java/com/baeldung/startup/PostConstructExampleBean.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java rename to spring-core-2/src/main/java/com/baeldung/startup/PostConstructExampleBean.java index 2397c3a0a2..1001043d86 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/PostConstructExampleBean.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import java.util.Arrays; diff --git a/spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java b/spring-core-2/src/main/java/com/baeldung/startup/SpringStartupConfig.java similarity index 71% rename from spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java rename to spring-core-2/src/main/java/com/baeldung/startup/SpringStartupConfig.java index 12854e1be5..ad6492dadc 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/SpringStartupConfig.java @@ -1,9 +1,9 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("org.baeldung.startup") +@ComponentScan("com.baeldung.startup") public class SpringStartupConfig { } \ No newline at end of file diff --git a/spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java b/spring-core-2/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java similarity index 95% rename from spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java rename to spring-core-2/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java index e02388dea3..2cc5e6abcb 100644 --- a/spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java +++ b/spring-core-2/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java deleted file mode 100644 index 3d3deaa077..0000000000 --- a/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.baeldung.autowire.sample; - -public class FooDAO { - -} diff --git a/spring-core-2/src/main/java/org/baeldung/sample/Bar.java b/spring-core-2/src/main/java/org/baeldung/sample/Bar.java deleted file mode 100644 index 54e8d54418..0000000000 --- a/spring-core-2/src/main/java/org/baeldung/sample/Bar.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.baeldung.sample; - -public class Bar { - -} diff --git a/spring-core-2/src/main/java/org/baeldung/sample/Foo.java b/spring-core-2/src/main/java/org/baeldung/sample/Foo.java deleted file mode 100644 index 562a00121a..0000000000 --- a/spring-core-2/src/main/java/org/baeldung/sample/Foo.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.baeldung.sample; - -public class Foo { - -} diff --git a/spring-core-2/src/main/resources/beanInjection-constructor.xml b/spring-core-2/src/main/resources/beanInjection-constructor.xml index 5a2ffe767c..cbb8f98bb9 100644 --- a/spring-core-2/src/main/resources/beanInjection-constructor.xml +++ b/spring-core-2/src/main/resources/beanInjection-constructor.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + \ No newline at end of file diff --git a/spring-core-2/src/main/resources/beanInjection-setter.xml b/spring-core-2/src/main/resources/beanInjection-setter.xml index 0e82e3be1c..1440df9702 100644 --- a/spring-core-2/src/main/resources/beanInjection-setter.xml +++ b/spring-core-2/src/main/resources/beanInjection-setter.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + \ No newline at end of file diff --git a/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml b/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml index 5fd2699b41..e3d7452eb1 100644 --- a/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml +++ b/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml @@ -4,7 +4,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > - + diff --git a/spring-core-2/src/main/resources/scopes.xml b/spring-core-2/src/main/resources/scopes.xml index 8fdb186c28..f7b554ec49 100644 --- a/spring-core-2/src/main/resources/scopes.xml +++ b/spring-core-2/src/main/resources/scopes.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + diff --git a/spring-core-2/src/main/resources/springProfiles-config.xml b/spring-core-2/src/main/resources/springProfiles-config.xml index 985ab6ba86..5eb6bfcd7f 100644 --- a/spring-core-2/src/main/resources/springProfiles-config.xml +++ b/spring-core-2/src/main/resources/springProfiles-config.xml @@ -6,10 +6,10 @@ > - + - + \ No newline at end of file diff --git a/spring-core-2/src/main/resources/startupConfig.xml b/spring-core-2/src/main/resources/startupConfig.xml index 8226665a90..d42e0f6c2b 100644 --- a/spring-core-2/src/main/resources/startupConfig.xml +++ b/spring-core-2/src/main/resources/startupConfig.xml @@ -4,13 +4,13 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> \ No newline at end of file diff --git a/spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java similarity index 94% rename from spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java index 941fc4baff..34ba7902ca 100644 --- a/spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.autowire.sample; +package com.baeldung.autowire.sample; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java similarity index 87% rename from spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java index 447a09d69e..fb3f973f29 100644 --- a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung.bean.injection; +package com.baeldung.bean.injection; -import org.baeldung.bean.config.ConstructorBasedShipConfig; +import com.baeldung.bean.config.ConstructorBasedShipConfig; import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java similarity index 95% rename from spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java index 9f6011d851..18ce5ce8ed 100644 --- a/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.bean.injection; +package com.baeldung.bean.injection; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java similarity index 87% rename from spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java index 1c15775093..1e2147d2bc 100644 --- a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung.bean.injection; +package com.baeldung.bean.injection; -import org.baeldung.bean.config.SetterBasedShipConfig; +import com.baeldung.bean.config.SetterBasedShipConfig; import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java similarity index 94% rename from spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java index bc17a08383..9c7526a7be 100644 --- a/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.bean.injection; +package com.baeldung.bean.injection; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/Account.java b/spring-core-2/src/test/java/com/baeldung/customannotation/Account.java similarity index 94% rename from spring-core-2/src/test/java/org/baeldung/customannotation/Account.java rename to spring-core-2/src/test/java/com/baeldung/customannotation/Account.java index 04545e5b83..cfdd8815e4 100644 --- a/spring-core-2/src/test/java/org/baeldung/customannotation/Account.java +++ b/spring-core-2/src/test/java/com/baeldung/customannotation/Account.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import java.io.Serializable; diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java b/spring-core-2/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java similarity index 89% rename from spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java rename to spring-core-2/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java index 9ba915f296..a0707f263b 100644 --- a/spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java +++ b/spring-core-2/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import org.springframework.stereotype.Repository; diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java similarity index 98% rename from spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java index ae3d53fb9b..1baea4505b 100644 --- a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java similarity index 98% rename from spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java index bab2574cd2..bc7a5f7246 100644 --- a/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/spring-core-2/src/test/java/org/baeldung/customannotation/Person.java b/spring-core-2/src/test/java/com/baeldung/customannotation/Person.java similarity index 92% rename from spring-core-2/src/test/java/org/baeldung/customannotation/Person.java rename to spring-core-2/src/test/java/com/baeldung/customannotation/Person.java index 3babc8f0a2..4fa70e51af 100644 --- a/spring-core-2/src/test/java/org/baeldung/customannotation/Person.java +++ b/spring-core-2/src/test/java/com/baeldung/customannotation/Person.java @@ -1,4 +1,4 @@ -package org.baeldung.customannotation; +package com.baeldung.customannotation; import java.io.Serializable; diff --git a/spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/customscope/TenantScopeIntegrationTest.java similarity index 96% rename from spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/customscope/TenantScopeIntegrationTest.java index e873ac5065..1cd7357a09 100644 --- a/spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/customscope/TenantScopeIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.customscope; +package com.baeldung.customscope; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -46,7 +46,7 @@ public class TenantScopeIntegrationTest { public final void whenComponentScan_thenContextContainsFooAndBar() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); try { - ctx.scan("org.baeldung.customscope"); + ctx.scan("com.baeldung.customscope"); ctx.refresh(); TenantBean foo = (TenantBean) ctx.getBean("foo", TenantBean.class); diff --git a/spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java b/spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java similarity index 93% rename from spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java rename to spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java index 96993ccd7c..342a4c5f05 100644 --- a/spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java +++ b/spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java @@ -1,4 +1,4 @@ -package org.baeldung.order; +package com.baeldung.order; import static org.hamcrest.CoreMatchers.equalTo; @@ -21,7 +21,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; public class RatingRetrieverUnitTest { @Configuration - @ComponentScan(basePackages = {"org.baeldung.order"}) + @ComponentScan(basePackages = {"com.baeldung.order"}) static class ContextConfiguration {} @Autowired diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java similarity index 96% rename from spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java index cf5ca132e6..81b136f5ba 100644 --- a/spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java similarity index 97% rename from spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java index 5bacaef07b..b863fe30c1 100644 --- a/spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java similarity index 96% rename from spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java index 929d088a14..60e9499d4b 100644 --- a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java similarity index 98% rename from spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java index 2b46a50588..4fc90b2e7c 100644 --- a/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.profiles; +package com.baeldung.profiles; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/scopes/ScopesIntegrationTest.java similarity index 98% rename from spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/scopes/ScopesIntegrationTest.java index 0ae99610f6..ae4df3b632 100644 --- a/spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/scopes/ScopesIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.scopes; +package com.baeldung.scopes; import org.junit.Assert; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java similarity index 88% rename from spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java index e12baed7e0..4f8035bcbe 100644 --- a/spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung.springevents.asynchronous; +package com.baeldung.springevents.asynchronous; -import org.baeldung.springevents.synchronous.CustomSpringEventPublisher; +import com.baeldung.springevents.synchronous.CustomSpringEventPublisher; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java similarity index 87% rename from spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java index e8e6f91b06..0ba43cdcbb 100644 --- a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java @@ -1,6 +1,5 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; -import org.baeldung.springevents.synchronous.SynchronousSpringEventsConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java similarity index 95% rename from spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java index f183314b6d..7f5314b420 100644 --- a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java similarity index 97% rename from spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java index b169cfec36..1d624d2289 100644 --- a/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.springevents.synchronous; +package com.baeldung.springevents.synchronous; import org.junit.Ignore; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java similarity index 98% rename from spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java index 6263482948..b58c093c31 100644 --- a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java similarity index 96% rename from spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java index a46d24fa3b..3dfd4835df 100644 --- a/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java +++ b/spring-core-2/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.startup; +package com.baeldung.startup; import org.junit.Test; import org.junit.runner.RunWith;