Merge branch 'main' into GP-67_new_hello-spring-framework_(for_web)_exercise_MAIN

# Conflicts:
#	java-web-course-util/pom.xml

Author: tboychuk

2-0-servlet-api/2-0-1-hello-servlet-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>2-0-1-date-servlet-api</artifactId>
+    <artifactId>2-0-1-hello-servlet-api</artifactId>
     <packaging>war</packaging>
 
     <properties>

2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java

@@ -6,7 +6,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reflections.Reflections;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -17,11 +16,11 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.LocalDate;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 
@@ -35,9 +34,6 @@ public class DateServletTest {
     @Mock
     private HttpServletResponse response;
 
-    @Mock
-    private ServletOutputStream outputStream;
-
     private Object dateServletObject;
     private Class<?> dateServletClass;
 
@@ -55,12 +51,14 @@ public void init() throws ClassNotFoundException, IllegalAccessException, Invoca
 
     @Test
     @Order(1)
+    @DisplayName("DateServlet class exists")
     void dateServletClassExists() throws ClassNotFoundException {
         Class.forName(SERVLET_PACKAGE + "." + DATE_SERVLET);
     }
 
     @Test
     @Order(2)
+    @DisplayName("DateServlet class extends HttpServlet")
     void dateServletExtendsHttpServlet() {
 
         Set<Class<? extends HttpServlet>> httpServlets =
@@ -75,6 +73,7 @@ void dateServletExtendsHttpServlet() {
 
     @Test
     @Order(3)
+    @DisplayName("DateServlet class is marked as @WebServlet")
     void dateServletIsMarkedAsWebServlet() {
         Set<Class<?>> servlets =
                 reflections.getTypesAnnotatedWith(WebServlet.class);
@@ -87,6 +86,7 @@ void dateServletIsMarkedAsWebServlet() {
 
     @Test
     @Order(4)
+    @DisplayName("DateServlet is mapped with \"/date\" path")
     void dateServletIsMarkedWithProperPath() throws ClassNotFoundException {
         String[] value = Class.forName(SERVLET_PACKAGE + "." + DATE_SERVLET)
                 .getAnnotation(WebServlet.class).value();
@@ -95,7 +95,8 @@ void dateServletIsMarkedWithProperPath() throws ClassNotFoundException {
 
     @Test
     @Order(5)
-    void dateServletReturnsDateInResponse() throws IOException, NoSuchMethodException, InvocationTargetException,
+    @DisplayName("DateServlet returns current date in a response")
+    void dateServletReturnsDateInResponse() throws IOException, InvocationTargetException,
             IllegalAccessException {
         Method doGetMethod = getDoGetMethod();
 
@@ -107,8 +108,12 @@ void dateServletReturnsDateInResponse() throws IOException, NoSuchMethodExceptio
         assertThat(stringWriter.getBuffer().toString()).contains(LocalDate.now().toString());
     }
 
-    private Method getDoGetMethod() throws NoSuchMethodException {
-        return dateServletClass
-                .getMethod("doGet", HttpServletRequest.class, HttpServletResponse.class);
+    private Method getDoGetMethod() {
+        var method = Arrays.stream(dateServletClass.getDeclaredMethods())
+                .filter(m -> m.getName().equals("doGet"))
+                .findAny()
+                .orElseThrow();
+        method.setAccessible(true);
+        return method;
     }
 }

3-0-spring-framework/3-0-1-hello-spring-mvc/src/main/java/com/bobocode/mvc/data/Notes.java

@@ -1,23 +1,25 @@
 package com.bobocode.mvc.data;
 
-
 import com.bobocode.mvc.model.Note;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 
 @Component
 public class Notes {
-    private final Map<UUID, Note> notes = new LinkedHashMap<>();
+    private final Map<UUID, Note> notesMap = new HashMap<>();
 
     public List<Note> getAll(){
-        return new ArrayList<>(notes.values());
+        var noteList = new ArrayList<>(notesMap.values());
+        noteList.sort(Comparator.comparing(Note::getCreatedOn));
+        return noteList;
     }
 
     public void add(Note note) {
         note.setId(UUID.randomUUID());
-        note.setCreationDate(LocalDate.now());
-        notes.put(note.getId(), note);
+        note.setCreatedOn(LocalDateTime.now());
+        notesMap.put(note.getId(), note);
     }
 }

3-0-spring-framework/3-0-1-hello-spring-mvc/src/main/java/com/bobocode/mvc/model/Note.java

@@ -5,6 +5,7 @@
 import lombok.NonNull;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.UUID;
 
 @Data
@@ -15,7 +16,7 @@ public class Note {
     private String title;
     @NonNull
     private String text;
-    private LocalDate creationDate;
+    private LocalDateTime createdOn;
 
     public Note(String title, String text) {
         this.title = title;

3-0-spring-framework/3-0-1-hello-spring-mvc/src/main/resources/templates/notes.html

@@ -31,7 +31,7 @@ <h1 class="title">My notes</h1>
     <div class="note" th:each="theNote : ${noteList}">
         <div class="title_note" th:text="${theNote.title}">The title</div>
         <div class="text_note" th:text="${theNote.text}">The text of very long story, or just shopping list</div>
-        <div class="date_note" th:text="${theNote.creationDate}">23.04.2021</div>
+        <div class="date_note" th:text="${theNote.createdOn.toLocalDate()}">23.04.2021</div>
     </div>
 </div>
 

3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/README.MD

@@ -0,0 +1,19 @@
+# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Hello Spring MVC exercise
+Improve your *Spring MVC* configuration skills 💪
+### Task
+The task is to **configure a typical *Spring MVC* application** separating web and root configs. Your job is to follow 
+the instructions in the *todo* section and **implement a proper configuration.**  
+
+To verify your configuration, run `WelcomeWebAppTest.java`
+
+ 
+### Pre-conditions ❗
+You're supposed to be familiar with *Spring MVC*
+
+### How to start ❓
+* Just clone the repository and start implementing the **todo** section, verify your changes by running tests
+* If you don't have enough knowledge about this domain, check out the [links below](#Related-materials-ℹ)
+* Don't worry if you got stuck, checkout the **exercise/completed** branch and see the final implementation
+ 
+### Related materials ℹ
+ todo

3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/pom.xml

@@ -0,0 +1,49 @@
+<?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">
+    <parent>
+        <artifactId>3-0-spring-framework</artifactId>
+        <groupId>com.bobocode</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>3-1-1-dispatcher-servlet-initializer</artifactId>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.2.12.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.bobocode</groupId>
+            <artifactId>java-web-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/src/main/java/com/bobocode/config/RootConfig.java

@@ -0,0 +1,19 @@
+package com.bobocode.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+/**
+ * This class provides application root (non-web) configuration for a basic spring application context
+ * (containing middle-tire services, datasource, etc.).
+ * The configuration must exclude the web layer of the application.
+ * <p>
+ * todo: mark this class as config
+ * todo: enable component scanning for all packages in "com.bobocode"
+ * todo: ignore all web related config and beans (ignore @{@link Controller}, ignore {@link EnableWebMvc}) using exclude filter
+ */
+public class RootConfig {
+}

3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/src/main/java/com/bobocode/config/WebAppInitializer.java

@@ -0,0 +1,24 @@
+package com.bobocode.config;
+
+import com.bobocode.util.ExerciseNotCompletedException;
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+/**
+ * This class is used to configure DispatcherServlet and links it with application config classes
+ */
+public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        throw new ExerciseNotCompletedException(); //todo: use {@link RootConfig} as root application config class
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        throw new ExerciseNotCompletedException(); //todo: use {@link WebConfig} as ServletConfig class
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        throw new ExerciseNotCompletedException(); //todo: provide default servlet mapping ("/")
+    }
+}

3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/src/main/java/com/bobocode/config/WebConfig.java

@@ -0,0 +1,18 @@
+package com.bobocode.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+/**
+ * This class provides web (servlet) related configuration. In the Web MVC framework,
+ * each DispatcherServlet has its own WebApplicationContext, which inherits all the beans already defined
+ * in the root ApplicationContext.
+ * <p>
+ * todo: mark this class as Spring config class
+ * todo: enable web mvc using annotation
+ * todo: enable component scanning for package "web"
+ */
+
+public class WebConfig {
+}