From 5e1feded79e7e9005ab5a07c67c79289951ad223 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Sun, 12 Apr 2020 13:44:08 +0200 Subject: [PATCH] Upgrade Spring --- build.gradle | 24 +++++++------------ gradle/wrapper/gradle-wrapper.properties | 6 ++--- .../DB/Repository/PendingUserRepository.java | 2 ++ .../DB/Repository/PlaylistRepository.java | 1 + .../Broken/DB/Repository/TrackRepository.java | 2 ++ .../DB/Repository/UserStatsRepository.java | 1 + .../UserManager/Stats/UserStatsUtils.java | 2 +- .../Broken/Tools/UserManager/UserUtils.java | 2 +- .../audio/Playlist/PlaylistManager.java | 6 ++--- .../net/Broken/webView/MvcApplication.java | 4 ++-- .../net/Broken/webView/MyErrorController.java | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 551ee72..b70024b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,10 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE") - classpath 'org.springframework:springloaded:1.2.6.RELEASE' - } +plugins { + id 'org.springframework.boot' version '2.2.4.RELEASE' + id 'io.spring.dependency-management' version '1.0.9.RELEASE' + id 'java' + id 'groovy' } -apply plugin: 'base' -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'idea' -apply plugin: 'org.springframework.boot' - def versionObj = new Version(major: 0, minor: 2, revision: 0) @@ -31,7 +22,7 @@ jar.doFirst { } jar { - delete "${buildDir}/libs/*" +// delete "${buildDir}/libs/*" baseName = 'DiscordBot' } @@ -54,6 +45,9 @@ dependencies { } compile("org.springframework.boot:spring-boot-starter-undertow") compile("org.springframework.boot:spring-boot-starter-log4j2") + implementation 'org.codehaus.groovy:groovy-all:2.4.15' + + compile("com.sedmelluq:lavaplayer:1.3.34") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 453f40a..e93dac2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 10 09:57:49 CET 2018 +#Sat Feb 15 20:48:19 CET 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/net/Broken/DB/Repository/PendingUserRepository.java b/src/main/java/net/Broken/DB/Repository/PendingUserRepository.java index 488e6b5..9d6cf4a 100644 --- a/src/main/java/net/Broken/DB/Repository/PendingUserRepository.java +++ b/src/main/java/net/Broken/DB/Repository/PendingUserRepository.java @@ -12,4 +12,6 @@ public interface PendingUserRepository extends CrudRepository findByJdaId(String jdaId); + PendingUserEntity findById(int id); + } diff --git a/src/main/java/net/Broken/DB/Repository/PlaylistRepository.java b/src/main/java/net/Broken/DB/Repository/PlaylistRepository.java index bfd77ad..4113cbe 100644 --- a/src/main/java/net/Broken/DB/Repository/PlaylistRepository.java +++ b/src/main/java/net/Broken/DB/Repository/PlaylistRepository.java @@ -4,4 +4,5 @@ import net.Broken.DB.Entity.PlaylistEntity; import org.springframework.data.repository.CrudRepository; public interface PlaylistRepository extends CrudRepository { + PlaylistEntity findById(int id); } diff --git a/src/main/java/net/Broken/DB/Repository/TrackRepository.java b/src/main/java/net/Broken/DB/Repository/TrackRepository.java index a356905..b09ba14 100644 --- a/src/main/java/net/Broken/DB/Repository/TrackRepository.java +++ b/src/main/java/net/Broken/DB/Repository/TrackRepository.java @@ -8,4 +8,6 @@ import java.util.List; public interface TrackRepository extends CrudRepository { List findDistinctByPlaylistOrderByPos(PlaylistEntity playlistEntity); + + TrackEntity findById(int id); } diff --git a/src/main/java/net/Broken/DB/Repository/UserStatsRepository.java b/src/main/java/net/Broken/DB/Repository/UserStatsRepository.java index 87880fb..1bfe68e 100644 --- a/src/main/java/net/Broken/DB/Repository/UserStatsRepository.java +++ b/src/main/java/net/Broken/DB/Repository/UserStatsRepository.java @@ -10,4 +10,5 @@ public interface UserStatsRepository extends CrudRepository { List findByUser(UserEntity userEntity); List findByGuildId(String guildId); List findByUserAndGuildId(UserEntity user, String guildId); + } diff --git a/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java b/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java index 93837f4..73b789a 100644 --- a/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java +++ b/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java @@ -95,7 +95,7 @@ public class UserStatsUtils { } } - stats = (List) userStatsRepository.save(stats); + stats = (List) userStatsRepository.saveAll(stats); userEntity.setUserStats(stats); userEntity = userRepository.save(userEntity); diff --git a/src/main/java/net/Broken/Tools/UserManager/UserUtils.java b/src/main/java/net/Broken/Tools/UserManager/UserUtils.java index 30dfc62..df62c79 100644 --- a/src/main/java/net/Broken/Tools/UserManager/UserUtils.java +++ b/src/main/java/net/Broken/Tools/UserManager/UserUtils.java @@ -126,7 +126,7 @@ public class UserUtils { * @throws UserNotFoundException User not found in Pending user DB */ public PendingUserEntity confirmCheckToken(PendingUserRepository pendingUserRepository, int id, String checkToken ) throws TokenNotMatch, UserNotFoundException { - PendingUserEntity pendingUser = pendingUserRepository.findOne(id); + PendingUserEntity pendingUser = pendingUserRepository.findById(id); if(pendingUser != null) { if(pendingUser.getCheckToken().equals(checkToken)){ logger.info("Check Token match!"); diff --git a/src/main/java/net/Broken/audio/Playlist/PlaylistManager.java b/src/main/java/net/Broken/audio/Playlist/PlaylistManager.java index ac26b5a..cea7d6f 100644 --- a/src/main/java/net/Broken/audio/Playlist/PlaylistManager.java +++ b/src/main/java/net/Broken/audio/Playlist/PlaylistManager.java @@ -100,7 +100,7 @@ public class PlaylistManager { - TrackEntity toDelete = trackRepository.findOne(data.id); + TrackEntity toDelete = trackRepository.findById(data.id); playlist = remove(playlist, toDelete); @@ -129,7 +129,7 @@ public class PlaylistManager { - TrackEntity toMove = trackRepository.findOne(data.id); + TrackEntity toMove = trackRepository.findById(data.id); TrackEntity save = new TrackEntity(toMove); @@ -159,7 +159,7 @@ public class PlaylistManager { } private PlaylistEntity getPlaylist(int id) throws PlaylistNotFoundException{ - PlaylistEntity playlist = playlistRepository.findOne(id); + PlaylistEntity playlist = playlistRepository.findById(id); if(playlist == null) throw new PlaylistNotFoundException(); else diff --git a/src/main/java/net/Broken/webView/MvcApplication.java b/src/main/java/net/Broken/webView/MvcApplication.java index 3ca4002..a959ccc 100644 --- a/src/main/java/net/Broken/webView/MvcApplication.java +++ b/src/main/java/net/Broken/webView/MvcApplication.java @@ -3,7 +3,7 @@ package net.Broken.webView; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.resource.ContentVersionStrategy; import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter; import org.springframework.web.servlet.resource.VersionResourceResolver; @@ -12,7 +12,7 @@ import org.springframework.web.servlet.resource.VersionResourceResolver; * Configuration for js auto versioning */ @Configuration -public class MvcApplication extends WebMvcConfigurerAdapter { +public class MvcApplication implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { diff --git a/src/main/java/net/Broken/webView/MyErrorController.java b/src/main/java/net/Broken/webView/MyErrorController.java index 42a8f94..b5f93cc 100644 --- a/src/main/java/net/Broken/webView/MyErrorController.java +++ b/src/main/java/net/Broken/webView/MyErrorController.java @@ -2,7 +2,7 @@ package net.Broken.webView; import net.Broken.MainBot; import net.dv8tion.jda.api.entities.Guild; -import org.springframework.boot.autoconfigure.web.ErrorController; +import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.ui.Model;