GP-82 review updates

Author: shryhus

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

@@ -1,24 +1,27 @@
 package com.bobocode.config;
 
 import com.bobocode.TestDataGenerator;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.ImportResource;
 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'.
- *
+ * <p>
  * 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}.
- *
+ * <p>
  * 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;
+ * hint: use method creation approach with @Bean annotation;
  * todo 4: Don't specify bean name "dataGenerator" explicitly
  */
 

3-0-spring-framework/3-0-0-hello-spring-framework/src/main/java/com/bobocode/service/AccountService.java

@@ -2,9 +2,6 @@
 
 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;

3-0-spring-framework/3-0-0-hello-spring-framework/src/test/java/com/bobocode/ApplicationConfigTest.java

@@ -40,7 +40,7 @@ void componentScanIsEnabled() {
 
     @Test
     @Order(3)
-    @DisplayName("@ComponentScan packages are specified")
+    @DisplayName("@ComponentScan configured for \"dao\" and \"service\" packages")
     void componentScanPackagesAreSpecified() {
         ComponentScan componentScan = ApplicationConfig.class.getAnnotation(ComponentScan.class);
         String[] packages = componentScan.basePackages();

3-0-spring-framework/3-0-0-hello-spring-framework/src/test/java/com/bobocode/ApplicationContextTest.java

@@ -1,8 +1,7 @@
-     package com.bobocode;
+package com.bobocode;
 
 import com.bobocode.dao.AccountDao;
 import com.bobocode.dao.FakeAccountDao;
-import com.bobocode.model.Account;
 import com.bobocode.service.AccountService;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +10,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import java.util.Comparator;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -96,17 +94,4 @@ void accountServiceBeanName() {
 
         assertThat(accountServiceMap.keySet()).contains("accountService");
     }
-
-    @Test
-    @Order(8)
-    @DisplayName("Find the richest account")
-    void findRichestAccount() {
-        Account richestAccount = accountService.findRichestAccount();
-
-        Account actualRichestAccount = accountDao.findAll().stream()
-                .max(Comparator.comparing(Account::getBalance))
-                .orElseThrow();
-
-        assertThat(richestAccount).isEqualTo(actualRichestAccount);
-    }
 }

java-web-course-util/spring-framework-exercises-model/pom.xml

@@ -11,12 +11,4 @@
 
     <artifactId>spring-framework-exercises-model</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.2.Final</version>
-        </dependency>
-    </dependencies>
-
 </project>

java-web-course-util/spring-framework-exercises-model/src/main/java/com/bobocode/model/jpa/Role.java

@@ -2,25 +2,16 @@
 
 import com.bobocode.model.Account;
 import com.bobocode.model.Gender;
-import com.bobocode.model.jpa.Role;
-import com.bobocode.model.jpa.RoleType;
-import com.bobocode.model.jpa.User;
 import io.codearte.jfairy.Fairy;
 import io.codearte.jfairy.producer.person.Person;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Random;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toSet;
 
 public class TestDataGenerator {
-    public Account generateAccount(){
+    public Account generateAccount() {
         Fairy fairy = Fairy.create();
         Person person = fairy.person();
         Random random = new Random();
@@ -39,43 +30,4 @@ public Account generateAccount(){
 
         return fakeAccount;
     }
-
-    public User generateUser() {
-        User user = generateUserOnly();
-        user.addRoles(generateRoleSet());
-        return user;
-    }
-
-    public User generateUser(RoleType... roleTypes) {
-        Set<Role> roles = Stream.of(roleTypes).map(Role::valueOf).collect(Collectors.toSet());
-        User user = generateUserOnly();
-        user.addRoles(roles);
-        return user;
-    }
-
-    private User generateUserOnly() {
-        Fairy fairy = Fairy.create();
-        Person person = fairy.person();
-
-        User user = new User();
-        user.setFirstName(person.getFirstName());
-        user.setLastName(person.getLastName());
-        user.setEmail(person.getEmail());
-        user.setBirthday(LocalDate.of(
-                person.getDateOfBirth().getYear(),
-                person.getDateOfBirth().getMonthOfYear(),
-                person.getDateOfBirth().getDayOfMonth()));
-        user.setCreationDate(LocalDate.now());
-        return user;
-    }
-
-    public static Set<Role> generateRoleSet() {
-        Random random = new Random();
-        Predicate<RoleType> randomPredicate = i -> random.nextBoolean();
-
-        return Stream.of(RoleType.values())
-                .filter(randomPredicate)
-                .map(Role::valueOf)
-                .collect(toSet());
-    }
 }