From dad16b0efd567ed1ee772b0e0f4902ab010ac0ac Mon Sep 17 00:00:00 2001
From: Ridvan Ozkerim <rozkerim@gmail.com>
Date: Sun, 27 Aug 2023 01:07:31 +0300
Subject: [PATCH] upgrade versions to java 17 & spring-boot 3 & mysql 8.1

---
 Dockerfile                                  |  2 +-
 Readme                                      |  2 +-
 docker-compose.yml                          |  2 +-
 pom.xml                                     | 11 ++++++-----
 src/main/java/entity/Entitybus.java         |  7 +++----
 src/main/java/rep/EntitybusRepository.java  |  2 --
 src/main/java/rest/EntitybusController.java |  4 +---
 src/main/resources/application.properties   |  4 ++--
 8 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 24eca03..f47e60f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8
+FROM openjdk:17
 
 
 
diff --git a/Readme b/Readme
index 2293449..24843dc 100644
--- a/Readme
+++ b/Readme
@@ -5,7 +5,7 @@ Task:
 Debug the SpringBoot application by running it inside one container with the connection to the mysql database from another container.
 
 It is a spring boot application for the local bus service.
-The database image is already pre-populated and its name is: opavlova/db-mysql:5.7-test
+The database image is already pre-populated and its name is: mysql:8.1.0
     container mysql port: 3306
     db name: DOCKERDB
     password: root
diff --git a/docker-compose.yml b/docker-compose.yml
index 045d7dd..384bd82 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - test
 
   db:
-    image: mysql:5.7.37
+    image: mysql:8.1.0
     container_name: db
     ports:
       - "13306:3306"
diff --git a/pom.xml b/pom.xml
index ca869ff..96ad394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,14 +14,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.8.RELEASE</version>
+        <version>3.1.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
     </properties>
 
     <dependencies>
@@ -43,10 +43,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.49</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.1.0</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/entity/Entitybus.java b/src/main/java/entity/Entitybus.java
index 9d2f8d4..511e10d 100644
--- a/src/main/java/entity/Entitybus.java
+++ b/src/main/java/entity/Entitybus.java
@@ -1,9 +1,8 @@
 package entity;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
+import jakarta.persistence.*;
 
-import javax.persistence.*;
+import java.util.Objects;
 
 /**
  * Created by Olga Pavlova on 9/16/2016.
@@ -44,7 +43,7 @@ public boolean equals(Object o) {
         Entitybus entitybus = (Entitybus) o;
 
         if (eid != entitybus.eid) return false;
-        if (enumber != null ? !enumber.equals(entitybus.enumber) : entitybus.enumber != null) return false;
+        if (!Objects.equals(enumber, entitybus.enumber)) return false;
 
         return true;
     }
diff --git a/src/main/java/rep/EntitybusRepository.java b/src/main/java/rep/EntitybusRepository.java
index f6dd428..86b6278 100644
--- a/src/main/java/rep/EntitybusRepository.java
+++ b/src/main/java/rep/EntitybusRepository.java
@@ -3,7 +3,5 @@
 import entity.Entitybus;
 import org.springframework.data.repository.CrudRepository;
 
-import java.util.List;
-
 public interface EntitybusRepository extends CrudRepository<Entitybus, Long> {
 }
\ No newline at end of file
diff --git a/src/main/java/rest/EntitybusController.java b/src/main/java/rest/EntitybusController.java
index 8b48560..fa4d030 100644
--- a/src/main/java/rest/EntitybusController.java
+++ b/src/main/java/rest/EntitybusController.java
@@ -7,8 +7,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import rep.EntitybusRepository;
 
-import java.util.Random;
-
 @RestController
 @RequestMapping("/entitybus")
 public class EntitybusController {
@@ -23,7 +21,7 @@ public Iterable findAll1() {
     @RequestMapping("/post")
     public Iterable postEntity() {
         Entitybus o = new Entitybus();
-        int num = (int) (Math.random()*10);
+        int num = (int) (Math.random() * 10);
         o.setEid(num);
         o.setEnumber("blah" + num);
         entitybusRepository.save(o);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d9638bf..75a317f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,12 +1,12 @@
 spring.jpa.hibernate.ddl-auto=none
 
 #use it for running all (app and db) in docker containers:
-spring.datasource.url=jdbc:mysql://db:3306/DOCKERDB
+spring.datasource.url=jdbc:mysql://localhost:13306/DOCKERDB
 
 #use it for running app locally, but with db from docker image:
 #spring.datasource.url=jdbc:mysql://0.0.0.0:13306/DOCKERDB
 
 spring.datasource.username=root
 spring.datasource.password=root
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect