Merge pull request #27 from bobocode-projects/GP-135-migrate-java-web-course-to-java-17

Stanislav-Zabramnyi · web-flow · commit 82bcb80f76e2 · 2022-08-02T17:12:48.000+02:00
diff --git a/.github/workflows/projectActions.yml b/.github/workflows/projectActions.yml
@@ -16,4 +16,4 @@ jobs:
         uses: srggrs/assign-one-project-github-action@1.2.1
         if: github.event.action == 'opened' || contains(github.event.issue.labels.*.name, 'java-web')
         with:
-          project: 'https://github.com/bobocode-projects/java-web-course/projects/1'
+          project: 'https://github.com/bobocode-projects/java-web-exercises/projects/1'
diff --git a/0-0-intro/0-0-1-welcome-to-java-web-exercises/README.MD b/0-0-intro/0-0-1-welcome-to-java-web-exercises/README.MD
@@ -1,15 +1,15 @@
-# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/> Welcome to Java Web Course
+# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/> Welcome to Java Web Exercises
 
 This is a welcome test project to check if everything works okay on your computer
 
 ### You should have installed on your local machine ❗️
-* [JDK 11+](https://jdk.java.net/15/)
+* [JDK 17+](hhttps://jdk.java.net/17/)
 * [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 
 ### How to start ❓
 
 * Just **clone the repository** to your computer
-* Open project in your IDE and **configure JDK 11** for the project
+* Open project in your IDE and **configure JDK 17** for the project
 * Open terminal and **run a command** `./mvnw clean package` (UNIX) or `mvnw.cmd clean package` (Windows)
 * Open class `WelcomeToJavaWebCourseApp` and **run** `main()`
 * [Click here](http://localhost:8080/welcome) 🔗
diff --git a/0-0-intro/0-0-1-welcome-to-java-web-exercises/pom.xml b/0-0-intro/0-0-1-welcome-to-java-web-exercises/pom.xml
@@ -9,11 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>0-0-1-welcome-to-java-web-course</artifactId>
+    <artifactId>0-0-1-welcome-to-java-web-exercises</artifactId>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
diff --git a/0-0-intro/0-0-1-welcome-to-java-web-exercises/src/main/java/com/bobocode/intro/WelcomeToJavaWebCourseApp.java b/0-0-intro/0-0-1-welcome-to-java-web-exercises/src/main/java/com/bobocode/intro/WelcomeToJavaWebCourseApp.java
diff --git a/0-0-intro/0-0-1-welcome-to-java-web-exercises/src/main/resources/static/logo.png b/0-0-intro/0-0-1-welcome-to-java-web-exercises/src/main/resources/static/logo.png
diff --git a/0-0-intro/0-0-1-welcome-to-java-web-exercises/src/main/resources/templates/welcome.html b/0-0-intro/0-0-1-welcome-to-java-web-exercises/src/main/resources/templates/welcome.html
@@ -6,7 +6,7 @@
 </head>
 <body align="center">
 <p style="font-size: 64px; margin-top: 10%" th:text="${name != null} ? ${name} + ',' : '&nbsp;'"></p>
-<p style="font-size: 64px; margin-top: 8%">Welcome to <b>Java Web Course</b></p>
+<p style="font-size: 64px; margin-top: 8%">Welcome to <b>Java Web Exercises</b></p>
 <div>
     <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/bobo_logo.png"
          style="width: 30%"/>
diff --git a/0-0-intro/pom.xml b/0-0-intro/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -12,7 +12,7 @@
     <artifactId>0-0-intro</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>0-0-1-welcome-to-java-web-course</module>
+        <module>0-0-1-welcome-to-java-web-exercises</module>
     </modules>
 
 </project>
diff --git a/1-0-networking-and-http/1-0-0-hello-network-socket/README.MD b/1-0-networking-and-http/1-0-0-hello-network-socket/README.MD
@@ -20,7 +20,7 @@ Learn **Sockets** – the essential part of Java networking 💪
 
 ---
 
-#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-course/tree/main/0-0-intro#introduction)
+#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-exercises/tree/main/0-0-intro#introduction)
 
 ##
 <div align="center"><img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/animation/GitHub%20Star_3.gif" height=50/></div>
diff --git a/1-0-networking-and-http/1-0-0-hello-network-socket/pom.xml b/1-0-networking-and-http/1-0-0-hello-network-socket/pom.xml
@@ -10,10 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>1-0-0-hello-network-socket</artifactId>
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
     
 
 </project>
diff --git a/1-0-networking-and-http/pom.xml b/1-0-networking-and-http/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/2-0-servlet-api/2-0-1-hello-servlet-api/README.MD b/2-0-servlet-api/2-0-1-hello-servlet-api/README.MD
@@ -2,7 +2,7 @@
 Start learning Servlet API – the foundation of Java web applications 💪
 
 ### Pre-conditions ❗
-You're supposed to be familiar with [Java Fundamentals](https://github.com/bobocode-projects/java-fundamentals-course#welcome-to-the-java-fundamentals-course)
+You're supposed to be familiar with [Java Fundamentals](https://github.com/bobocode-projects/java-fundamentals-exercises#welcome-to-the-java-fundamentals-exercises)
 
 ### Objectives
 * **install** [Apache Tomcat Container](https://tomcat.apache.org/download-90.cgi) locally (if you don't have it yet) ✅
@@ -43,7 +43,7 @@ todo
 [![Linked List](https://yt-embed.herokuapp.com/embed?v=s11Fjue5Svs)](https://youtu.be/s11Fjue5Svs)
 
 ---
-#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-course/tree/main/0-0-intro#introduction)
+#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-exercises/tree/main/0-0-intro#introduction)
 
 ##
 <div align="center"><img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/animation/GitHub%20Star_3.gif" height=50/></div>
diff --git a/2-0-servlet-api/2-0-1-hello-servlet-api/pom.xml b/2-0-servlet-api/2-0-1-hello-servlet-api/pom.xml
@@ -13,8 +13,6 @@
     <packaging>war</packaging>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
diff --git a/2-0-servlet-api/pom.xml b/2-0-servlet-api/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/3-0-spring-framework/3-0-0-hello-spring-framework/README.MD b/3-0-spring-framework/3-0-0-hello-spring-framework/README.MD
@@ -23,7 +23,7 @@ You're supposed to be familiar with *Spring IoC* and *Dependency injection*
 [![Linked List](https://yt-embed.herokuapp.com/embed?v=IjyYJhIRNG4)](https://youtu.be/IjyYJhIRNG4)
 
 ---
-#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-course/tree/main/0-0-intro#introduction)
+#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-exercises/tree/main/0-0-intro#introduction)
 
 ##
 <div align="center"><img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/animation/GitHub%20Star_3.gif" height=50/></div>
diff --git a/3-0-spring-framework/3-0-0-hello-spring-framework/src/test/java/com/bobocode/ApplicationContextTest.java b/3-0-spring-framework/3-0-0-hello-spring-framework/src/test/java/com/bobocode/ApplicationContextTest.java
@@ -1,20 +1,21 @@
 package com.bobocode;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.bobocode.dao.AccountDao;
-import com.bobocode.dao.FakeAccountDao;
 import com.bobocode.service.AccountService;
-import org.junit.jupiter.api.*;
+import java.util.Map;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 @SpringJUnitConfig
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class ApplicationContextTest {
diff --git a/3-0-spring-framework/3-0-1-hello-spring-mvc/README.MD b/3-0-spring-framework/3-0-1-hello-spring-mvc/README.MD
@@ -6,7 +6,7 @@ Improve your *SSpring MVC* skills
 
 ---
 
-#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-course/tree/main/0-0-intro#introduction)
+#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-exercises/tree/main/0-0-intro#introduction)
 
 ##
 <div align="center"><img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/animation/GitHub%20Star_3.gif" height=50/></div>
diff --git a/3-0-spring-framework/3-0-2-view-resolver/pom.xml b/3-0-spring-framework/3-0-2-view-resolver/pom.xml
@@ -14,8 +14,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/README.MD b/3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/README.MD
@@ -19,7 +19,7 @@ You're supposed to be familiar with *Spring MVC*
  todo
 
 ---
-#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-course/tree/main/0-0-intro#introduction)
+#### 🆕 First time here? – [See Introduction](https://github.com/bobocode-projects/java-fundamentals-exercises/tree/main/0-0-intro#introduction)
 
 ##
 <div align="center"><img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/animation/GitHub%20Star_3.gif" height=50/></div>
diff --git a/3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/pom.xml b/3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/pom.xml
@@ -33,7 +33,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.3.2</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
diff --git a/3-0-spring-framework/3-2-1-account-rest-api/pom.xml b/3-0-spring-framework/3-2-1-account-rest-api/pom.xml
@@ -44,7 +44,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.3.2</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
diff --git a/3-0-spring-framework/pom.xml b/3-0-spring-framework/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/4-0-spring-boot-rest-api/pom.xml b/4-0-spring-boot-rest-api/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/5-0-spring-boot-rest-client/pom.xml b/5-0-spring-boot-rest-client/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Welcome to the Java Web Course
+# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Welcome to the Java Web Exercises
 Build strong networking and web development skills that you will need for real-world Enterprise Java development
 
 ## Why
diff --git a/java-web-exercises-util/java-web-util/pom.xml b/java-web-exercises-util/java-web-util/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course-util</artifactId>
+        <artifactId>java-web-exercises-util</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/java-web-exercises-util/java-web-util/src/main/java/com/bobocode/util/ExerciseNotCompletedException.java b/java-web-exercises-util/java-web-util/src/main/java/com/bobocode/util/ExerciseNotCompletedException.java
diff --git a/java-web-exercises-util/pom.xml b/java-web-exercises-util/pom.xml
@@ -3,14 +3,14 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
-    <artifactId>java-web-course-util</artifactId>
+    <artifactId>java-web-exercises-util</artifactId>
 
     <modules>
         <module>spring-framework-exercises-model</module>
diff --git a/java-web-exercises-util/spring-framework-exercises-model/pom.xml b/java-web-exercises-util/spring-framework-exercises-model/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course-util</artifactId>
+        <artifactId>java-web-exercises-util</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/java-web-exercises-util/spring-framework-exercises-model/src/main/java/com/bobocode/model/Account.java b/java-web-exercises-util/spring-framework-exercises-model/src/main/java/com/bobocode/model/Account.java
diff --git a/java-web-exercises-util/spring-framework-exercises-model/src/main/java/com/bobocode/model/Gender.java b/java-web-exercises-util/spring-framework-exercises-model/src/main/java/com/bobocode/model/Gender.java
diff --git a/java-web-exercises-util/spring-framework-exercises-util/pom.xml b/java-web-exercises-util/spring-framework-exercises-util/pom.xml
@@ -3,7 +3,7 @@
          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>java-web-course-util</artifactId>
+        <artifactId>java-web-exercises-util</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -19,9 +19,9 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>io.codearte.jfairy</groupId>
+            <groupId>com.devskiller</groupId>
             <artifactId>jfairy</artifactId>
-            <version>0.5.7</version>
+            <version>0.6.5</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/java-web-exercises-util/spring-framework-exercises-util/src/main/java/com/bobocode/TestDataGenerator.java b/java-web-exercises-util/spring-framework-exercises-util/src/main/java/com/bobocode/TestDataGenerator.java
@@ -2,15 +2,15 @@
 
 import com.bobocode.model.Account;
 import com.bobocode.model.Gender;
-import io.codearte.jfairy.Fairy;
-import io.codearte.jfairy.producer.person.Person;
-
+import com.devskiller.jfairy.Fairy;
+import com.devskiller.jfairy.producer.person.Person;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class TestDataGenerator {
+
     public Account generateAccount() {
         Fairy fairy = Fairy.create();
         Person person = fairy.person();
@@ -30,7 +30,7 @@ private Account convertToAccount(Person person) {
         account.setEmail(person.getEmail());
         account.setBirthday(LocalDate.of(
                 person.getDateOfBirth().getYear(),
-                person.getDateOfBirth().getMonthOfYear(),
+                person.getDateOfBirth().getMonth(),
                 person.getDateOfBirth().getDayOfMonth()));
         account.setGender(Gender.valueOf(person.getSex().name()));
         return account;
diff --git a/lesson-demo/pom.xml b/lesson-demo/pom.xml
@@ -3,19 +3,14 @@
          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>java-web-course</artifactId>
+        <artifactId>java-web-exercises</artifactId>
         <groupId>com.bobocode</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>lesson-demo</artifactId>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.servlet</groupId>
diff --git a/pom.xml b/pom.xml
