Merge pull request eugenp#6289 from eugenp/BAEL-2399

eric-martin · web-flow · commit 582bb8a3d53a · 2019-02-05T22:23:27.000-06:00
BAEL-2399: Migrate Spring DI example to spring-core module
diff --git a/core-java-collections/src/test/java/com/baeldung/queueinterface/PriorityQueueUnitTest.java b/core-java-collections/src/test/java/com/baeldung/queueinterface/PriorityQueueUnitTest.java
diff --git a/guice/pom.xml b/guice/pom.xml
@@ -1,45 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.baeldung.examples.guice</groupId>
-	<artifactId>guice</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
-	<name>guice</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.examples.guice</groupId>
+    <artifactId>guice</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>guice</name>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice</artifactId>
-			<version>${guice.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>${guice.version}</version>
+        </dependency>
+    </dependencies>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
+    <properties>
+        <guice.version>4.1.0</guice.version>
+    </properties>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${springtest.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<properties>
-		<guice.version>4.2.2</guice.version>
-		<spring.version>5.1.3.RELEASE</spring.version>
-		<springtest.version>5.1.3.RELEASE</springtest.version>
-	</properties>
-
-</project>
+</project>
diff --git a/guice/src/main/java/com/baeldung/examples/common/Account.java b/guice/src/main/java/com/baeldung/examples/common/Account.java
@@ -1,8 +1,5 @@
 package com.baeldung.examples.common;
 
-import org.springframework.stereotype.Component;
-
-@Component
 public class Account {
 
 	private String accountNumber;
diff --git a/guice/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java b/guice/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java
@@ -1,8 +1,5 @@
 package com.baeldung.examples.common;
 
-import org.springframework.stereotype.Component;
-
-@Component
 public class AccountServiceImpl implements AccountService {
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/common/BookServiceImpl.java b/guice/src/main/java/com/baeldung/examples/common/BookServiceImpl.java
@@ -1,10 +1,7 @@
 package com.baeldung.examples.common;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 public class BookServiceImpl implements BookService {
 
-	@Autowired(required = false)
 	private AuthorService authorService;
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java b/guice/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java
@@ -1,8 +1,5 @@
 package com.baeldung.examples.common;
 
-import org.springframework.stereotype.Component;
-
-@Component
 public class PersonDaoImpl implements PersonDao {
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java b/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java
@@ -1,12 +1,9 @@
 package com.baeldung.examples.guice;
 
-import org.springframework.lang.Nullable;
-
 import com.google.inject.Inject;
 
 public class FooProcessor {
 
 	@Inject
-	@Nullable
 	private Foo foo;
 }
diff --git a/guice/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java b/guice/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java
@@ -27,7 +27,7 @@ protected void configure() {
 			// });
 			bind(Foo.class).toProvider(new Provider<Foo>() {
 				public Foo get() {
-					return null;
+					return new Foo();
 				}
 			});
 			bind(PersonDao.class).to(PersonDaoImpl.class);
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/Account.java b/spring-core/src/main/java/com/baeldung/di/spring/Account.java
@@ -0,0 +1,27 @@
+package com.baeldung.di.spring;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Account {
+
+	private String accountNumber;
+	private String type;
+
+	public String getAccountNumber() {
+		return accountNumber;
+	}
+
+	public void setAccountNumber(String accountNumber) {
+		this.accountNumber = accountNumber;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/AccountService.java b/spring-core/src/main/java/com/baeldung/di/spring/AccountService.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public interface AccountService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/AccountServiceImpl.java b/spring-core/src/main/java/com/baeldung/di/spring/AccountServiceImpl.java
@@ -0,0 +1,8 @@
+package com.baeldung.di.spring;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class AccountServiceImpl implements AccountService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/AudioBookService.java b/spring-core/src/main/java/com/baeldung/di/spring/AudioBookService.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public interface AudioBookService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/AudioBookServiceImpl.java b/spring-core/src/main/java/com/baeldung/di/spring/AudioBookServiceImpl.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public class AudioBookServiceImpl implements AudioBookService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/AuthorService.java b/spring-core/src/main/java/com/baeldung/di/spring/AuthorService.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public interface AuthorService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/AuthorServiceImpl.java b/spring-core/src/main/java/com/baeldung/di/spring/AuthorServiceImpl.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public class AuthorServiceImpl implements AuthorService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/BookService.java b/spring-core/src/main/java/com/baeldung/di/spring/BookService.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public interface BookService {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/BookServiceImpl.java b/spring-core/src/main/java/com/baeldung/di/spring/BookServiceImpl.java
@@ -0,0 +1,10 @@
+package com.baeldung.di.spring;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class BookServiceImpl implements BookService {
+
+	@Autowired(required = false)
+	private AuthorService authorService;
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/Foo.java b/spring-core/src/main/java/com/baeldung/di/spring/Foo.java
@@ -0,0 +1,4 @@
+package com.baeldung.di.spring;
+
+public class Foo {
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/FooProcessor.java b/spring-core/src/main/java/com/baeldung/di/spring/FooProcessor.java
@@ -0,0 +1,6 @@
+package com.baeldung.di.spring;
+
+public class FooProcessor {
+
+	private Foo foo;
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/PersonDao.java b/spring-core/src/main/java/com/baeldung/di/spring/PersonDao.java
@@ -0,0 +1,5 @@
+package com.baeldung.di.spring;
+
+public interface PersonDao {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/PersonDaoImpl.java b/spring-core/src/main/java/com/baeldung/di/spring/PersonDaoImpl.java
@@ -0,0 +1,8 @@
+package com.baeldung.di.spring;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class PersonDaoImpl implements PersonDao {
+
+}
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/SpringBeansConfig.java b/spring-core/src/main/java/com/baeldung/di/spring/SpringBeansConfig.java
@@ -1,11 +1,8 @@
-package com.baeldung.examples.spring;
+package com.baeldung.di.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.baeldung.examples.common.AudioBookService;
-import com.baeldung.examples.common.AudioBookServiceImpl;
-
 @Configuration
 public class SpringBeansConfig {
 
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/SpringMainConfig.java b/spring-core/src/main/java/com/baeldung/di/spring/SpringMainConfig.java
@@ -1,16 +1,13 @@
-package com.baeldung.examples.spring;
+package com.baeldung.di.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import com.baeldung.examples.common.BookService;
-import com.baeldung.examples.common.BookServiceImpl;
-
 @Configuration
 @Import({ SpringBeansConfig.class })
-@ComponentScan("com.baeldung.examples")
+@ComponentScan("com.baeldung.di.spring")
 public class SpringMainConfig {
 
 	@Bean
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/SpringPersonService.java b/spring-core/src/main/java/com/baeldung/di/spring/SpringPersonService.java
@@ -1,10 +1,8 @@
-package com.baeldung.examples.spring;
+package com.baeldung.di.spring;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.baeldung.examples.common.PersonDao;
-
 @Component
 public class SpringPersonService {
 
diff --git a/spring-core/src/main/java/com/baeldung/di/spring/UserService.java b/spring-core/src/main/java/com/baeldung/di/spring/UserService.java
@@ -1,10 +1,8 @@
-package com.baeldung.examples.spring;
+package com.baeldung.di.spring;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.baeldung.examples.common.AccountService;
-
 @Component
 public class UserService {
 
diff --git a/spring-core/src/test/java/com/baeldung/di/spring/SpringUnitTest.java b/spring-core/src/test/java/com/baeldung/di/spring/SpringUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.examples;
+package com.baeldung.di.spring;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -9,12 +9,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.examples.common.AudioBookService;
-import com.baeldung.examples.common.BookService;
-import com.baeldung.examples.spring.SpringMainConfig;
-import com.baeldung.examples.spring.SpringPersonService;
-import com.baeldung.examples.spring.UserService;
-
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = { SpringMainConfig.class })
 public class SpringUnitTest {

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`package com.baeldung.examples.common;`
`2`	`2`
`3`		`-import org.springframework.stereotype.Component;`
`4`		`-`
`5`		`-@Component`
`6`	`3`	`public class AccountServiceImpl implements AccountService {`
`7`	`4`
`8`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`package com.baeldung.examples.common;`
`2`	`2`
`3`		`-import org.springframework.beans.factory.annotation.Autowired;`
`4`		`-`
`5`	`3`	`public class BookServiceImpl implements BookService {`
`6`	`4`
`7`		`- @Autowired(required = false)`
`8`	`5`	`private AuthorService authorService;`
`9`	`6`
`10`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected void configure() {`
`27`	`27`	`// });`
`28`	`28`	`bind(Foo.class).toProvider(new Provider<Foo>() {`
`29`	`29`	`public Foo get() {`
`30`		`- return null;`
	`30`	`+ return new Foo();`
`31`	`31`	`}`
`32`	`32`	`});`
`33`	`33`	`bind(PersonDao.class).to(PersonDaoImpl.class);`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package com.baeldung.di.spring;
++
 +public interface AccountService {
++
 +}