BAEL-20262: Migrate spring-core-2 module to the com.baeldung package

spring-core-2/pom.xml

@@ -201,7 +201,7 @@
     </profiles>
 
     <properties>
-        <start-class>org.baeldung.sample.App</start-class>
+        <start-class>com.baeldung.sample.App</start-class>
         <!-- Spring -->
         <org.springframework.version>5.0.6.RELEASE</org.springframework.version>
         <annotation-api.version>1.3.2</annotation-api.version>

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;
 

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 {
 
 }

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;
 

spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java

@@ -0,0 +1,5 @@
+package com.baeldung.autowire.sample;
+
+public class FooDAO {
+
+}

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;
 

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;

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 {
 

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;

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;
 

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 {

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 {
 

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;
 

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 {
 }

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;

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;

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;

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;

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 {
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 {
     

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;

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

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;
 

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.

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;

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.

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;

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;
 

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();

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;

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;

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;

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 {
 

spring-core-2/src/main/java/com/baeldung/sample/Bar.java

@@ -0,0 +1,5 @@
+package com.baeldung.sample;
+
+public class Bar {
+
+}

spring-core-2/src/main/java/com/baeldung/sample/Foo.java

@@ -0,0 +1,5 @@
+package com.baeldung.sample;
+
+public class Foo {
+
+}

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;
 

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;

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 {
 
 

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;
 

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;
 

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 {
 

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;

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;
 

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;
 

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() {

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));

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;

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;

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")

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;

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;

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;
 

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;

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;

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;
 

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<T> {
 

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;

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<String> {
 

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<String> {
 

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 {
 
 }

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;

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;

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;
 

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;
 

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;

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;
 

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;
 

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 {
 }

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;

spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java

@@ -1,5 +0,0 @@
-package org.baeldung.autowire.sample;
-
-public class FooDAO {
-
-}

spring-core-2/src/main/java/org/baeldung/sample/Bar.java

@@ -1,5 +0,0 @@
-package org.baeldung.sample;
-
-public class Bar {
-
-}

spring-core-2/src/main/java/org/baeldung/sample/Foo.java

@@ -1,5 +0,0 @@
-package org.baeldung.sample;
-
-public class Foo {
-
-}

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">
 
-    <bean id="ship" class="org.baeldung.bean.injection.Ship">
+    <bean id="ship" class="com.baeldung.bean.injection.Ship">
         <constructor-arg>
             <ref bean="helm"/>
         </constructor-arg>
     </bean>
 
-    <bean id="helm" class="org.baeldung.bean.injection.Helm"/>
+    <bean id="helm" class="com.baeldung.bean.injection.Helm"/>
 
 </beans>

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">
 
-    <bean id="ship" class="org.baeldung.bean.injection.Ship">
+    <bean id="ship" class="com.baeldung.bean.injection.Ship">
         <property name="helm">
             <ref bean="helm"/>
         </property>
     </bean>
 
-    <bean id="helm" class="org.baeldung.bean.injection.Helm"/>
+    <bean id="helm" class="com.baeldung.bean.injection.Helm"/>
 </beans>

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"
 >
 
-    <bean id="employeeDao" class="org.baeldung.jdbc.EmployeeDAO">
+    <bean id="employeeDao" class="com.baeldung.jdbc.EmployeeDAO">
         <property name="dataSource" ref="dataSource"/>
     </bean>
 

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">
 
-    <bean id="personSingleton" class="org.baeldung.scopes.Person" scope="singleton"/>
+    <bean id="personSingleton" class="com.baeldung.scopes.Person" scope="singleton"/>
 
-    <bean id="personPrototype" class="org.baeldung.scopes.Person" scope="prototype"/>
+    <bean id="personPrototype" class="com.baeldung.scopes.Person" scope="prototype"/>
 
 </beans>

spring-core-2/src/main/resources/springProfiles-config.xml

@@ -6,10 +6,10 @@
 >
 
     <beans profile="dev">
-        <bean id="devDatasourceConfig" class="org.baeldung.profiles.DevDatasourceConfig"/>
+        <bean id="devDatasourceConfig" class="com.baeldung.profiles.DevDatasourceConfig"/>
     </beans>
 
     <beans profile="production">
-        <bean id="productionDatasourceConfig" class="org.baeldung.profiles.ProductionDatasourceConfig"/>
+        <bean id="productionDatasourceConfig" class="com.baeldung.profiles.ProductionDatasourceConfig"/>
     </beans>
 </beans>

spring-core-2/src/main/resources/startupConfig.xml

@@ -4,13 +4,13 @@
 	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
     <bean id="initMethodExampleBean"
-          class="org.baeldung.startup.InitMethodExampleBean"
+          class="com.baeldung.startup.InitMethodExampleBean"
           scope="prototype"
           init-method="init">
     </bean>
 
     <bean id="allStrategiesExampleBean"
-          class="org.baeldung.startup.AllStrategiesExampleBean"
+          class="com.baeldung.startup.AllStrategiesExampleBean"
           init-method="init">
     </bean>
 </beans>

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;
 

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);

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