Merge remote-tracking branch 'origin/BAEL-2399' into BAEL-2399

emineoymak · emineoymak · commit 4375c0d450fe · 2019-01-29T21:49:40.000-05:00
diff --git a/guice/pom.xml b/guice/pom.xml
@@ -37,7 +37,7 @@
 	</dependencies>
 
 	<properties>
-		<guice.version>4.1.0</guice.version>
+		<guice.version>4.2.2</guice.version>
 		<spring.version>5.1.3.RELEASE</spring.version>
 		<springtest.version>5.1.3.RELEASE</springtest.version>
 	</properties>
diff --git a/guice/src/main/java/com/baeldung/examples/common/Account.java b/guice/src/main/java/com/baeldung/examples/common/Account.java
@@ -5,23 +5,23 @@
 @Component
 public class Account {
 
-    private String accountNumber;
-    private String type;
+	private String accountNumber;
+	private String type;
 
-    public String getAccountNumber() {
-        return accountNumber;
-    }
+	public String getAccountNumber() {
+		return accountNumber;
+	}
 
-    public void setAccountNumber(String accountNumber) {
-        this.accountNumber = accountNumber;
-    }
+	public void setAccountNumber(String accountNumber) {
+		this.accountNumber = accountNumber;
+	}
 
-    public String getType() {
-        return type;
-    }
+	public String getType() {
+		return type;
+	}
 
-    public void setType(String type) {
-        this.type = type;
-    }
+	public void setType(String type) {
+		this.type = type;
+	}
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/common/AccountService.java b/guice/src/main/java/com/baeldung/examples/common/AccountService.java
@@ -1,8 +1,5 @@
 package com.baeldung.examples.common;
 
-import java.util.List;
-
 public interface AccountService {
-    public List<String> listAccountTypes();
 
 }
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,15 +1,8 @@
 package com.baeldung.examples.common;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.springframework.stereotype.Component;
 
 @Component
 public class AccountServiceImpl implements AccountService {
 
-    public List<String> listAccountTypes() {
-        return Arrays.asList("Checking", "Saving");
-    }
-
 }
diff --git a/guice/src/main/java/com/baeldung/examples/common/Address.java b/guice/src/main/java/com/baeldung/examples/common/Address.java
diff --git a/guice/src/main/java/com/baeldung/examples/common/AudioBookService.java b/guice/src/main/java/com/baeldung/examples/common/AudioBookService.java
@@ -0,0 +1,5 @@
+package com.baeldung.examples.common;
+
+public interface AudioBookService {
+
+}
diff --git a/guice/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java b/guice/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java
@@ -0,0 +1,5 @@
+package com.baeldung.examples.common;
+
+public class AudioBookServiceImpl implements AudioBookService {
+
+}
diff --git a/guice/src/main/java/com/baeldung/examples/common/AuthorService.java b/guice/src/main/java/com/baeldung/examples/common/AuthorService.java
@@ -0,0 +1,5 @@
+package com.baeldung.examples.common;
+
+public interface AuthorService {
+
+}
diff --git a/guice/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java b/guice/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java
@@ -0,0 +1,5 @@
+package com.baeldung.examples.common;
+
+public class AuthorServiceImpl implements AuthorService {
+
+}
diff --git a/guice/src/main/java/com/baeldung/examples/common/BookService.java b/guice/src/main/java/com/baeldung/examples/common/BookService.java
@@ -1,9 +1,5 @@
 package com.baeldung.examples.common;
 
-import java.util.List;
-
 public interface BookService {
 
-    public List<String> findBestSellerBooks();
-
 }
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,12 +1,10 @@
 package com.baeldung.examples.common;
 
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
 
 public class BookServiceImpl implements BookService {
 
-    public List<String> findBestSellerBooks() {
-        return Arrays.asList("Harry Potter", "Lord of The Rings");
-    }
+	@Autowired(required = false)
+	private AuthorService authorService;
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/guice/Employee.java b/guice/src/main/java/com/baeldung/examples/guice/Employee.java
diff --git a/guice/src/main/java/com/baeldung/examples/guice/Foo.java b/guice/src/main/java/com/baeldung/examples/guice/Foo.java
@@ -1,5 +1,4 @@
 package com.baeldung.examples.guice;
 
-
 public class Foo {
 }
diff --git a/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java b/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java
@@ -4,8 +4,9 @@
 
 import com.google.inject.Inject;
 
-public class FooGenerator {
-    @Inject
-    public FooGenerator(@Nullable Foo foo) {
-    }
+public class FooProcessor {
+
+	@Inject
+	@Nullable
+	private Foo foo;
 }
diff --git a/guice/src/main/java/com/baeldung/examples/guice/GuiceUser.java b/guice/src/main/java/com/baeldung/examples/guice/GuiceUser.java
diff --git a/guice/src/main/java/com/baeldung/examples/guice/GuiceUserService.java b/guice/src/main/java/com/baeldung/examples/guice/GuiceUserService.java
@@ -5,15 +5,15 @@
 
 public class GuiceUserService {
 
-    @Inject
-    private AccountService accountService;
+	@Inject
+	private AccountService accountService;
 
-    public AccountService getAccountService() {
-        return accountService;
-    }
+	public AccountService getAccountService() {
+		return accountService;
+	}
 
-    public void setAccountService(AccountService accountService) {
-        this.accountService = accountService;
-    }
+	public void setAccountService(AccountService accountService) {
+		this.accountService = accountService;
+	}
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/guice/Person.java b/guice/src/main/java/com/baeldung/examples/guice/Person.java
@@ -1,39 +1,24 @@
 package com.baeldung.examples.guice;
 
-import com.baeldung.examples.common.Address;
-import com.google.inject.Inject;
-
 public class Person {
-    private String firstName;
-
-    private String lastName;
-
-    private Address address;
-
-    public String getFirstName() {
-        return firstName;
-    }
+	private String firstName;
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
+	private String lastName;
 
-    public String getLastName() {
-        return lastName;
-    }
+	public String getFirstName() {
+		return firstName;
+	}
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
 
-    public Address getAddress() {
-        return address;
-    }
+	public String getLastName() {
+		return lastName;
+	}
 
-    @Inject
-    public void setAddress(Address address) {
-        this.address = address;
-        address.setCity("Default");
-    }
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
 
 }
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
@@ -17,21 +17,21 @@ public class GuiceModule extends AbstractModule {
 	@Override
 	protected void configure() {
 		try {
-			bind(PersonDao.class).to(PersonDaoImpl.class);
 			bind(AccountService.class).to(AccountServiceImpl.class);
-			bind(Foo.class).toProvider(new Provider<Foo>() {
-				public Foo get() {
-					return null;
-				}
-			});
-
 			bind(Person.class).toConstructor(Person.class.getConstructor());
 			// bind(Person.class).toProvider(new Provider<Person>() {
 			// public Person get() {
 			// Person p = new Person();
 			// return p;
 			// }
 			// });
+			bind(Foo.class).toProvider(new Provider<Foo>() {
+				public Foo get() {
+					return null;
+				}
+			});
+			bind(PersonDao.class).to(PersonDaoImpl.class);
+
 		} catch (NoSuchMethodException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/guice/src/main/java/com/baeldung/examples/spring/SpringBeansConfig.java b/guice/src/main/java/com/baeldung/examples/spring/SpringBeansConfig.java
@@ -0,0 +1,17 @@
+package com.baeldung.examples.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 {
+
+	@Bean
+	public AudioBookService audioBookServiceGenerator() {
+		return new AudioBookServiceImpl();
+	}
+
+}
diff --git a/guice/src/main/java/com/baeldung/examples/spring/SpringMainConfig.java b/guice/src/main/java/com/baeldung/examples/spring/SpringMainConfig.java
@@ -3,17 +3,19 @@
 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")
-public class AppConfig {
+public class SpringMainConfig {
 
-    @Bean
-    public BookService bookServiceGenerator() {
-        return new BookServiceImpl();
-    }
+	@Bean
+	public BookService bookServiceGenerator() {
+		return new BookServiceImpl();
+	}
 
 }
diff --git a/guice/src/main/java/com/baeldung/examples/spring/SpringUser.java b/guice/src/main/java/com/baeldung/examples/spring/SpringUser.java
diff --git a/guice/src/main/java/com/baeldung/examples/spring/UserService.java b/guice/src/main/java/com/baeldung/examples/spring/UserService.java
diff --git a/guice/src/test/java/com/baeldung/examples/GuiceUnitTest.java b/guice/src/test/java/com/baeldung/examples/GuiceUnitTest.java
diff --git a/guice/src/test/java/com/baeldung/examples/SpringUnitTest.java b/guice/src/test/java/com/baeldung/examples/SpringUnitTest.java

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 java.util.List;`
`4`		`-`
`5`	`3`	`public interface AccountService {`
`6`		`- public List<String> listAccountTypes();`
`7`	`4`
`8`	`5`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package com.baeldung.examples.common;
++
 +public interface AudioBookService {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`package com.baeldung.examples.common;`
`2`	`2`
`3`		`-import java.util.List;`
`4`		`-`
`5`	`3`	`public interface BookService {`
`6`	`4`
`7`		`- public List<String> findBestSellerBooks();`
`8`		`-`
`9`	`5`	`}`