NeilAlishev · SGoriainov · Mar 30, 2023 · Mar 30, 2023 · Jun 16, 2023 · Jun 17, 2023
diff --git a/...ngControllersIntro/src/main/java/ru/alishev/springcourse/controllers/FirstController.java b/...ngControllersIntro/src/main/java/ru/alishev/springcourse/controllers/FirstController.java
@@ -1,8 +1,10 @@
 package ru.alishev.springcourse.controllers;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author Neil Alishev
@@ -11,11 +13,34 @@
 @RequestMapping("/first")
 public class FirstController {
 
+
     @GetMapping("/hello")
-    public String helloPage() {
+    public String helloPage(@RequestParam(value="a", required = false) int a,
+                            @RequestParam(value="b", required = false) int b,
+                            @RequestParam(value="action", required = false) String action,
+                            Model model) {
+        model.addAttribute("someMessage","result "+ a + action + b +" = " + calculate(a,b,action));
+
+        //int sum = calculate(a,b,action);
+
+        //System.out.println("Hello, " + name + " " + surname);
         return "first/hello";
     }
 
+    public int calculate(int a, int b, String action) {
+        switch (action) {
+            case "multiplication":
+                return a * b;
+            case "addition":
+                return a+b;
+            case "substruction":
+                return a%b;
+            case "division":
+                return a-b;
+            default: return 0;
+        }
+    }
+
     @GetMapping("/goodbye")
     public String goodByePage() {
         return "first/goodbye";

diff --git a/Lesson17.SpringControllersIntro/src/main/webapp/WEB-INF/views/first/goodbye.html b/Lesson17.SpringControllersIntro/src/main/webapp/WEB-INF/views/first/goodbye.html
@@ -8,5 +8,6 @@
 Goodbye!
 
 <a href="/first/hello">Say hello</a> or <a href="/exit">Exit</a>
+or <a href ="/first/hello?name=Pidor&surname=Chertov">Request with anower parameters!!OMG</a>
 </body>
 </html>
diff --git a/Lesson17.SpringControllersIntro/src/main/webapp/WEB-INF/views/first/hello.html b/Lesson17.SpringControllersIntro/src/main/webapp/WEB-INF/views/first/hello.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8">
     <title>Hello</title>
@@ -8,5 +8,10 @@
 Hello!
 
 <a href="/first/goodbye">Say goodbye</a> or <a href="/exit">Exit</a>
+or <a href ="/first/hello?a=4&b=2&action=addition">Request with parameters</a>
+
+<p th:text="${someMessage}" />
+
+
 </body>
 </html>
diff --git a/Lesson20_Starter.IntroToModel/pom.xml b/Lesson20_Starter.IntroToModel/pom.xml
@@ -18,17 +18,19 @@
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
 
-    <spring.version>5.2.1.RELEASE</spring.version>
+    <spring.version>6.0.4</spring.version>
   </properties>
 
   <dependencies>
+    <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.9.2</version>
       <scope>test</scope>
     </dependency>
 
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
@@ -59,12 +61,16 @@
       <version>3.0.11.RELEASE</version>
     </dependency>
 
+    <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.1</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
+
+
+
   </dependencies>
 
   <build>

diff --git a/Lesson21.CRUD_App1/pom.xml b/Lesson21.CRUD_App1/pom.xml
@@ -1,7 +1,7 @@
 <?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">
+         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>ru.alishev.springcourse</groupId>
@@ -102,15 +102,15 @@
         </plugin>
       </plugins>
     </pluginManagement>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                  <source>8</source>
-                  <target>8</target>
-              </configuration>
-          </plugin>
-      </plugins>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
-</project>
+</project>
diff --git a/...rc/main/java/ru/alishev/springcourse/config/MySpringMvcDispatcherSerlvetIntitializer.java b/...rc/main/java/ru/alishev/springcourse/config/MySpringMvcDispatcherSerlvetIntitializer.java
@@ -1,7 +1,11 @@
 package ru.alishev.springcourse.config;
 
+import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
 /**
  * @author Neil Alishev
  */
@@ -20,4 +24,15 @@ protected Class<?>[] getServletConfigClasses() {
     protected String[] getServletMappings() {
         return new String[]{"/"};
     }
+
+    @Override
+    public void onStartup(ServletContext aServletContext) throws ServletException {
+        super.onStartup(aServletContext);
+        registerHiddenFieldFilter(aServletContext);
+    }
+
+    private void registerHiddenFieldFilter(ServletContext aContext) {
+        aContext.addFilter("hiddenHttpMethodFilter",
+                new HiddenHttpMethodFilter()).addMappingForUrlPatterns(null ,true, "/*");
+    }
 }
diff --git a/Lesson21.CRUD_App1/src/main/java/ru/alishev/springcourse/controllers/PeopleController.java b/Lesson21.CRUD_App1/src/main/java/ru/alishev/springcourse/controllers/PeopleController.java
@@ -3,10 +3,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 import ru.alishev.springcourse.dao.PersonDAO;
+import ru.alishev.springcourse.models.Person;
 
 /**
  * @author Neil Alishev
@@ -33,4 +32,32 @@ public String show(@PathVariable("id") int id, Model model) {
         model.addAttribute("person", personDAO.show(id));
         return "people/show";
     }
+
+    @GetMapping("/new")
+    public String newPerson (@ModelAttribute("person") Person person) {
+        return  "people/new";
+
+    }
+    @PostMapping()
+    public String create(@ModelAttribute("person") Person person) {
+        personDAO.save(person);
+        return "redirect:/people";
+    }
+    @GetMapping("/{id}/edit")
+    public String edit (Model model,@PathVariable("id") int id) {
+        model.addAttribute("person",personDAO.show(id));
+        return "people/edit";
+    }
+
+    @PatchMapping("/{id}")
+    public String update (@ModelAttribute("person") Person person, @PathVariable("id") int id) {
+        personDAO.update(id,person);
+        return "redirect:/people";
+    }
+
+    @DeleteMapping("/{id}")
+    public String delete (@PathVariable("id") int id) {
+        personDAO.delete(id);
+        return "redirect:/people";
+    }
 }
diff --git a/Lesson21.CRUD_App1/src/main/java/ru/alishev/springcourse/dao/PersonDAO.java b/Lesson21.CRUD_App1/src/main/java/ru/alishev/springcourse/dao/PersonDAO.java
@@ -30,4 +30,19 @@ public List<Person> index() {
     public Person show(int id) {
         return people.stream().filter(person -> person.getId() == id).findAny().orElse(null);
     }
+
+    public void save(Person person) {
+        person.setId(++PEOPLE_COUNT);
+        people.add(person);
+    }
+
+    public void update (int id, Person updatePerson) {
+        Person personToBeUpdated = show(id);
+
+        personToBeUpdated.setName(updatePerson.getName());
+    }
+
+    public void delete (int id) {
+        people.removeIf(p -> p.getId()==id);
+    }
 }
diff --git a/Lesson21.CRUD_App1/src/main/java/ru/alishev/springcourse/models/Person.java b/Lesson21.CRUD_App1/src/main/java/ru/alishev/springcourse/models/Person.java
@@ -7,6 +7,10 @@ public class Person {
     private int id;
     private String name;
 
+    public  Person () {
+
+    }
+
     public Person(int id, String name) {
         this.id = id;
         this.name = name;

diff --git a/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/edit.html b/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/edit.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Update person</title>
+</head>
+<body>
+
+<form th:method="Patch" th:action="@{/people/{id}(id=${person.getId()})}" th:object="${person}">
+<label for="name">Enter name: </label>
+<input type="text" th:field="*{name}" id="name"/>
+<br/>
+<input type="submit" value="Update!"/>
+</form>
+
+</body>
+</html>
diff --git a/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/index.html b/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/index.html
@@ -2,13 +2,18 @@
 <html lang="en" xmlns:th="http://thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>Все люди</title>
+    <title>All people</title>
 </head>
 <body>
 
 <div th:each="person : ${people}">
     <a th:href="@{/people/{id}(id=${person.getId()})}" th:text="${person.getName()}">user</a>
 </div>
 
+<br/>
+<hr/>
+
+<a href="/people/new">Create new person</a>
+
 </body>
 </html>
diff --git a/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/new.html b/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/new.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>New person</title>
+</head>
+<body>
+
+<form th:method="POST" th:action="@{/people}" th:object="${person}">
+    <label for="name">Enter name: </label>
+    <input type="text" th:field="*{name}" id="name"/>
+    <br/>
+    <input type="submit" value="Create!"/>
+
+</form>
+
+</body>
+</html>
diff --git a/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/show.html b/Lesson21.CRUD_App1/src/main/webapp/WEB-INF/views/people/show.html
@@ -2,10 +2,16 @@
 <html lang="en" xmlns:th="http://thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>Человек</title>
+    <title>Person</title>
 </head>
 <body>
 <p th:text="${person.getName()}">VALUE</p>
 <p th:text="${person.getId()}">VALUE</p>
+
+<a th:href="@{/people/{id}/edit(id=${person.getId()})}">Edit</a>
+
+<form th:method="DELETE" th:action="@{/people/{id}(id=${person.getId()})}">
+    <input type="submit" value="Delete"/>
+</form>
 </body>
 </html>
diff --git a/Lesson24_Starter.SpringFormsValidation/pom.xml b/Lesson24_Starter.SpringFormsValidation/pom.xml
@@ -65,6 +65,21 @@
       <version>4.0.1</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>6.1.6.Final</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.5.4</version>
+    </dependency>
+
+
   </dependencies>
 
   <build>

diff --git a/...ngFormsValidation/src/main/java/ru/alishev/springcourse/controllers/PeopleController.java b/...ngFormsValidation/src/main/java/ru/alishev/springcourse/controllers/PeopleController.java
@@ -3,10 +3,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import ru.alishev.springcourse.dao.PersonDAO;
 import ru.alishev.springcourse.models.Person;
 
+import javax.validation.Valid;
+
 /**
  * @author Neil Alishev
  */
@@ -39,7 +42,10 @@ public String newPerson(@ModelAttribute("person") Person person) {
     }
 
     @PostMapping()
-    public String create(@ModelAttribute("person") Person person) {
+    public String create(@ModelAttribute("person") @Valid Person person,
+                         BindingResult bindingResult) {
+        if (bindingResult.hasErrors())
+            return "people/new";
         personDAO.save(person);
         return "redirect:/people";
     }
@@ -51,7 +57,11 @@ public String edit(Model model, @PathVariable("id") int id) {
     }
 
     @PatchMapping("/{id}")
-    public String update(@ModelAttribute("person") Person person, @PathVariable("id") int id) {
+    public String update(@ModelAttribute("person") @Valid Person person, BindingResult bindingResult,
+                         @PathVariable("id") int id) {
+        if ( bindingResult.hasErrors())
+            return "people/edit";
+
         personDAO.update(id, person);
         return "redirect:/people";
     }