From 8c8af4e9bfd8eba66ff524d60b23a3dcbb40cd99 Mon Sep 17 00:00:00 2001 From: gschambial Date: Fri, 10 Nov 2017 17:52:21 +0530 Subject: [PATCH 1/9] 1. Constructor and Setter injection explained with example of Computer, Processor and Memory --- spring-boot/.factorypath | 111 ++++++++++-------- .../SpringAutowireConstructorContext.java | 10 ++ .../config/SpringBeanConstructorContext.java | 28 +++++ .../factory/ComputerAutowireFactory.java | 28 +++++ .../factory/ComputerBeanFactory.java | 29 +++++ .../factory/ComputerXmlFactory.java | 31 +++++ .../constructor/model/autowire/Computer.java | 34 ++++++ .../di/constructor/model/autowire/Memory.java | 19 +++ .../constructor/model/autowire/Processor.java | 19 +++ .../di/constructor/model/bean/Computer.java | 29 +++++ .../di/constructor/model/bean/Memory.java | 16 +++ .../di/constructor/model/bean/Processor.java | 16 +++ .../di/constructor/model/xml/Computer.java | 29 +++++ .../di/constructor/model/xml/Memory.java | 20 ++++ .../di/constructor/model/xml/Processor.java | 16 +++ .../config/SpringAutowireSetterContext.java | 10 ++ .../config/SpringBeanSetterContext.java | 31 +++++ .../factory/ComputerAutowireFactory.java | 29 +++++ .../setter/factory/ComputerBeanFactory.java | 30 +++++ .../di/setter/factory/ComputerXmlFactory.java | 30 +++++ .../di/setter/model/autowire/Computer.java | 30 +++++ .../di/setter/model/autowire/Memory.java | 19 +++ .../di/setter/model/autowire/Processor.java | 19 +++ .../di/setter/model/bean/Computer.java | 24 ++++ .../baeldung/di/setter/model/bean/Memory.java | 16 +++ .../di/setter/model/bean/Processor.java | 16 +++ .../di/setter/model/xml/Computer.java | 24 ++++ .../baeldung/di/setter/model/xml/Memory.java | 20 ++++ .../di/setter/model/xml/Processor.java | 16 +++ .../application-di-constructor-context.xml | 23 ++++ .../application-di-setter-context.xml | 22 ++++ .../AutowireAnnotationInjectionTest.java | 28 +++++ .../BeanAnnotationInjectionTest.java | 28 +++++ .../di/constructor/XmlInjectionTest.java | 27 +++++ .../AutowireAnnotationInjectionTest.java | 28 +++++ .../setter/BeanAnnotationInjectionTest.java | 28 +++++ .../baeldung/di/setter/XmlInjectionTest.java | 27 +++++ 37 files changed, 910 insertions(+), 50 deletions(-) create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java create mode 100644 spring-core/src/main/resources/application-di-constructor-context.xml create mode 100644 spring-core/src/main/resources/application-di-setter-context.xml create mode 100644 spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java create mode 100644 spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java create mode 100644 spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java create mode 100644 spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java create mode 100644 spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java create mode 100644 spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java diff --git a/spring-boot/.factorypath b/spring-boot/.factorypath index aa15485f5c..97062c74a4 100644 --- a/spring-boot/.factorypath +++ b/spring-boot/.factorypath @@ -1,46 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -48,81 +32,105 @@ - + + + + + - - + - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - + + - @@ -133,7 +141,10 @@ + + + @@ -143,7 +154,7 @@ - + diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java new file mode 100644 index 0000000000..d3c43d843e --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java @@ -0,0 +1,10 @@ +package com.baeldung.di.constructor.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan(basePackages= { "com.baeldung.di.constructor.model.autowire" }) +public class SpringAutowireConstructorContext { + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java new file mode 100644 index 0000000000..0ac1138e78 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java @@ -0,0 +1,28 @@ +package com.baeldung.di.constructor.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.baeldung.di.constructor.model.bean.Computer; +import com.baeldung.di.constructor.model.bean.Memory; +import com.baeldung.di.constructor.model.bean.Processor; + +@Configuration +public class SpringBeanConstructorContext { + + @Bean + public Computer computer(){ + return new Computer(processor(), memory()); + } + + @Bean + public Processor processor(){ + return new Processor(); + } + + @Bean + public Memory memory(){ + return new Memory(); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java new file mode 100644 index 0000000000..a86733c3d1 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java @@ -0,0 +1,28 @@ +package com.baeldung.di.constructor.factory; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.constructor.config.SpringAutowireConstructorContext; +import com.baeldung.di.constructor.model.autowire.Computer; + +public class ComputerAutowireFactory { + + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireConstructorContext.class); + + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Constructor Injection via @Autowire------------------"); + System.out.println("Processor cores : " + computer.getProcessor().getCores()); + System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory().getFormat()); + System.out.println("---------------- Constructor Injection via @Autowire------------------"); + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java new file mode 100644 index 0000000000..b518438521 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java @@ -0,0 +1,29 @@ +package com.baeldung.di.constructor.factory; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.constructor.config.SpringBeanConstructorContext; +import com.baeldung.di.constructor.model.bean.Computer; + +public class ComputerBeanFactory { + + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanConstructorContext.class); + + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Constructor Injection via @Bean ------------------"); + System.out.println("Processor cores : " + computer.getProcessor().getCores()); + System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory().getFormat()); + System.out.println("---------------- Constructor Injection via @Bean ------------------"); + + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java new file mode 100644 index 0000000000..2fa12525df --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java @@ -0,0 +1,31 @@ +package com.baeldung.di.constructor.factory; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.di.constructor.model.xml.Computer; + + + +public class ComputerXmlFactory { + + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new ClassPathXmlApplicationContext("application-di-constructor-context.xml"); + + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Constructor Injection via XML ------------------"); + System.out.println("Processor cores : " + computer.getProcessor().getCores()); + System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory().getFormat()); + System.out.println("---------------- Constructor Injection via XML ------------------"); + + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java new file mode 100644 index 0000000000..b470aedeed --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java @@ -0,0 +1,34 @@ +package com.baeldung.di.constructor.model.autowire; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class Computer { + + private Processor processor; + private Memory memory; + + @Autowired + public Computer(Processor processor, Memory memory) { + this.processor = processor; + this.memory = memory; + } + + public Processor getProcessor() { + return processor; + } + + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java new file mode 100644 index 0000000000..29633dd5ca --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java @@ -0,0 +1,19 @@ +package com.baeldung.di.constructor.model.autowire; + +import org.springframework.stereotype.Component; + +@Component +public class Memory { + + private Integer sizeInGb = 16; + private String format = "DDR3"; + + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java new file mode 100644 index 0000000000..0d81e2a005 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java @@ -0,0 +1,19 @@ +package com.baeldung.di.constructor.model.autowire; + +import org.springframework.stereotype.Component; + +@Component +public class Processor { + + private Integer cores = 2; + private Double frequency = 1.4; + + public Integer getCores() { + return cores; + } + + public Double getFrequency() { + return frequency; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java new file mode 100644 index 0000000000..d8856420d0 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java @@ -0,0 +1,29 @@ +package com.baeldung.di.constructor.model.bean; + +public class Computer { + + private Processor processor; + private Memory memory; + + public Computer(Processor processor, Memory memory) { + this.processor = processor; + this.memory = memory; + } + + public Processor getProcessor() { + return processor; + } + + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java new file mode 100644 index 0000000000..8e748bb1a0 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java @@ -0,0 +1,16 @@ +package com.baeldung.di.constructor.model.bean; + +public class Memory { + + private Integer sizeInGb = 16; + private String format = "DDR3"; + + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java new file mode 100644 index 0000000000..1566606148 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java @@ -0,0 +1,16 @@ +package com.baeldung.di.constructor.model.bean; + +public class Processor { + + private Integer cores = 2; + private Double frequency = 1.4; + + public Integer getCores() { + return cores; + } + + public Double getFrequency() { + return frequency; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java new file mode 100644 index 0000000000..dbd70cf6a4 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java @@ -0,0 +1,29 @@ +package com.baeldung.di.constructor.model.xml; + +public class Computer { + + private Processor processor; + private Memory memory; + + public Computer(Processor processor, Memory memory) { + this.processor = processor; + this.memory = memory; + } + + public Processor getProcessor() { + return processor; + } + + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java new file mode 100644 index 0000000000..f5ea3b4ec9 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java @@ -0,0 +1,20 @@ +package com.baeldung.di.constructor.model.xml; + +public class Memory { + + private Integer sizeInGb = 16; + private String format = "DDR3"; + + public Memory() { + + } + + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java new file mode 100644 index 0000000000..72733829d8 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java @@ -0,0 +1,16 @@ +package com.baeldung.di.constructor.model.xml; + +public class Processor { + + private Integer cores = 2; + private Double frequency = 1.4; + + public Integer getCores() { + return cores; + } + + public Double getFrequency() { + return frequency; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java new file mode 100644 index 0000000000..4e0ac0df28 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java @@ -0,0 +1,10 @@ +package com.baeldung.di.setter.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan(basePackages= { "com.baeldung.di.setter.model.autowire" }) +public class SpringAutowireSetterContext { + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java new file mode 100644 index 0000000000..885173f5b4 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java @@ -0,0 +1,31 @@ +package com.baeldung.di.setter.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.baeldung.di.setter.model.bean.Computer; +import com.baeldung.di.setter.model.bean.Memory; +import com.baeldung.di.setter.model.bean.Processor; + +@Configuration +public class SpringBeanSetterContext { + + @Bean + public Computer computer(){ + Computer computer = new Computer(); + computer.setProcessor(processor()); + computer.setMemory(memory()); + return computer; + } + + @Bean + public Processor processor(){ + return new Processor(); + } + + @Bean + public Memory memory(){ + return new Memory(); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java new file mode 100644 index 0000000000..98c3fccb27 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java @@ -0,0 +1,29 @@ +package com.baeldung.di.setter.factory; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.setter.config.SpringAutowireSetterContext; +import com.baeldung.di.setter.model.autowire.Computer; + + +public class ComputerAutowireFactory { + + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireSetterContext.class); + + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Setter Injection via @Autowire ------------------"); + System.out.println("Processor cores : " + computer.getProcessor().getCores()); + System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory().getFormat()); + System.out.println("---------------- Setter Injection via @Autowire ------------------"); + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java new file mode 100644 index 0000000000..6341029e95 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java @@ -0,0 +1,30 @@ +package com.baeldung.di.setter.factory; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.setter.config.SpringBeanSetterContext; +import com.baeldung.di.setter.model.bean.Computer; + + +public class ComputerBeanFactory { + + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanSetterContext.class); + + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Setter Injection via @Bean ------------------"); + System.out.println("Processor cores : " + computer.getProcessor().getCores()); + System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory().getFormat()); + System.out.println("---------------- Setter Injection via @Bean ------------------"); + + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java new file mode 100644 index 0000000000..707725d340 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java @@ -0,0 +1,30 @@ +package com.baeldung.di.setter.factory; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.di.setter.model.xml.Computer; + + + +public class ComputerXmlFactory { + + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new ClassPathXmlApplicationContext("application-setter-context.xml"); + + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Setter Injection via XML ------------------"); + System.out.println("Processor cores : " + computer.getProcessor().getCores()); + System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory().getFormat()); + System.out.println("---------------- Setter Injection via XML ------------------"); + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java new file mode 100644 index 0000000000..4d8a3b1dd3 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java @@ -0,0 +1,30 @@ +package com.baeldung.di.setter.model.autowire; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class Computer { + + private Processor processor; + private Memory memory; + + public Processor getProcessor() { + return processor; + } + + @Autowired + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + @Autowired + public void setMemory(Memory memory) { + this.memory = memory; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java new file mode 100644 index 0000000000..0953a42b35 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java @@ -0,0 +1,19 @@ +package com.baeldung.di.setter.model.autowire; + +import org.springframework.stereotype.Component; + +@Component +public class Memory { + + private Integer sizeInGb = 16; + private String format = "DDR3"; + + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java new file mode 100644 index 0000000000..ee5ef3b6cd --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java @@ -0,0 +1,19 @@ +package com.baeldung.di.setter.model.autowire; + +import org.springframework.stereotype.Component; + +@Component +public class Processor { + + private Integer cores = 2; + private Double frequency = 1.4; + + public Integer getCores() { + return cores; + } + + public Double getFrequency() { + return frequency; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java new file mode 100644 index 0000000000..01c87a6c73 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java @@ -0,0 +1,24 @@ +package com.baeldung.di.setter.model.bean; + +public class Computer { + + private Processor processor; + private Memory memory; + + public Processor getProcessor() { + return processor; + } + + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java new file mode 100644 index 0000000000..bfe94aa8e7 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java @@ -0,0 +1,16 @@ +package com.baeldung.di.setter.model.bean; + +public class Memory { + + private Integer sizeInGb = 16; + private String format = "DDR3"; + + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java new file mode 100644 index 0000000000..982b56f3d0 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java @@ -0,0 +1,16 @@ +package com.baeldung.di.setter.model.bean; + +public class Processor { + + private Integer cores = 2; + private Double frequency = 1.4; + + public Integer getCores() { + return cores; + } + + public Double getFrequency() { + return frequency; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java new file mode 100644 index 0000000000..3e7fa58ea8 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java @@ -0,0 +1,24 @@ +package com.baeldung.di.setter.model.xml; + +public class Computer { + + private Processor processor; + private Memory memory; + + public Processor getProcessor() { + return processor; + } + + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java new file mode 100644 index 0000000000..cb11c59583 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java @@ -0,0 +1,20 @@ +package com.baeldung.di.setter.model.xml; + +public class Memory { + + private Integer sizeInGb = 16; + private String format = "DDR3"; + + public Memory() { + + } + + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java new file mode 100644 index 0000000000..07405e13ea --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java @@ -0,0 +1,16 @@ +package com.baeldung.di.setter.model.xml; + +public class Processor { + + private Integer cores = 2; + private Double frequency = 1.4; + + public Integer getCores() { + return cores; + } + + public Double getFrequency() { + return frequency; + } + +} diff --git a/spring-core/src/main/resources/application-di-constructor-context.xml b/spring-core/src/main/resources/application-di-constructor-context.xml new file mode 100644 index 0000000000..46d1256988 --- /dev/null +++ b/spring-core/src/main/resources/application-di-constructor-context.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/main/resources/application-di-setter-context.xml b/spring-core/src/main/resources/application-di-setter-context.xml new file mode 100644 index 0000000000..3831041e01 --- /dev/null +++ b/spring-core/src/main/resources/application-di-setter-context.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java new file mode 100644 index 0000000000..87cb549ace --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java @@ -0,0 +1,28 @@ +package com.baeldung.di.constructor; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.constructor.config.SpringAutowireConstructorContext; +import com.baeldung.di.constructor.model.autowire.Computer; + +public class AutowireAnnotationInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new AnnotationConfigApplicationContext(SpringAutowireConstructorContext.class); + } + + @Test + public void getComputer_() { + final Computer computer = applicationContext.getBean("computer", Computer.class); + assertNotNull(computer); + } + +} diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java new file mode 100644 index 0000000000..61f718d4ba --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java @@ -0,0 +1,28 @@ +package com.baeldung.di.constructor; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.constructor.config.SpringBeanConstructorContext; +import com.baeldung.di.constructor.model.bean.Computer; + +public class BeanAnnotationInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new AnnotationConfigApplicationContext(SpringBeanConstructorContext.class); + } + + @Test + public void getComputer_() { + final Computer computer = applicationContext.getBean("computer", Computer.class); + assertNotNull(computer); + } + +} diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java new file mode 100644 index 0000000000..4787c19cbf --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java @@ -0,0 +1,27 @@ +package com.baeldung.di.constructor; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.di.constructor.model.xml.Computer; + +public class XmlInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new ClassPathXmlApplicationContext("application-di-constructor-context.xml"); + } + + @Test + public void getComputer_() { + final Computer computer = applicationContext.getBean("computer", Computer.class); + assertNotNull(computer); + } + +} diff --git a/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java new file mode 100644 index 0000000000..036c6826e3 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java @@ -0,0 +1,28 @@ +package com.baeldung.di.setter; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.setter.config.SpringAutowireSetterContext; +import com.baeldung.di.setter.model.autowire.Computer; + +public class AutowireAnnotationInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new AnnotationConfigApplicationContext(SpringAutowireSetterContext.class); + } + + @Test + public void getComputer_() { + final Computer computer = applicationContext.getBean("computer", Computer.class); + assertNotNull(computer); + } + +} diff --git a/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java new file mode 100644 index 0000000000..53f1d4e10e --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java @@ -0,0 +1,28 @@ +package com.baeldung.di.setter; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import com.baeldung.di.setter.config.SpringBeanSetterContext; +import com.baeldung.di.setter.model.bean.Computer; + +public class BeanAnnotationInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new AnnotationConfigApplicationContext(SpringBeanSetterContext.class); + } + + @Test + public void getComputer_() { + final Computer computer = applicationContext.getBean("computer", Computer.class); + assertNotNull(computer); + } + +} diff --git a/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java new file mode 100644 index 0000000000..52452be119 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java @@ -0,0 +1,27 @@ +package com.baeldung.di.setter; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.di.setter.model.xml.Computer; + +public class XmlInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new ClassPathXmlApplicationContext("application-di-setter-context.xml"); + } + + @Test + public void getComputer_() { + final Computer computer = applicationContext.getBean("computer", Computer.class); + assertNotNull(computer); + } + +} From b2dead94841756a35c0743486e4b08b609513888 Mon Sep 17 00:00:00 2001 From: gschambial Date: Fri, 10 Nov 2017 18:14:31 +0530 Subject: [PATCH 2/9] Baeldung eclipse formatter added. --- .../SpringAutowireConstructorContext.java | 4 +- .../config/SpringBeanConstructorContext.java | 32 +++++++-------- .../factory/ComputerAutowireFactory.java | 32 ++++++++------- .../factory/ComputerBeanFactory.java | 32 ++++++++------- .../factory/ComputerXmlFactory.java | 36 +++++++++-------- .../constructor/model/autowire/Computer.java | 40 +++++++++---------- .../di/constructor/model/autowire/Memory.java | 18 ++++----- .../constructor/model/autowire/Processor.java | 16 ++++---- .../di/constructor/model/bean/Computer.java | 38 +++++++++--------- .../di/constructor/model/bean/Memory.java | 18 ++++----- .../di/constructor/model/bean/Processor.java | 16 ++++---- .../di/constructor/model/xml/Computer.java | 40 +++++++++---------- .../di/constructor/model/xml/Memory.java | 20 +++++----- .../di/constructor/model/xml/Processor.java | 16 ++++---- .../config/SpringAutowireSetterContext.java | 4 +- .../config/SpringBeanSetterContext.java | 38 +++++++++--------- .../factory/ComputerAutowireFactory.java | 33 ++++++++------- .../setter/factory/ComputerBeanFactory.java | 33 ++++++++------- .../di/setter/factory/ComputerXmlFactory.java | 36 +++++++++-------- .../di/setter/model/autowire/Computer.java | 36 ++++++++--------- .../di/setter/model/autowire/Memory.java | 18 ++++----- .../di/setter/model/autowire/Processor.java | 16 ++++---- .../di/setter/model/bean/Computer.java | 32 +++++++-------- .../baeldung/di/setter/model/bean/Memory.java | 19 ++++----- .../di/setter/model/bean/Processor.java | 16 ++++---- .../di/setter/model/xml/Computer.java | 30 +++++++------- .../baeldung/di/setter/model/xml/Memory.java | 20 +++++----- .../di/setter/model/xml/Processor.java | 16 ++++---- .../application-di-constructor-context.xml | 6 +-- .../application-di-setter-context.xml | 2 +- 30 files changed, 366 insertions(+), 347 deletions(-) diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java index d3c43d843e..ae67bc7e5e 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan(basePackages= { "com.baeldung.di.constructor.model.autowire" }) +@ComponentScan(basePackages = { "com.baeldung.di.constructor.model.autowire" }) public class SpringAutowireConstructorContext { - + } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java index 0ac1138e78..670f18cb9c 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java @@ -9,20 +9,20 @@ import com.baeldung.di.constructor.model.bean.Processor; @Configuration public class SpringBeanConstructorContext { - - @Bean - public Computer computer(){ - return new Computer(processor(), memory()); - } - - @Bean - public Processor processor(){ - return new Processor(); - } - - @Bean - public Memory memory(){ - return new Memory(); - } - + + @Bean + public Computer computer() { + return new Computer(processor(), memory()); + } + + @Bean + public Processor processor() { + return new Processor(); + } + + @Bean + public Memory memory() { + return new Memory(); + } + } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java index a86733c3d1..2a13adf250 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java @@ -9,20 +9,24 @@ import com.baeldung.di.constructor.model.autowire.Computer; public class ComputerAutowireFactory { - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireConstructorContext.class); + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireConstructorContext.class); - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Constructor Injection via @Autowire------------------"); - System.out.println("Processor cores : " + computer.getProcessor().getCores()); - System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory().getFormat()); - System.out.println("---------------- Constructor Injection via @Autowire------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Constructor Injection via @Autowire------------------"); + System.out.println("Processor cores : " + computer.getProcessor() + .getCores()); + System.out.println("Processor frequency : " + computer.getProcessor() + .getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory() + .getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory() + .getFormat()); + System.out.println("---------------- Constructor Injection via @Autowire------------------"); + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java index b518438521..713ea82b00 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java @@ -9,21 +9,25 @@ import com.baeldung.di.constructor.model.bean.Computer; public class ComputerBeanFactory { - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanConstructorContext.class); + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanConstructorContext.class); - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Constructor Injection via @Bean ------------------"); - System.out.println("Processor cores : " + computer.getProcessor().getCores()); - System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory().getFormat()); - System.out.println("---------------- Constructor Injection via @Bean ------------------"); + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Constructor Injection via @Bean ------------------"); + System.out.println("Processor cores : " + computer.getProcessor() + .getCores()); + System.out.println("Processor frequency : " + computer.getProcessor() + .getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory() + .getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory() + .getFormat()); + System.out.println("---------------- Constructor Injection via @Bean ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java index 2fa12525df..afe5fa281b 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java @@ -6,26 +6,28 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import com.baeldung.di.constructor.model.xml.Computer; - - public class ComputerXmlFactory { - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new ClassPathXmlApplicationContext("application-di-constructor-context.xml"); + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new ClassPathXmlApplicationContext("application-di-constructor-context.xml"); - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Constructor Injection via XML ------------------"); - System.out.println("Processor cores : " + computer.getProcessor().getCores()); - System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory().getFormat()); - System.out.println("---------------- Constructor Injection via XML ------------------"); + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Constructor Injection via XML ------------------"); + System.out.println("Processor cores : " + computer.getProcessor() + .getCores()); + System.out.println("Processor frequency : " + computer.getProcessor() + .getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory() + .getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory() + .getFormat()); + System.out.println("---------------- Constructor Injection via XML ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - - } + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java index b470aedeed..1dabfd287e 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java @@ -6,29 +6,29 @@ import org.springframework.stereotype.Component; @Component public class Computer { - private Processor processor; - private Memory memory; + private Processor processor; + private Memory memory; - @Autowired - public Computer(Processor processor, Memory memory) { - this.processor = processor; - this.memory = memory; - } + @Autowired + public Computer(Processor processor, Memory memory) { + this.processor = processor; + this.memory = memory; + } - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } + public Processor getProcessor() { + return processor; + } - public Memory getMemory() { - return memory; - } + public void setProcessor(Processor processor) { + this.processor = processor; + } - public void setMemory(Memory memory) { - this.memory = memory; - } + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java index 29633dd5ca..d1faecc569 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java @@ -5,15 +5,15 @@ import org.springframework.stereotype.Component; @Component public class Memory { - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } + private Integer sizeInGb = 16; + private String format = "DDR3"; - public String getFormat() { - return format; - } + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java index 0d81e2a005..7de9d2bf6a 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java @@ -5,15 +5,15 @@ import org.springframework.stereotype.Component; @Component public class Processor { - private Integer cores = 2; - private Double frequency = 1.4; + private Integer cores = 2; + private Double frequency = 1.4; - public Integer getCores() { - return cores; - } + public Integer getCores() { + return cores; + } - public Double getFrequency() { - return frequency; - } + public Double getFrequency() { + return frequency; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java index d8856420d0..74ec89ce0c 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java @@ -2,28 +2,28 @@ package com.baeldung.di.constructor.model.bean; public class Computer { - private Processor processor; - private Memory memory; + private Processor processor; + private Memory memory; - public Computer(Processor processor, Memory memory) { - this.processor = processor; - this.memory = memory; - } + public Computer(Processor processor, Memory memory) { + this.processor = processor; + this.memory = memory; + } - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } + public Processor getProcessor() { + return processor; + } - public Memory getMemory() { - return memory; - } + public void setProcessor(Processor processor) { + this.processor = processor; + } - public void setMemory(Memory memory) { - this.memory = memory; - } + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java index 8e748bb1a0..18d4eaf948 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java @@ -2,15 +2,15 @@ package com.baeldung.di.constructor.model.bean; public class Memory { - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } + private Integer sizeInGb = 16; + private String format = "DDR3"; - public String getFormat() { - return format; - } + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java index 1566606148..9dd719c872 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java @@ -2,15 +2,15 @@ package com.baeldung.di.constructor.model.bean; public class Processor { - private Integer cores = 2; - private Double frequency = 1.4; + private Integer cores = 2; + private Double frequency = 1.4; - public Integer getCores() { - return cores; - } + public Integer getCores() { + return cores; + } - public Double getFrequency() { - return frequency; - } + public Double getFrequency() { + return frequency; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java index dbd70cf6a4..66c39c66b7 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java @@ -2,28 +2,28 @@ package com.baeldung.di.constructor.model.xml; public class Computer { - private Processor processor; - private Memory memory; + private Processor processor; + private Memory memory; - public Computer(Processor processor, Memory memory) { - this.processor = processor; - this.memory = memory; - } - - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } + public Computer(Processor processor, Memory memory) { + this.processor = processor; + this.memory = memory; + } - public Memory getMemory() { - return memory; - } + public Processor getProcessor() { + return processor; + } - public void setMemory(Memory memory) { - this.memory = memory; - } + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java index f5ea3b4ec9..7b4f4fb697 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java @@ -2,19 +2,19 @@ package com.baeldung.di.constructor.model.xml; public class Memory { - private Integer sizeInGb = 16; - private String format = "DDR3"; + private Integer sizeInGb = 16; + private String format = "DDR3"; - public Memory() { + public Memory() { - } + } - public Integer getSizeInGb() { - return sizeInGb; - } + public Integer getSizeInGb() { + return sizeInGb; + } - public String getFormat() { - return format; - } + public String getFormat() { + return format; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java index 72733829d8..4e783042fe 100644 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java +++ b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java @@ -2,15 +2,15 @@ package com.baeldung.di.constructor.model.xml; public class Processor { - private Integer cores = 2; - private Double frequency = 1.4; + private Integer cores = 2; + private Double frequency = 1.4; - public Integer getCores() { - return cores; - } + public Integer getCores() { + return cores; + } - public Double getFrequency() { - return frequency; - } + public Double getFrequency() { + return frequency; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java index 4e0ac0df28..9e1d24fc61 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan(basePackages= { "com.baeldung.di.setter.model.autowire" }) +@ComponentScan(basePackages = { "com.baeldung.di.setter.model.autowire" }) public class SpringAutowireSetterContext { - + } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java index 885173f5b4..14767fb0ca 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java @@ -9,23 +9,23 @@ import com.baeldung.di.setter.model.bean.Processor; @Configuration public class SpringBeanSetterContext { - - @Bean - public Computer computer(){ - Computer computer = new Computer(); - computer.setProcessor(processor()); - computer.setMemory(memory()); - return computer; - } - - @Bean - public Processor processor(){ - return new Processor(); - } - - @Bean - public Memory memory(){ - return new Memory(); - } - + + @Bean + public Computer computer() { + Computer computer = new Computer(); + computer.setProcessor(processor()); + computer.setMemory(memory()); + return computer; + } + + @Bean + public Processor processor() { + return new Processor(); + } + + @Bean + public Memory memory() { + return new Memory(); + } + } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java index 98c3fccb27..ef1ac83530 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java @@ -7,23 +7,26 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import com.baeldung.di.setter.config.SpringAutowireSetterContext; import com.baeldung.di.setter.model.autowire.Computer; - public class ComputerAutowireFactory { - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireSetterContext.class); + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireSetterContext.class); - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Setter Injection via @Autowire ------------------"); - System.out.println("Processor cores : " + computer.getProcessor().getCores()); - System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory().getFormat()); - System.out.println("---------------- Setter Injection via @Autowire ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Setter Injection via @Autowire ------------------"); + System.out.println("Processor cores : " + computer.getProcessor() + .getCores()); + System.out.println("Processor frequency : " + computer.getProcessor() + .getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory() + .getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory() + .getFormat()); + System.out.println("---------------- Setter Injection via @Autowire ------------------"); + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java index 6341029e95..87f49bf4cf 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java @@ -7,24 +7,27 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import com.baeldung.di.setter.config.SpringBeanSetterContext; import com.baeldung.di.setter.model.bean.Computer; - public class ComputerBeanFactory { - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanSetterContext.class); + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanSetterContext.class); - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Setter Injection via @Bean ------------------"); - System.out.println("Processor cores : " + computer.getProcessor().getCores()); - System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory().getFormat()); - System.out.println("---------------- Setter Injection via @Bean ------------------"); + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Setter Injection via @Bean ------------------"); + System.out.println("Processor cores : " + computer.getProcessor() + .getCores()); + System.out.println("Processor frequency : " + computer.getProcessor() + .getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory() + .getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory() + .getFormat()); + System.out.println("---------------- Setter Injection via @Bean ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java index 707725d340..01af29905c 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java @@ -6,25 +6,27 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import com.baeldung.di.setter.model.xml.Computer; - - public class ComputerXmlFactory { - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new ClassPathXmlApplicationContext("application-setter-context.xml"); + public static void main(String[] args) { + // Create Spring Application Context + ApplicationContext context = new ClassPathXmlApplicationContext("application-setter-context.xml"); - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Setter Injection via XML ------------------"); - System.out.println("Processor cores : " + computer.getProcessor().getCores()); - System.out.println("Processor frequency : " + computer.getProcessor().getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory().getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory().getFormat()); - System.out.println("---------------- Setter Injection via XML ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - - } + // Get Spring bean "computer" created + Computer computer = (Computer) context.getBean("computer"); + System.out.println("---------------- Setter Injection via XML ------------------"); + System.out.println("Processor cores : " + computer.getProcessor() + .getCores()); + System.out.println("Processor frequency : " + computer.getProcessor() + .getFrequency()); + System.out.println("Memory Size in GB : " + computer.getMemory() + .getSizeInGb()); + System.out.println("Memory format : " + computer.getMemory() + .getFormat()); + System.out.println("---------------- Setter Injection via XML ------------------"); + // Close Spring Application Context + ((ConfigurableApplicationContext) context).close(); + + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java index 4d8a3b1dd3..ed32b34729 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java @@ -6,25 +6,25 @@ import org.springframework.stereotype.Component; @Component public class Computer { - private Processor processor; - private Memory memory; + private Processor processor; + private Memory memory; - public Processor getProcessor() { - return processor; - } - - @Autowired - public void setProcessor(Processor processor) { - this.processor = processor; - } + public Processor getProcessor() { + return processor; + } - public Memory getMemory() { - return memory; - } - - @Autowired - public void setMemory(Memory memory) { - this.memory = memory; - } + @Autowired + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + @Autowired + public void setMemory(Memory memory) { + this.memory = memory; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java index 0953a42b35..ffdd63d389 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java @@ -5,15 +5,15 @@ import org.springframework.stereotype.Component; @Component public class Memory { - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } + private Integer sizeInGb = 16; + private String format = "DDR3"; - public String getFormat() { - return format; - } + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java index ee5ef3b6cd..9b01143bd2 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java @@ -5,15 +5,15 @@ import org.springframework.stereotype.Component; @Component public class Processor { - private Integer cores = 2; - private Double frequency = 1.4; + private Integer cores = 2; + private Double frequency = 1.4; - public Integer getCores() { - return cores; - } + public Integer getCores() { + return cores; + } - public Double getFrequency() { - return frequency; - } + public Double getFrequency() { + return frequency; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java index 01c87a6c73..e350cddee8 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java @@ -2,23 +2,23 @@ package com.baeldung.di.setter.model.bean; public class Computer { - private Processor processor; - private Memory memory; + private Processor processor; + private Memory memory; - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } + public Processor getProcessor() { + return processor; + } - public Memory getMemory() { - return memory; - } - - public void setMemory(Memory memory) { - this.memory = memory; - } + public void setProcessor(Processor processor) { + this.processor = processor; + } + + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java index bfe94aa8e7..b34052e066 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java @@ -2,15 +2,16 @@ package com.baeldung.di.setter.model.bean; public class Memory { - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } + private Integer sizeInGb = 16; + private String format = "DDR3"; - public String getFormat() { - return format; - } + // + public Integer getSizeInGb() { + return sizeInGb; + } + + public String getFormat() { + return format; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java index 982b56f3d0..2c9f050232 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java @@ -2,15 +2,15 @@ package com.baeldung.di.setter.model.bean; public class Processor { - private Integer cores = 2; - private Double frequency = 1.4; + private Integer cores = 2; + private Double frequency = 1.4; - public Integer getCores() { - return cores; - } + public Integer getCores() { + return cores; + } - public Double getFrequency() { - return frequency; - } + public Double getFrequency() { + return frequency; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java index 3e7fa58ea8..a88dc34d07 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java @@ -2,23 +2,23 @@ package com.baeldung.di.setter.model.xml; public class Computer { - private Processor processor; - private Memory memory; + private Processor processor; + private Memory memory; - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } + public Processor getProcessor() { + return processor; + } - public Memory getMemory() { - return memory; - } + public void setProcessor(Processor processor) { + this.processor = processor; + } - public void setMemory(Memory memory) { - this.memory = memory; - } + public Memory getMemory() { + return memory; + } + + public void setMemory(Memory memory) { + this.memory = memory; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java index cb11c59583..93667ff225 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java @@ -2,19 +2,19 @@ package com.baeldung.di.setter.model.xml; public class Memory { - private Integer sizeInGb = 16; - private String format = "DDR3"; + private Integer sizeInGb = 16; + private String format = "DDR3"; - public Memory() { + public Memory() { - } + } - public Integer getSizeInGb() { - return sizeInGb; - } + public Integer getSizeInGb() { + return sizeInGb; + } - public String getFormat() { - return format; - } + public String getFormat() { + return format; + } } diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java index 07405e13ea..1845983338 100644 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java +++ b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java @@ -2,15 +2,15 @@ package com.baeldung.di.setter.model.xml; public class Processor { - private Integer cores = 2; - private Double frequency = 1.4; + private Integer cores = 2; + private Double frequency = 1.4; - public Integer getCores() { - return cores; - } + public Integer getCores() { + return cores; + } - public Double getFrequency() { - return frequency; - } + public Double getFrequency() { + return frequency; + } } diff --git a/spring-core/src/main/resources/application-di-constructor-context.xml b/spring-core/src/main/resources/application-di-constructor-context.xml index 46d1256988..c1f2d4cdfd 100644 --- a/spring-core/src/main/resources/application-di-constructor-context.xml +++ b/spring-core/src/main/resources/application-di-constructor-context.xml @@ -6,18 +6,18 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd "> - + - + - + \ No newline at end of file diff --git a/spring-core/src/main/resources/application-di-setter-context.xml b/spring-core/src/main/resources/application-di-setter-context.xml index 3831041e01..658f28b3f3 100644 --- a/spring-core/src/main/resources/application-di-setter-context.xml +++ b/spring-core/src/main/resources/application-di-setter-context.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd "> - + From 4678e01680ac858d7d5bc17e2eab9e6f17fa2fe2 Mon Sep 17 00:00:00 2001 From: gschambial Date: Fri, 10 Nov 2017 19:44:34 +0530 Subject: [PATCH 3/9] Unit Tests renamed into correct format --- ...ectionTest.java => AutowireAnnotationInjectionUnitTest.java} | 2 +- ...nInjectionTest.java => BeanAnnotationInjectionUnitTest.java} | 2 +- .../{XmlInjectionTest.java => XmlInjectionUnitTest.java} | 2 +- ...ectionTest.java => AutowireAnnotationInjectionUnitTest.java} | 2 +- ...nInjectionTest.java => BeanAnnotationInjectionUnitTest.java} | 2 +- .../setter/{XmlInjectionTest.java => XmlInjectionUnitTest.java} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename spring-core/src/test/java/com/baeldung/di/constructor/{AutowireAnnotationInjectionTest.java => AutowireAnnotationInjectionUnitTest.java} (93%) rename spring-core/src/test/java/com/baeldung/di/constructor/{BeanAnnotationInjectionTest.java => BeanAnnotationInjectionUnitTest.java} (94%) rename spring-core/src/test/java/com/baeldung/di/constructor/{XmlInjectionTest.java => XmlInjectionUnitTest.java} (94%) rename spring-core/src/test/java/com/baeldung/di/setter/{AutowireAnnotationInjectionTest.java => AutowireAnnotationInjectionUnitTest.java} (93%) rename spring-core/src/test/java/com/baeldung/di/setter/{BeanAnnotationInjectionTest.java => BeanAnnotationInjectionUnitTest.java} (93%) rename spring-core/src/test/java/com/baeldung/di/setter/{XmlInjectionTest.java => XmlInjectionUnitTest.java} (95%) diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java rename to spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java index 87cb549ace..348ac1428b 100644 --- a/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionTest.java +++ b/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import com.baeldung.di.constructor.config.SpringAutowireConstructorContext; import com.baeldung.di.constructor.model.autowire.Computer; -public class AutowireAnnotationInjectionTest { +public class AutowireAnnotationInjectionUnitTest { private ApplicationContext applicationContext; diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java similarity index 94% rename from spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java rename to spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java index 61f718d4ba..3eb276428c 100644 --- a/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionTest.java +++ b/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import com.baeldung.di.constructor.config.SpringBeanConstructorContext; import com.baeldung.di.constructor.model.bean.Computer; -public class BeanAnnotationInjectionTest { +public class BeanAnnotationInjectionUnitTest { private ApplicationContext applicationContext; diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java similarity index 94% rename from spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java rename to spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java index 4787c19cbf..cfcc7ed56e 100644 --- a/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionTest.java +++ b/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java @@ -9,7 +9,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import com.baeldung.di.constructor.model.xml.Computer; -public class XmlInjectionTest { +public class XmlInjectionUnitTest { private ApplicationContext applicationContext; diff --git a/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java rename to spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java index 036c6826e3..fc8e58f08b 100644 --- a/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionTest.java +++ b/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import com.baeldung.di.setter.config.SpringAutowireSetterContext; import com.baeldung.di.setter.model.autowire.Computer; -public class AutowireAnnotationInjectionTest { +public class AutowireAnnotationInjectionUnitTest { private ApplicationContext applicationContext; diff --git a/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java rename to spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java index 53f1d4e10e..c89c1239ba 100644 --- a/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionTest.java +++ b/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import com.baeldung.di.setter.config.SpringBeanSetterContext; import com.baeldung.di.setter.model.bean.Computer; -public class BeanAnnotationInjectionTest { +public class BeanAnnotationInjectionUnitTest { private ApplicationContext applicationContext; diff --git a/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java similarity index 95% rename from spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java rename to spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java index 52452be119..0f38b46194 100644 --- a/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionTest.java +++ b/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java @@ -9,7 +9,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import com.baeldung.di.setter.model.xml.Computer; -public class XmlInjectionTest { +public class XmlInjectionUnitTest { private ApplicationContext applicationContext; From 40ceddea2bdc3cf46caa622b19ba1350bd52f055 Mon Sep 17 00:00:00 2001 From: gschambial Date: Mon, 13 Nov 2017 21:01:06 +0530 Subject: [PATCH 4/9] BAEL-1331: Quick Example: Comparator vs Comparable in Java Source code and Unit Tests added. --- .../java/com/baeldung/comparable/Player.java | 51 +++++++++++++++++++ .../com/baeldung/comparable/PlayerSorter.java | 24 +++++++++ .../java/com/baeldung/comparator/Player.java | 46 +++++++++++++++++ .../comparator/PlayerAgeComparator.java | 12 +++++ .../baeldung/comparator/PlayerAgeSorter.java | 26 ++++++++++ .../comparator/PlayerRankingComparator.java | 12 +++++ .../comparator/PlayerRankingSorter.java | 26 ++++++++++ .../comparable/ComparableUnitTest.java | 26 ++++++++++ .../comparator/ComparatorUnitTest.java | 42 +++++++++++++++ 9 files changed, 265 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/comparable/Player.java create mode 100644 core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java create mode 100644 core-java/src/main/java/com/baeldung/comparator/Player.java create mode 100644 core-java/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java create mode 100644 core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java create mode 100644 core-java/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java create mode 100644 core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java create mode 100644 core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java create mode 100644 core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java diff --git a/core-java/src/main/java/com/baeldung/comparable/Player.java b/core-java/src/main/java/com/baeldung/comparable/Player.java new file mode 100644 index 0000000000..68a78980f3 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparable/Player.java @@ -0,0 +1,51 @@ +package com.baeldung.comparable; + +public class Player implements Comparable { + + private int ranking; + + private String name; + + private int age; + + public Player(int ranking, String name, int age) { + this.ranking = ranking; + this.name = name; + this.age = age; + } + + public int getRanking() { + return ranking; + } + + public void setRanking(int ranking) { + this.ranking = ranking; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + @Override + public String toString() { + return this.name; + } + + @Override + public int compareTo(Player otherPlayer) { + return (this.getRanking() - otherPlayer.getRanking()); + } + +} diff --git a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java new file mode 100644 index 0000000000..1f64a5eb43 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java @@ -0,0 +1,24 @@ +package com.baeldung.comparable; + +import java.util.ArrayList; +import java.util.Collections; + +public class PlayerSorter { + + public static void main(String[] args) { + + ArrayList footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 20); + Player player2 = new Player(67, "Roger", 22); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + + System.out.println("Before Sorting : " + footballTeam); + Collections.sort(footballTeam); + System.out.println("After Sorting : " + footballTeam); + + } + +} diff --git a/core-java/src/main/java/com/baeldung/comparator/Player.java b/core-java/src/main/java/com/baeldung/comparator/Player.java new file mode 100644 index 0000000000..e6e9ee0db6 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparator/Player.java @@ -0,0 +1,46 @@ +package com.baeldung.comparator; + +public class Player { + + private int ranking; + + private String name; + + private int age; + + public Player(int ranking, String name, int age) { + this.ranking = ranking; + this.name = name; + this.age = age; + } + + public int getRanking() { + return ranking; + } + + public void setRanking(int ranking) { + this.ranking = ranking; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + @Override + public String toString() { + return this.name; + } + +} diff --git a/core-java/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java b/core-java/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java new file mode 100644 index 0000000000..d2e7ca1f42 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparator/PlayerAgeComparator.java @@ -0,0 +1,12 @@ +package com.baeldung.comparator; + +import java.util.Comparator; + +public class PlayerAgeComparator implements Comparator { + + @Override + public int compare(Player firstPlayer, Player secondPlayer) { + return (firstPlayer.getAge() - secondPlayer.getAge()); + } + +} diff --git a/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java b/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java new file mode 100644 index 0000000000..e7d3fd1264 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java @@ -0,0 +1,26 @@ +package com.baeldung.comparator; + +import java.util.ArrayList; +import java.util.Collections; + +public class PlayerAgeSorter { + + public static void main(String[] args) { + + ArrayList footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 22); + Player player2 = new Player(67, "Roger", 20); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + + System.out.println("Before Sorting : " + footballTeam); + //Instance of PlayerAgeComparator + PlayerAgeComparator playerComparator = new PlayerAgeComparator(); + Collections.sort(footballTeam, playerComparator); + System.out.println("After Sorting by age : " + footballTeam); + + } + +} diff --git a/core-java/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java b/core-java/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java new file mode 100644 index 0000000000..2d42698843 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparator/PlayerRankingComparator.java @@ -0,0 +1,12 @@ +package com.baeldung.comparator; + +import java.util.Comparator; + +public class PlayerRankingComparator implements Comparator { + + @Override + public int compare(Player firstPlayer, Player secondPlayer) { + return (firstPlayer.getRanking() - secondPlayer.getRanking()); + } + +} diff --git a/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java b/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java new file mode 100644 index 0000000000..a6a971f99e --- /dev/null +++ b/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java @@ -0,0 +1,26 @@ +package com.baeldung.comparator; + +import java.util.ArrayList; +import java.util.Collections; + +public class PlayerRankingSorter { + + public static void main(String[] args) { + + ArrayList footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 22); + Player player2 = new Player(67, "Roger", 20); + Player player3 = new Player(45, "Steven", 40); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + + System.out.println("Before Sorting : " + footballTeam); + //Instance of PlayerRankingComparator + PlayerRankingComparator playerComparator = new PlayerRankingComparator(); + Collections.sort(footballTeam, playerComparator); + System.out.println("After Sorting by ranking : " + footballTeam); + + } + +} diff --git a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java new file mode 100644 index 0000000000..c65c2c3740 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java @@ -0,0 +1,26 @@ +package com.baeldung.comparable; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Collections; + +import org.junit.Test; + +public class ComparableUnitTest { + + @Test + public void whenUsingComparable_thenSortedList() { + ArrayList footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 20); + Player player2 = new Player(67, "Roger", 22); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + Collections.sort(footballTeam); + assertEquals(footballTeam.get(0).getName(), "Steven"); + assertEquals(footballTeam.get(2).getRanking(), 67); + } + +} diff --git a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java new file mode 100644 index 0000000000..78f0e0bf33 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java @@ -0,0 +1,42 @@ +package com.baeldung.comparator; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Collections; + +import org.junit.Test; + +public class ComparatorUnitTest { + + @Test + public void whenUsingRankingComparator_thenSortedList() { + ArrayList footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 20); + Player player2 = new Player(67, "Roger", 22); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + PlayerRankingComparator playerComparator = new PlayerRankingComparator(); + Collections.sort(footballTeam, playerComparator); + assertEquals(footballTeam.get(0).getName(), "Steven"); + assertEquals(footballTeam.get(2).getRanking(), 67); + } + + @Test + public void whenUsingAgeComparator_thenSortedList() { + ArrayList footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 20); + Player player2 = new Player(67, "Roger", 22); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + PlayerAgeComparator playerComparator = new PlayerAgeComparator(); + Collections.sort(footballTeam, playerComparator); + assertEquals(footballTeam.get(0).getName(), "John"); + assertEquals(footballTeam.get(2).getRanking(), 45); + } + +} From 416bd4a9d5b32585bb9f968f481a266ff0c97df4 Mon Sep 17 00:00:00 2001 From: gschambial Date: Mon, 13 Nov 2017 22:48:09 +0530 Subject: [PATCH 5/9] Removed evaluation article (Dependency Injection) from master branch. --- .../SpringAutowireConstructorContext.java | 10 ------ .../config/SpringBeanConstructorContext.java | 28 --------------- .../factory/ComputerAutowireFactory.java | 32 ----------------- .../factory/ComputerBeanFactory.java | 33 ------------------ .../factory/ComputerXmlFactory.java | 33 ------------------ .../constructor/model/autowire/Computer.java | 34 ------------------- .../di/constructor/model/autowire/Memory.java | 19 ----------- .../constructor/model/autowire/Processor.java | 19 ----------- .../di/constructor/model/bean/Computer.java | 29 ---------------- .../di/constructor/model/bean/Memory.java | 16 --------- .../di/constructor/model/bean/Processor.java | 16 --------- .../di/constructor/model/xml/Computer.java | 29 ---------------- .../di/constructor/model/xml/Memory.java | 20 ----------- .../di/constructor/model/xml/Processor.java | 16 --------- .../config/SpringAutowireSetterContext.java | 10 ------ .../config/SpringBeanSetterContext.java | 31 ----------------- .../factory/ComputerAutowireFactory.java | 32 ----------------- .../setter/factory/ComputerBeanFactory.java | 33 ------------------ .../di/setter/factory/ComputerXmlFactory.java | 32 ----------------- .../di/setter/model/autowire/Computer.java | 30 ---------------- .../di/setter/model/autowire/Memory.java | 19 ----------- .../di/setter/model/autowire/Processor.java | 19 ----------- .../di/setter/model/bean/Computer.java | 24 ------------- .../baeldung/di/setter/model/bean/Memory.java | 17 ---------- .../di/setter/model/bean/Processor.java | 16 --------- .../di/setter/model/xml/Computer.java | 24 ------------- .../baeldung/di/setter/model/xml/Memory.java | 20 ----------- .../di/setter/model/xml/Processor.java | 16 --------- .../application-di-constructor-context.xml | 23 ------------- .../application-di-setter-context.xml | 22 ------------ .../AutowireAnnotationInjectionUnitTest.java | 28 --------------- .../BeanAnnotationInjectionUnitTest.java | 28 --------------- .../di/constructor/XmlInjectionUnitTest.java | 27 --------------- .../AutowireAnnotationInjectionUnitTest.java | 28 --------------- .../BeanAnnotationInjectionUnitTest.java | 28 --------------- .../di/setter/XmlInjectionUnitTest.java | 27 --------------- 36 files changed, 868 deletions(-) delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java delete mode 100644 spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java delete mode 100644 spring-core/src/main/resources/application-di-constructor-context.xml delete mode 100644 spring-core/src/main/resources/application-di-setter-context.xml delete mode 100644 spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java delete mode 100644 spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java delete mode 100644 spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java delete mode 100644 spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java delete mode 100644 spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java delete mode 100644 spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java deleted file mode 100644 index ae67bc7e5e..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringAutowireConstructorContext.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.baeldung.di.constructor.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan(basePackages = { "com.baeldung.di.constructor.model.autowire" }) -public class SpringAutowireConstructorContext { - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java b/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java deleted file mode 100644 index 670f18cb9c..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/config/SpringBeanConstructorContext.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.di.constructor.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import com.baeldung.di.constructor.model.bean.Computer; -import com.baeldung.di.constructor.model.bean.Memory; -import com.baeldung.di.constructor.model.bean.Processor; - -@Configuration -public class SpringBeanConstructorContext { - - @Bean - public Computer computer() { - return new Computer(processor(), memory()); - } - - @Bean - public Processor processor() { - return new Processor(); - } - - @Bean - public Memory memory() { - return new Memory(); - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java deleted file mode 100644 index 2a13adf250..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerAutowireFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.di.constructor.factory; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.constructor.config.SpringAutowireConstructorContext; -import com.baeldung.di.constructor.model.autowire.Computer; - -public class ComputerAutowireFactory { - - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireConstructorContext.class); - - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Constructor Injection via @Autowire------------------"); - System.out.println("Processor cores : " + computer.getProcessor() - .getCores()); - System.out.println("Processor frequency : " + computer.getProcessor() - .getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory() - .getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory() - .getFormat()); - System.out.println("---------------- Constructor Injection via @Autowire------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java deleted file mode 100644 index 713ea82b00..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerBeanFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baeldung.di.constructor.factory; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.constructor.config.SpringBeanConstructorContext; -import com.baeldung.di.constructor.model.bean.Computer; - -public class ComputerBeanFactory { - - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanConstructorContext.class); - - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Constructor Injection via @Bean ------------------"); - System.out.println("Processor cores : " + computer.getProcessor() - .getCores()); - System.out.println("Processor frequency : " + computer.getProcessor() - .getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory() - .getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory() - .getFormat()); - System.out.println("---------------- Constructor Injection via @Bean ------------------"); - - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java b/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java deleted file mode 100644 index afe5fa281b..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/factory/ComputerXmlFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baeldung.di.constructor.factory; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import com.baeldung.di.constructor.model.xml.Computer; - -public class ComputerXmlFactory { - - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new ClassPathXmlApplicationContext("application-di-constructor-context.xml"); - - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Constructor Injection via XML ------------------"); - System.out.println("Processor cores : " + computer.getProcessor() - .getCores()); - System.out.println("Processor frequency : " + computer.getProcessor() - .getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory() - .getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory() - .getFormat()); - System.out.println("---------------- Constructor Injection via XML ------------------"); - - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java deleted file mode 100644 index 1dabfd287e..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Computer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baeldung.di.constructor.model.autowire; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class Computer { - - private Processor processor; - private Memory memory; - - @Autowired - public Computer(Processor processor, Memory memory) { - this.processor = processor; - this.memory = memory; - } - - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } - - public Memory getMemory() { - return memory; - } - - public void setMemory(Memory memory) { - this.memory = memory; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java deleted file mode 100644 index d1faecc569..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Memory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.di.constructor.model.autowire; - -import org.springframework.stereotype.Component; - -@Component -public class Memory { - - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } - - public String getFormat() { - return format; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java deleted file mode 100644 index 7de9d2bf6a..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/autowire/Processor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.di.constructor.model.autowire; - -import org.springframework.stereotype.Component; - -@Component -public class Processor { - - private Integer cores = 2; - private Double frequency = 1.4; - - public Integer getCores() { - return cores; - } - - public Double getFrequency() { - return frequency; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java deleted file mode 100644 index 74ec89ce0c..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Computer.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baeldung.di.constructor.model.bean; - -public class Computer { - - private Processor processor; - private Memory memory; - - public Computer(Processor processor, Memory memory) { - this.processor = processor; - this.memory = memory; - } - - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } - - public Memory getMemory() { - return memory; - } - - public void setMemory(Memory memory) { - this.memory = memory; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java deleted file mode 100644 index 18d4eaf948..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Memory.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.di.constructor.model.bean; - -public class Memory { - - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } - - public String getFormat() { - return format; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java deleted file mode 100644 index 9dd719c872..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/bean/Processor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.di.constructor.model.bean; - -public class Processor { - - private Integer cores = 2; - private Double frequency = 1.4; - - public Integer getCores() { - return cores; - } - - public Double getFrequency() { - return frequency; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java deleted file mode 100644 index 66c39c66b7..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Computer.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baeldung.di.constructor.model.xml; - -public class Computer { - - private Processor processor; - private Memory memory; - - public Computer(Processor processor, Memory memory) { - this.processor = processor; - this.memory = memory; - } - - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } - - public Memory getMemory() { - return memory; - } - - public void setMemory(Memory memory) { - this.memory = memory; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java deleted file mode 100644 index 7b4f4fb697..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Memory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baeldung.di.constructor.model.xml; - -public class Memory { - - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Memory() { - - } - - public Integer getSizeInGb() { - return sizeInGb; - } - - public String getFormat() { - return format; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java b/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java deleted file mode 100644 index 4e783042fe..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/constructor/model/xml/Processor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.di.constructor.model.xml; - -public class Processor { - - private Integer cores = 2; - private Double frequency = 1.4; - - public Integer getCores() { - return cores; - } - - public Double getFrequency() { - return frequency; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java deleted file mode 100644 index 9e1d24fc61..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringAutowireSetterContext.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.baeldung.di.setter.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan(basePackages = { "com.baeldung.di.setter.model.autowire" }) -public class SpringAutowireSetterContext { - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java b/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java deleted file mode 100644 index 14767fb0ca..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/config/SpringBeanSetterContext.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baeldung.di.setter.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import com.baeldung.di.setter.model.bean.Computer; -import com.baeldung.di.setter.model.bean.Memory; -import com.baeldung.di.setter.model.bean.Processor; - -@Configuration -public class SpringBeanSetterContext { - - @Bean - public Computer computer() { - Computer computer = new Computer(); - computer.setProcessor(processor()); - computer.setMemory(memory()); - return computer; - } - - @Bean - public Processor processor() { - return new Processor(); - } - - @Bean - public Memory memory() { - return new Memory(); - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java deleted file mode 100644 index ef1ac83530..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerAutowireFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.di.setter.factory; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.setter.config.SpringAutowireSetterContext; -import com.baeldung.di.setter.model.autowire.Computer; - -public class ComputerAutowireFactory { - - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringAutowireSetterContext.class); - - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Setter Injection via @Autowire ------------------"); - System.out.println("Processor cores : " + computer.getProcessor() - .getCores()); - System.out.println("Processor frequency : " + computer.getProcessor() - .getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory() - .getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory() - .getFormat()); - System.out.println("---------------- Setter Injection via @Autowire ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java deleted file mode 100644 index 87f49bf4cf..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerBeanFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baeldung.di.setter.factory; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.setter.config.SpringBeanSetterContext; -import com.baeldung.di.setter.model.bean.Computer; - -public class ComputerBeanFactory { - - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new AnnotationConfigApplicationContext(SpringBeanSetterContext.class); - - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Setter Injection via @Bean ------------------"); - System.out.println("Processor cores : " + computer.getProcessor() - .getCores()); - System.out.println("Processor frequency : " + computer.getProcessor() - .getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory() - .getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory() - .getFormat()); - System.out.println("---------------- Setter Injection via @Bean ------------------"); - - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java b/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java deleted file mode 100644 index 01af29905c..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/factory/ComputerXmlFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.di.setter.factory; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import com.baeldung.di.setter.model.xml.Computer; - -public class ComputerXmlFactory { - - public static void main(String[] args) { - // Create Spring Application Context - ApplicationContext context = new ClassPathXmlApplicationContext("application-setter-context.xml"); - - // Get Spring bean "computer" created - Computer computer = (Computer) context.getBean("computer"); - System.out.println("---------------- Setter Injection via XML ------------------"); - System.out.println("Processor cores : " + computer.getProcessor() - .getCores()); - System.out.println("Processor frequency : " + computer.getProcessor() - .getFrequency()); - System.out.println("Memory Size in GB : " + computer.getMemory() - .getSizeInGb()); - System.out.println("Memory format : " + computer.getMemory() - .getFormat()); - System.out.println("---------------- Setter Injection via XML ------------------"); - // Close Spring Application Context - ((ConfigurableApplicationContext) context).close(); - - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java deleted file mode 100644 index ed32b34729..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Computer.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.di.setter.model.autowire; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class Computer { - - private Processor processor; - private Memory memory; - - public Processor getProcessor() { - return processor; - } - - @Autowired - public void setProcessor(Processor processor) { - this.processor = processor; - } - - public Memory getMemory() { - return memory; - } - - @Autowired - public void setMemory(Memory memory) { - this.memory = memory; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java deleted file mode 100644 index ffdd63d389..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Memory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.di.setter.model.autowire; - -import org.springframework.stereotype.Component; - -@Component -public class Memory { - - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Integer getSizeInGb() { - return sizeInGb; - } - - public String getFormat() { - return format; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java deleted file mode 100644 index 9b01143bd2..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/autowire/Processor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.di.setter.model.autowire; - -import org.springframework.stereotype.Component; - -@Component -public class Processor { - - private Integer cores = 2; - private Double frequency = 1.4; - - public Integer getCores() { - return cores; - } - - public Double getFrequency() { - return frequency; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java deleted file mode 100644 index e350cddee8..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Computer.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.di.setter.model.bean; - -public class Computer { - - private Processor processor; - private Memory memory; - - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } - - public Memory getMemory() { - return memory; - } - - public void setMemory(Memory memory) { - this.memory = memory; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java deleted file mode 100644 index b34052e066..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Memory.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.di.setter.model.bean; - -public class Memory { - - private Integer sizeInGb = 16; - private String format = "DDR3"; - - // - public Integer getSizeInGb() { - return sizeInGb; - } - - public String getFormat() { - return format; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java deleted file mode 100644 index 2c9f050232..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/bean/Processor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.di.setter.model.bean; - -public class Processor { - - private Integer cores = 2; - private Double frequency = 1.4; - - public Integer getCores() { - return cores; - } - - public Double getFrequency() { - return frequency; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java deleted file mode 100644 index a88dc34d07..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Computer.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.di.setter.model.xml; - -public class Computer { - - private Processor processor; - private Memory memory; - - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } - - public Memory getMemory() { - return memory; - } - - public void setMemory(Memory memory) { - this.memory = memory; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java deleted file mode 100644 index 93667ff225..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Memory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baeldung.di.setter.model.xml; - -public class Memory { - - private Integer sizeInGb = 16; - private String format = "DDR3"; - - public Memory() { - - } - - public Integer getSizeInGb() { - return sizeInGb; - } - - public String getFormat() { - return format; - } - -} diff --git a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java b/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java deleted file mode 100644 index 1845983338..0000000000 --- a/spring-core/src/main/java/com/baeldung/di/setter/model/xml/Processor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.di.setter.model.xml; - -public class Processor { - - private Integer cores = 2; - private Double frequency = 1.4; - - public Integer getCores() { - return cores; - } - - public Double getFrequency() { - return frequency; - } - -} diff --git a/spring-core/src/main/resources/application-di-constructor-context.xml b/spring-core/src/main/resources/application-di-constructor-context.xml deleted file mode 100644 index c1f2d4cdfd..0000000000 --- a/spring-core/src/main/resources/application-di-constructor-context.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-core/src/main/resources/application-di-setter-context.xml b/spring-core/src/main/resources/application-di-setter-context.xml deleted file mode 100644 index 658f28b3f3..0000000000 --- a/spring-core/src/main/resources/application-di-setter-context.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java deleted file mode 100644 index 348ac1428b..0000000000 --- a/spring-core/src/test/java/com/baeldung/di/constructor/AutowireAnnotationInjectionUnitTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.di.constructor; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.constructor.config.SpringAutowireConstructorContext; -import com.baeldung.di.constructor.model.autowire.Computer; - -public class AutowireAnnotationInjectionUnitTest { - - private ApplicationContext applicationContext; - - @Before - public void setUp() throws Exception { - applicationContext = new AnnotationConfigApplicationContext(SpringAutowireConstructorContext.class); - } - - @Test - public void getComputer_() { - final Computer computer = applicationContext.getBean("computer", Computer.class); - assertNotNull(computer); - } - -} diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java deleted file mode 100644 index 3eb276428c..0000000000 --- a/spring-core/src/test/java/com/baeldung/di/constructor/BeanAnnotationInjectionUnitTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.di.constructor; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.constructor.config.SpringBeanConstructorContext; -import com.baeldung.di.constructor.model.bean.Computer; - -public class BeanAnnotationInjectionUnitTest { - - private ApplicationContext applicationContext; - - @Before - public void setUp() throws Exception { - applicationContext = new AnnotationConfigApplicationContext(SpringBeanConstructorContext.class); - } - - @Test - public void getComputer_() { - final Computer computer = applicationContext.getBean("computer", Computer.class); - assertNotNull(computer); - } - -} diff --git a/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java deleted file mode 100644 index cfcc7ed56e..0000000000 --- a/spring-core/src/test/java/com/baeldung/di/constructor/XmlInjectionUnitTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baeldung.di.constructor; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import com.baeldung.di.constructor.model.xml.Computer; - -public class XmlInjectionUnitTest { - - private ApplicationContext applicationContext; - - @Before - public void setUp() throws Exception { - applicationContext = new ClassPathXmlApplicationContext("application-di-constructor-context.xml"); - } - - @Test - public void getComputer_() { - final Computer computer = applicationContext.getBean("computer", Computer.class); - assertNotNull(computer); - } - -} diff --git a/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java deleted file mode 100644 index fc8e58f08b..0000000000 --- a/spring-core/src/test/java/com/baeldung/di/setter/AutowireAnnotationInjectionUnitTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.di.setter; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.setter.config.SpringAutowireSetterContext; -import com.baeldung.di.setter.model.autowire.Computer; - -public class AutowireAnnotationInjectionUnitTest { - - private ApplicationContext applicationContext; - - @Before - public void setUp() throws Exception { - applicationContext = new AnnotationConfigApplicationContext(SpringAutowireSetterContext.class); - } - - @Test - public void getComputer_() { - final Computer computer = applicationContext.getBean("computer", Computer.class); - assertNotNull(computer); - } - -} diff --git a/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java deleted file mode 100644 index c89c1239ba..0000000000 --- a/spring-core/src/test/java/com/baeldung/di/setter/BeanAnnotationInjectionUnitTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.di.setter; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import com.baeldung.di.setter.config.SpringBeanSetterContext; -import com.baeldung.di.setter.model.bean.Computer; - -public class BeanAnnotationInjectionUnitTest { - - private ApplicationContext applicationContext; - - @Before - public void setUp() throws Exception { - applicationContext = new AnnotationConfigApplicationContext(SpringBeanSetterContext.class); - } - - @Test - public void getComputer_() { - final Computer computer = applicationContext.getBean("computer", Computer.class); - assertNotNull(computer); - } - -} diff --git a/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java b/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java deleted file mode 100644 index 0f38b46194..0000000000 --- a/spring-core/src/test/java/com/baeldung/di/setter/XmlInjectionUnitTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baeldung.di.setter; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import com.baeldung.di.setter.model.xml.Computer; - -public class XmlInjectionUnitTest { - - private ApplicationContext applicationContext; - - @Before - public void setUp() throws Exception { - applicationContext = new ClassPathXmlApplicationContext("application-di-setter-context.xml"); - } - - @Test - public void getComputer_() { - final Computer computer = applicationContext.getBean("computer", Computer.class); - assertNotNull(computer); - } - -} From 1c36955757ef39332307702196667f22b59294b1 Mon Sep 17 00:00:00 2001 From: gschambial Date: Mon, 13 Nov 2017 23:01:05 +0530 Subject: [PATCH 6/9] Removed addition classpath changes from master branch. --- spring-boot/.factorypath | 121 ++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 66 deletions(-) diff --git a/spring-boot/.factorypath b/spring-boot/.factorypath index 97062c74a4..aa15485f5c 100644 --- a/spring-boot/.factorypath +++ b/spring-boot/.factorypath @@ -1,30 +1,46 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + @@ -32,105 +48,81 @@ + - - - - - + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + - + @@ -141,10 +133,7 @@ - - - @@ -154,7 +143,7 @@ - + From d954258a809078b84ea6c16d7c68bf7fdf40f6a9 Mon Sep 17 00:00:00 2001 From: gschambial Date: Tue, 14 Nov 2017 10:25:42 +0530 Subject: [PATCH 7/9] 1. Moved commmon code to @Before method in ComparatorUnitTest. 2. Changed ArrayList to List for declarations --- .../com/baeldung/comparable/PlayerSorter.java | 3 ++- .../baeldung/comparator/PlayerAgeSorter.java | 3 ++- .../comparator/PlayerRankingSorter.java | 3 ++- .../comparable/ComparableUnitTest.java | 3 ++- .../comparator/ComparatorUnitTest.java | 21 ++++++++++--------- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java index 1f64a5eb43..eeb2c7a883 100644 --- a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java +++ b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java @@ -2,12 +2,13 @@ package com.baeldung.comparable; import java.util.ArrayList; import java.util.Collections; +import java.util.List; public class PlayerSorter { public static void main(String[] args) { - ArrayList footballTeam = new ArrayList(); + List footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); Player player3 = new Player(45, "Steven", 24); diff --git a/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java b/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java index e7d3fd1264..3bbbcddb80 100644 --- a/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java +++ b/core-java/src/main/java/com/baeldung/comparator/PlayerAgeSorter.java @@ -2,12 +2,13 @@ package com.baeldung.comparator; import java.util.ArrayList; import java.util.Collections; +import java.util.List; public class PlayerAgeSorter { public static void main(String[] args) { - ArrayList footballTeam = new ArrayList(); + List footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 22); Player player2 = new Player(67, "Roger", 20); Player player3 = new Player(45, "Steven", 24); diff --git a/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java b/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java index a6a971f99e..581585fb7e 100644 --- a/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java +++ b/core-java/src/main/java/com/baeldung/comparator/PlayerRankingSorter.java @@ -2,12 +2,13 @@ package com.baeldung.comparator; import java.util.ArrayList; import java.util.Collections; +import java.util.List; public class PlayerRankingSorter { public static void main(String[] args) { - ArrayList footballTeam = new ArrayList(); + List footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 22); Player player2 = new Player(67, "Roger", 20); Player player3 = new Player(45, "Steven", 40); diff --git a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java index c65c2c3740..2b45dd0391 100644 --- a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java @@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Collections; +import java.util.List; import org.junit.Test; @@ -11,7 +12,7 @@ public class ComparableUnitTest { @Test public void whenUsingComparable_thenSortedList() { - ArrayList footballTeam = new ArrayList(); + List footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); Player player3 = new Player(45, "Steven", 24); diff --git a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java index 78f0e0bf33..769986edec 100644 --- a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java @@ -4,20 +4,28 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Collections; +import java.util.List; +import org.junit.Before; import org.junit.Test; public class ComparatorUnitTest { - @Test - public void whenUsingRankingComparator_thenSortedList() { - ArrayList footballTeam = new ArrayList(); + List footballTeam; + + @Before + public void setUp(){ + footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); Player player3 = new Player(45, "Steven", 24); footballTeam.add(player1); footballTeam.add(player2); footballTeam.add(player3); + } + + @Test + public void whenUsingRankingComparator_thenSortedList() { PlayerRankingComparator playerComparator = new PlayerRankingComparator(); Collections.sort(footballTeam, playerComparator); assertEquals(footballTeam.get(0).getName(), "Steven"); @@ -26,13 +34,6 @@ public class ComparatorUnitTest { @Test public void whenUsingAgeComparator_thenSortedList() { - ArrayList footballTeam = new ArrayList(); - Player player1 = new Player(59, "John", 20); - Player player2 = new Player(67, "Roger", 22); - Player player3 = new Player(45, "Steven", 24); - footballTeam.add(player1); - footballTeam.add(player2); - footballTeam.add(player3); PlayerAgeComparator playerComparator = new PlayerAgeComparator(); Collections.sort(footballTeam, playerComparator); assertEquals(footballTeam.get(0).getName(), "John"); From 66a1c32e1329e0b014e13780c7e43ddf685e8c7f Mon Sep 17 00:00:00 2001 From: gschambial Date: Fri, 24 Nov 2017 13:48:55 +0530 Subject: [PATCH 8/9] 1. Java 8 Comparators example added 2. Comparator.comparing example added --- .../com/baeldung/comparable/PlayerSorter.java | 6 +- .../comparable/ComparableUnitTest.java | 8 ++- .../comparator/ComparatorUnitTest.java | 22 ++++--- .../comparator/Java8ComparatorUnitTest.java | 63 +++++++++++++++++++ 4 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java diff --git a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java index eeb2c7a883..a9b883f579 100644 --- a/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java +++ b/core-java/src/main/java/com/baeldung/comparable/PlayerSorter.java @@ -7,7 +7,7 @@ import java.util.List; public class PlayerSorter { public static void main(String[] args) { - + List footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); @@ -15,11 +15,11 @@ public class PlayerSorter { footballTeam.add(player1); footballTeam.add(player2); footballTeam.add(player3); - + System.out.println("Before Sorting : " + footballTeam); Collections.sort(footballTeam); System.out.println("After Sorting : " + footballTeam); - + } } diff --git a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java index 2b45dd0391..e8745884b8 100644 --- a/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparable/ComparableUnitTest.java @@ -9,7 +9,7 @@ import java.util.List; import org.junit.Test; public class ComparableUnitTest { - + @Test public void whenUsingComparable_thenSortedList() { List footballTeam = new ArrayList(); @@ -20,8 +20,10 @@ public class ComparableUnitTest { footballTeam.add(player2); footballTeam.add(player3); Collections.sort(footballTeam); - assertEquals(footballTeam.get(0).getName(), "Steven"); - assertEquals(footballTeam.get(2).getRanking(), 67); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); } } diff --git a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java index 769986edec..5b7ec3bfe4 100644 --- a/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparator/ComparatorUnitTest.java @@ -10,11 +10,11 @@ import org.junit.Before; import org.junit.Test; public class ComparatorUnitTest { - + List footballTeam; - + @Before - public void setUp(){ + public void setUp() { footballTeam = new ArrayList(); Player player1 = new Player(59, "John", 20); Player player2 = new Player(67, "Roger", 22); @@ -23,21 +23,25 @@ public class ComparatorUnitTest { footballTeam.add(player2); footballTeam.add(player3); } - + @Test public void whenUsingRankingComparator_thenSortedList() { PlayerRankingComparator playerComparator = new PlayerRankingComparator(); Collections.sort(footballTeam, playerComparator); - assertEquals(footballTeam.get(0).getName(), "Steven"); - assertEquals(footballTeam.get(2).getRanking(), 67); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); } - + @Test public void whenUsingAgeComparator_thenSortedList() { PlayerAgeComparator playerComparator = new PlayerAgeComparator(); Collections.sort(footballTeam, playerComparator); - assertEquals(footballTeam.get(0).getName(), "John"); - assertEquals(footballTeam.get(2).getRanking(), 45); + assertEquals(footballTeam.get(0) + .getName(), "John"); + assertEquals(footballTeam.get(2) + .getRanking(), 45); } } diff --git a/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java new file mode 100644 index 0000000000..b804573b51 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java @@ -0,0 +1,63 @@ +package com.baeldung.comparator; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +public class Java8ComparatorUnitTest { + + List footballTeam; + + @Before + public void setUp() { + footballTeam = new ArrayList(); + Player player1 = new Player(59, "John", 20); + Player player2 = new Player(67, "Roger", 22); + Player player3 = new Player(45, "Steven", 24); + footballTeam.add(player1); + footballTeam.add(player2); + footballTeam.add(player3); + } + + @Test + public void whenComparing_UsingJava8_thenSorted() { + System.out.println("************** Java 8 Comaparator **************"); + Comparator byRanking = new Comparator() { + + @Override + public int compare(Player player1, Player player2) { + return player1.getRanking() - player2.getRanking(); + } + }; + + System.out.println("Before Sorting : " + footballTeam); + Collections.sort(footballTeam, byRanking); + System.out.println("After Sorting : " + footballTeam); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); + } + + @Test + public void whenComparing_UsingComparatorComparing_thenSorted() { + System.out.println("********* Comaparator.comparing method *********"); + Comparator byRanking = + (Player player1, Player player2)->player1.getRanking()-player2.getRanking(); + + System.out.println("Before Sorting : " + footballTeam); + Collections.sort(footballTeam, byRanking); + System.out.println("After Sorting : " + footballTeam); + assertEquals(footballTeam.get(0) + .getName(), "Steven"); + assertEquals(footballTeam.get(2) + .getRanking(), 67); + } + +} From 8af39bf73021cd19aca167cef7e0cbf477ce316a Mon Sep 17 00:00:00 2001 From: gschambial Date: Wed, 29 Nov 2017 16:46:37 +0530 Subject: [PATCH 9/9] 1. Comparator example using Lambda and Comparator.comparing corrected. --- .../comparator/Java8ComparatorUnitTest.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java b/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java index b804573b51..49c8749309 100644 --- a/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java +++ b/core-java/src/test/java/com/baeldung/comparator/Java8ComparatorUnitTest.java @@ -17,8 +17,8 @@ public class Java8ComparatorUnitTest { @Before public void setUp() { footballTeam = new ArrayList(); - Player player1 = new Player(59, "John", 20); - Player player2 = new Player(67, "Roger", 22); + Player player1 = new Player(59, "John", 22); + Player player2 = new Player(67, "Roger", 20); Player player3 = new Player(45, "Steven", 24); footballTeam.add(player1); footballTeam.add(player2); @@ -26,15 +26,9 @@ public class Java8ComparatorUnitTest { } @Test - public void whenComparing_UsingJava8_thenSorted() { + public void whenComparing_UsingLambda_thenSorted() { System.out.println("************** Java 8 Comaparator **************"); - Comparator byRanking = new Comparator() { - - @Override - public int compare(Player player1, Player player2) { - return player1.getRanking() - player2.getRanking(); - } - }; + Comparator byRanking = (Player player1, Player player2) -> player1.getRanking() - player2.getRanking(); System.out.println("Before Sorting : " + footballTeam); Collections.sort(footballTeam, byRanking); @@ -48,8 +42,8 @@ public class Java8ComparatorUnitTest { @Test public void whenComparing_UsingComparatorComparing_thenSorted() { System.out.println("********* Comaparator.comparing method *********"); - Comparator byRanking = - (Player player1, Player player2)->player1.getRanking()-player2.getRanking(); + System.out.println("********* byRanking *********"); + Comparator byRanking = Comparator.comparing(Player::getRanking); System.out.println("Before Sorting : " + footballTeam); Collections.sort(footballTeam, byRanking); @@ -58,6 +52,17 @@ public class Java8ComparatorUnitTest { .getName(), "Steven"); assertEquals(footballTeam.get(2) .getRanking(), 67); + + System.out.println("********* byAge *********"); + Comparator byAge = Comparator.comparing(Player::getAge); + + System.out.println("Before Sorting : " + footballTeam); + Collections.sort(footballTeam, byAge); + System.out.println("After Sorting : " + footballTeam); + assertEquals(footballTeam.get(0) + .getName(), "Roger"); + assertEquals(footballTeam.get(2) + .getRanking(), 45); } }