GP-67 Update tests

Author: shryhus

3-0-spring-framework/3-0-0-hello-spring-framework/pom.xml

@@ -15,23 +15,34 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.0.7.RELEASE</version>
+            <version>5.2.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>5.0.7.RELEASE</version>
+            <version>5.2.12.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.bobocode</groupId>
+            <artifactId>spring-framework-exercises-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.24</version>
+        </dependency>
         <dependency>
             <groupId>com.bobocode</groupId>
-            <artifactId>spring-framework-exercises-util</artifactId>
+            <artifactId>spring-framework-exercises-model</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 

3-0-spring-framework/3-0-0-hello-spring-framework/src/main/java/com/bobocode/config/AppConfig.java

@@ -0,0 +1,27 @@
+package com.bobocode.config;
+
+import com.bobocode.TestDataGenerator;
+import org.springframework.context.annotation.*;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class specify application context configuration. Basically, it's all about which instances of which classes
+ * should be created and registered in the context. An instance that is registered in the context is called 'bean'.
+ *
+ * To tell the container, which bean should be created, you could either specify packages to scan using @{@link ComponentScan},
+ * or declare your own beans using @{@link Bean}. When you use @{@link ComponentScan} the container will discover
+ * specified package and its sub-folders, to find all classes marked @{@link Component}.
+ *
+ * If you want to import other configs from Java class or XML file, you could use @{@link Import}
+ * and @{@link ImportResource} accordingly
+ * <p>
+ * todo 1: make this class a Spring configuration class
+ * todo 2: enable component scanning for dao and service packages
+ * todo 3: provide explicit configuration for a bean of type {@link TestDataGenerator} with name "dataGenerator" in this class.
+ *       hint: use method creation approach with @Bean annotation;
+ * todo 4: Don't specify bean name "dataGenerator" explicitly
+ */
+
+public class ApplicationConfig {
+
+}

3-0-spring-framework/3-0-0-hello-spring-framework/src/main/java/com/bobocode/config/ApplicationConfig.java

@@ -3,18 +3,21 @@
 import com.bobocode.TestDataGenerator;
 import com.bobocode.model.Account;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
 
 /**
- * Provides a fake {@link AccountDao} implementation that uses generated fake data.
+ * This class should be marked with @{@link Component}, thus Spring container will create an instance
+ * of {@link FakeAccountDao} class, and will register it the context.
  * <p>
  * todo: configure this class as Spring component with bean name "accountDao"
- * todo: use explicit (with {@link Autowired} annotation) constructor-based dependency injection
+ * todo: use explicit (with {@link Autowired} annotation) constructor-based dependency injection for specific bean
  */
+
 public class FakeAccountDao implements AccountDao {
     private List<Account> accounts;
 

3-0-spring-framework/3-0-0-hello-spring-framework/src/main/java/com/bobocode/dao/FakeAccountDao.java

@@ -2,6 +2,9 @@
 
 import com.bobocode.dao.AccountDao;
 import com.bobocode.model.Account;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.Comparator;
 import java.util.List;
@@ -12,6 +15,7 @@
  * todo: configure {@link AccountService} bean implicitly using special annotation for service classes
  * todo: use implicit constructor-based dependency injection (don't use {@link org.springframework.beans.factory.annotation.Autowired})
  */
+
 public class AccountService {
     private final AccountDao accountDao;
 
@@ -25,5 +29,4 @@ public Account findRichestAccount() {
                 .max(Comparator.comparing(Account::getBalance))
                 .get();
     }
-
 }