cleanup work

spring-all/src/main/java/org/baeldung/core/ComponentUsingProperties.java

@@ -0,0 +1,12 @@
+package org.baeldung.core;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class ComponentUsingProperties {
+
+    public ComponentUsingProperties() {
+        super();
+    }
+
+}

spring-all/src/main/java/org/baeldung/persistence/Setup.java

@@ -1,20 +1,14 @@
-package org.baeldung.web;
+package org.baeldung.persistence;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
 
-// @Component
+@Component
 public class Setup implements ApplicationListener<ContextRefreshedEvent> {
 
     private boolean setupDone;
 
-    @Autowired
-    ServiceA serviceA;
-
-    @Autowired
-    IServiceB serviceB;
-
     public Setup() {
         super();
     }

spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java

@@ -1,11 +1,13 @@
 package org.baeldung.spring.config;
 
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-@ImportResource("classpath:beansInXml.xml")
+@ImportResource("classpath:configForProperties.xml")
+@ComponentScan("org.baeldung.core")
 public class CoreConfig extends WebMvcConfigurerAdapter {
 
     public CoreConfig() {

spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java

@@ -11,9 +11,9 @@ import org.springframework.web.servlet.view.JstlView;
 
 @EnableWebMvc
 @Configuration
-public class ClientWebConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig extends WebMvcConfigurerAdapter {
 
-    public ClientWebConfig() {
+    public MvcConfig() {
         super();
     }
 

spring-all/src/main/java/org/baeldung/spring/config/WebConfig.java

@@ -1,22 +0,0 @@
-package org.baeldung.spring.config;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan("org.baeldung.web")
-public class WebConfig extends WebMvcConfigurerAdapter {
-
-    @Autowired
-    BeanFactory beanFactory;
-
-    public WebConfig() {
-        super();
-    }
-
-}

spring-all/src/main/java/org/baeldung/web/BeanC1.java

@@ -1,12 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanC1 implements IBeanC {
-
-    public BeanC1() {
-        super();
-    }
-
-}

spring-all/src/main/java/org/baeldung/web/BeanC2.java

@@ -1,12 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanC2 implements IBeanC {
-
-    public BeanC2() {
-        super();
-    }
-
-}

spring-all/src/main/java/org/baeldung/web/BeanD.java

@@ -1,12 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanD implements IBeanD {
-
-    public BeanD() {
-        super();
-    }
-
-}

spring-all/src/main/java/org/baeldung/web/IBeanC.java

@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IBeanC {
-    //
-}

spring-all/src/main/java/org/baeldung/web/IBeanD.java

@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IBeanD {
-    //
-}

spring-all/src/main/java/org/baeldung/web/IServiceA.java

@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IServiceA {
-    //
-}

spring-all/src/main/java/org/baeldung/web/IServiceB.java

@@ -1,5 +0,0 @@
-package org.baeldung.web;
-
-public interface IServiceB {
-    //
-}

spring-all/src/main/java/org/baeldung/web/ServiceA.java

@@ -1,22 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-public class ServiceA {
-
-    @Autowired
-    public ServiceA(final IServiceB serviceB) {
-        super();
-    }
-
-    //
-
-    public void testA() {
-        System.out.println();
-    }
-
-}

spring-all/src/main/java/org/baeldung/web/ServiceB.java

@@ -1,20 +0,0 @@
-package org.baeldung.web;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-public class ServiceB implements IServiceB {
-
-    public ServiceB() {
-        super();
-    }
-
-    //
-
-    public void testB() {
-        System.out.println();
-    }
-
-}