From 3a5804aaa846d2f41501eab538d3f7fa6ed1676c Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Thu, 18 Jan 2018 12:54:55 +0100 Subject: [PATCH] Revert "Code for Alessio Stalla's evaluation article (Different Types of Bean Injection in Spring)" This reverts commit c174946f855ff445c787c8ddac683b73e26a0378. --- .../baeldung/typesofbeaninjection/Config.java | 16 ----- .../typesofbeaninjection/domain/Car.java | 24 -------- .../typesofbeaninjection/domain/Engine.java | 24 -------- .../domain/autowired/constructor/Car.java | 30 ---------- .../domain/autowired/properties/Car.java | 30 ---------- .../typesofbeaninjection-context.xml | 19 ------ .../TypeOfBeanInjectionUnitTest.java | 58 ------------------- 7 files changed, 201 deletions(-) delete mode 100644 spring-core/src/main/java/com/baeldung/typesofbeaninjection/Config.java delete mode 100644 spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Car.java delete mode 100644 spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Engine.java delete mode 100644 spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/constructor/Car.java delete mode 100644 spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/properties/Car.java delete mode 100644 spring-core/src/main/resources/typesofbeaninjection-context.xml delete mode 100644 spring-core/src/test/java/com/baeldung/typesofbeaninjection/TypeOfBeanInjectionUnitTest.java diff --git a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/Config.java b/spring-core/src/main/java/com/baeldung/typesofbeaninjection/Config.java deleted file mode 100644 index a967a63005..0000000000 --- a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/Config.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.typesofbeaninjection; - -import com.baeldung.typesofbeaninjection.domain.Engine; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan("com.baeldung.typesofbeaninjection") -public class Config { - - @Bean - public Engine engine() { - return new Engine("V8", 5); - } -} diff --git a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Car.java b/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Car.java deleted file mode 100644 index 878f369c8e..0000000000 --- a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Car.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.typesofbeaninjection.domain; - -public class Car { - private Engine engine; - - public Car() {} - - public Car(Engine engine) { - this.engine = engine; - } - - public Engine getEngine() { - return engine; - } - - public void setEngine(Engine engine) { - this.engine = engine; - } - - @Override - public String toString() { - return String.format("Car with %s engine", engine); - } -} diff --git a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Engine.java b/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Engine.java deleted file mode 100644 index 79e7a9856d..0000000000 --- a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/Engine.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.typesofbeaninjection.domain; - -public class Engine { - private final String type; - private final int volume; - - public Engine(String type, int volume) { - this.type = type; - this.volume = volume; - } - - public String getType() { - return type; - } - - public int getVolume() { - return volume; - } - - @Override - public String toString() { - return String.format("%s %d", type, volume); - } -} diff --git a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/constructor/Car.java b/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/constructor/Car.java deleted file mode 100644 index 33fadf8d2b..0000000000 --- a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/constructor/Car.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.typesofbeaninjection.domain.autowired.constructor; - -import com.baeldung.typesofbeaninjection.domain.Engine; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component("car-autowired-by-constructor") -public class Car { - private Engine engine; - - public Car() {} - - @Autowired - public Car(Engine engine) { - this.engine = engine; - } - - public Engine getEngine() { - return engine; - } - - public void setEngine(Engine engine) { - this.engine = engine; - } - - @Override - public String toString() { - return String.format("Car with %s engine", engine); - } -} diff --git a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/properties/Car.java b/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/properties/Car.java deleted file mode 100644 index 1df33f5062..0000000000 --- a/spring-core/src/main/java/com/baeldung/typesofbeaninjection/domain/autowired/properties/Car.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.typesofbeaninjection.domain.autowired.properties; - -import com.baeldung.typesofbeaninjection.domain.Engine; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component("car-autowired-by-properties") -public class Car { - private Engine engine; - - public Car() {} - - public Car(Engine engine) { - this.engine = engine; - } - - public Engine getEngine() { - return engine; - } - - @Autowired - public void setEngine(Engine engine) { - this.engine = engine; - } - - @Override - public String toString() { - return String.format("Car with %s engine", engine); - } -} diff --git a/spring-core/src/main/resources/typesofbeaninjection-context.xml b/spring-core/src/main/resources/typesofbeaninjection-context.xml deleted file mode 100644 index 5a9a0b59d7..0000000000 --- a/spring-core/src/main/resources/typesofbeaninjection-context.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/typesofbeaninjection/TypeOfBeanInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/typesofbeaninjection/TypeOfBeanInjectionUnitTest.java deleted file mode 100644 index 1b1319e001..0000000000 --- a/spring-core/src/test/java/com/baeldung/typesofbeaninjection/TypeOfBeanInjectionUnitTest.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.baeldung.typesofbeaninjection; - -import com.baeldung.typesofbeaninjection.domain.Car; -import com.baeldung.typesofbeaninjection.domain.Engine; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -public class TypeOfBeanInjectionUnitTest { - - @Test - public void whenConstructionInjectionInXML_thenCarHasEngine() { - ApplicationContext applicationContext - = new ClassPathXmlApplicationContext("/typesofbeaninjection-context.xml"); - Car car = applicationContext.getBean("alices-car", Car.class); - - checkEngine(car.getEngine()); - } - - @Test - public void whenPropertyInjectionInXML_thenCarHasEngine() { - ApplicationContext applicationContext - = new ClassPathXmlApplicationContext("/typesofbeaninjection-context.xml"); - Car car = applicationContext.getBean("bobs-car", Car.class); - - checkEngine(car.getEngine()); - } - - @Test - public void whenConstructionInjectionAnnotations_thenCarHasEngine() { - ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config.class); - com.baeldung.typesofbeaninjection.domain.autowired.constructor.Car car - = applicationContext.getBean(com.baeldung.typesofbeaninjection.domain.autowired.constructor.Car.class); - - checkEngine(car.getEngine()); - } - - @Test - public void whenPropertyInjectionAnnotations_thenCarHasEngine() { - ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config.class); - com.baeldung.typesofbeaninjection.domain.autowired.properties.Car car - = applicationContext.getBean(com.baeldung.typesofbeaninjection.domain.autowired.properties.Car.class); - - checkEngine(car.getEngine()); - } - - private void checkEngine(Engine engine) { - assertNotNull(engine); - assertEquals("V8", engine.getType()); - assertEquals(5, engine.getVolume()); - } - - -}