feat: upgrade spring boot version

nuromirzak · Aug 17, 2024 · 377105d · 377105d
1 parent 780e005
commit 377105d
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 52 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,17 @@
 plugins {
-    id 'org.springframework.boot' version '2.6.4'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '3.3.2'
+    id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
 }
 
 group = 'codes.sharing'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 repositories {
     mavenCentral()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/codes/sharing/sharingcodes/controller/GetController.java b/src/main/java/codes/sharing/sharingcodes/controller/GetController.java
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Controller;
 
 import java.util.List;
-import java.util.Optional;
 
 @Controller
 public class GetController {
@@ -41,7 +40,7 @@ public String getNthCode(@PathVariable String N, @RequestParam(value = "password
     }
 
     @GetMapping(value = {"/code/new", "/"})
-    public String createHtmlCode(Model model) {
+    public String createHtmlCode() {
         return "index";
     }
 
@@ -61,4 +60,4 @@ public String getAboutPage() {
     public String getUsage() {
         return "usage";
     }
-}
+}
diff --git a/src/main/java/codes/sharing/sharingcodes/controller/PostController.java b/src/main/java/codes/sharing/sharingcodes/controller/PostController.java
@@ -9,7 +9,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.stereotype.Controller;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @Controller
@@ -54,4 +53,4 @@ public ResponseEntity<Object> checkPassword(@RequestBody PasswordDTO passwordDTO
             return ResponseEntity.badRequest().build();
         }
     }
-}
+}
diff --git a/src/main/java/codes/sharing/sharingcodes/model/Code.java b/src/main/java/codes/sharing/sharingcodes/model/Code.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
@@ -143,4 +143,4 @@ public String getPassword() {
     public void setPassword(String password) {
         this.password = password;
     }
-}
+}
diff --git a/src/main/java/codes/sharing/sharingcodes/service/CodeService.java b/src/main/java/codes/sharing/sharingcodes/service/CodeService.java
@@ -1,26 +1,18 @@
 package codes.sharing.sharingcodes.service;
 
 import codes.sharing.sharingcodes.dto.DateDTO;
-import codes.sharing.sharingcodes.dto.PasswordDTO;
 import codes.sharing.sharingcodes.model.Code;
 
 import java.util.List;
 
 public interface CodeService {
+    Code getById(String id);
 
-    public Code getById(String id);
+    void putCode(Code newCode);
 
-    public void putCode(Code newCode);
+    void refreshCode(Code code);
 
-    public void refreshCode(Code code);
+    List<Code> getLatestNCode(int n);
 
-    public List<Code> getLatestNCode(int n);
-
-    public boolean isExist(String id);
-
-    public void deleteById(String id);
-
-    public List<Code> superGetAll();
-
-    public DateDTO formatDate(String date);
-}
+    DateDTO formatDate(String date);
+}
diff --git a/src/main/java/codes/sharing/sharingcodes/service/CodeServiceImpl.java b/src/main/java/codes/sharing/sharingcodes/service/CodeServiceImpl.java
@@ -1,7 +1,6 @@
 package codes.sharing.sharingcodes.service;
 
 import codes.sharing.sharingcodes.dto.DateDTO;
-import codes.sharing.sharingcodes.dto.PasswordDTO;
 import codes.sharing.sharingcodes.exceptions.NotFoundSnippet;
 import codes.sharing.sharingcodes.model.Code;
 import codes.sharing.sharingcodes.repository.CodeRepository;
@@ -65,21 +64,6 @@ public List<Code> getLatestNCode(int n) {
         return newCodes;
     }
 
-    @Override
-    public boolean isExist(String id) {
-        return repo.existsById(id);
-    }
-
-    @Override
-    public void deleteById(String id) {
-        repo.deleteById(id);
-    }
-
-    @Override
-    public List<Code> superGetAll() {
-        return (List<Code>) repo.findAll();
-    }
-
     private void refresh(Code code) {
         if (code.isViewsLimit() && code.getViews() >= 0) {
             code.setViews(code.getViews() - 1);

diff --git a/src/main/resources/static/js/myScript.js b/src/main/resources/static/js/myScript.js
@@ -1,8 +1,6 @@
 let dangerMessage;
 let errorCode;
 let successMessage;
-let obj;
-
 window.onload = function() {
     let form = document.querySelector("form");
 
@@ -41,7 +39,7 @@ function send() {
         return;
     }
 
-    if (xhr.status == 200) {
+    if (xhr.status === 200) {
         successMessage.style.display = "block";
         dangerMessage.style.display = "none";
         document.querySelector("form").reset();
@@ -54,29 +52,29 @@ function send() {
         dangerMessage.style.display = "block";
         successMessage.style.display = "none";
         errorCode.innerHTML = xhr.status + " " + xhr.statusText;
-        return;
     }
 }
 
 function check() {
     const codeId = location.pathname.substring(6);
-    var object = {
+    const object = {
         "password": document.getElementById("password_field").value,
         "id": codeId
     };
     let json = JSON.stringify(object);
 
+    let xhr;
     try {
         xhr = new XMLHttpRequest();
         xhr.open("POST", '/api/code/password', false)
         xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
         xhr.send(json);
 
-        var url = location.protocol + '//' + location.host + location.pathname + '?password=' + object.password;
+        const url = location.protocol + '//' + location.host + location.pathname + '?password=' + object.password;
 
-        if (xhr.status == 200) {
+        if (xhr.status === 200) {
             window.location.href = url;
-        } else if (xhr.status == 400){
+        } else if (xhr.status === 400) {
             dangerMessage.style.display = "block";
         } else {
             window.location.href = url;

diff --git a/src/main/resources/templates/getcode.ftlh b/src/main/resources/templates/getcode.ftlh
@@ -23,7 +23,7 @@
 
 <body>
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
-    <a class="navbar-brand" href="/">Sharing <img src=" /imgs/code-pngrepo-com.png" alt="" style="height: 1em;"> Codes</a>
+    <a class="navbar-brand" href="/">Sharing <img src="/imgs/code-pngrepo-com.png" alt="" style="height: 1em;"> Codes</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
@@ -51,7 +51,7 @@
     <#if pieceOfCode.isViewsLimit()>
         <br>
         <#if pieceOfCode.getViews() == 0>
-            <small><u><span id="views_restriction">No more views allowed</small>
+            <small><u><span id="views_restriction">No more views allowed</span></u></small>
         <#else>
             <small><u><span id="views_restriction">${pieceOfCode.getViews()}</span></u> more views allowed</small>
         </#if>
@@ -64,4 +64,4 @@
 <script src="/js/bootstrap.bundle.min.js"></script>
 </body>
 
-</html>
+</html>