upgrade dependencies, migration

This commit is contained in:
2025-11-09 01:58:15 +01:00
parent db4673ceee
commit 878b1e4874
7 changed files with 30 additions and 17 deletions
@@ -12,6 +12,8 @@ import jakarta.servlet.SessionTrackingMode;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.data.web.config.EnableSpringDataWebSupport;
import org.springframework.data.web.config.EnableSpringDataWebSupport.PageSerializationMode;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
/** /**
@@ -19,6 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
*/ */
@SpringBootApplication @SpringBootApplication
@EnableScheduling @EnableScheduling
@EnableSpringDataWebSupport(pageSerializationMode = PageSerializationMode.VIA_DTO)
public class Application extends SpringBootServletInitializer { public class Application extends SpringBootServletInitializer {
/** /**
+7 -7
View File
@@ -56,13 +56,13 @@
<dependency> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>1.9.0</version> <version>${commons-validator.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>33.3.1-jre</version> <version>${guava.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -73,19 +73,19 @@
<dependency> <dependency>
<groupId>org.passay</groupId> <groupId>org.passay</groupId>
<artifactId>passay</artifactId> <artifactId>passay</artifactId>
<version>1.6.5</version> <version>${passay.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.samstevens.totp</groupId> <groupId>dev.samstevens.totp</groupId>
<artifactId>totp-spring-boot-starter</artifactId> <artifactId>totp-spring-boot-starter</artifactId>
<version>1.7.1</version> <version>${totp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId> <artifactId>bcprov-jdk18on</artifactId>
<version>1.78.1</version> <version>${bouncycastle.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -96,13 +96,13 @@
<dependency> <dependency>
<groupId>javax.measure</groupId> <groupId>javax.measure</groupId>
<artifactId>unit-api</artifactId> <artifactId>unit-api</artifactId>
<version>2.2</version> <version>${unit-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId> <artifactId>commons-csv</artifactId>
<version>1.12.0</version> <version>${commons-csv.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
@@ -3,7 +3,7 @@
*/ */
package de.bstly.we.controller.support; package de.bstly.we.controller.support;
import javax.annotation.Nullable; import org.springframework.lang.Nullable;
import org.springframework.core.NestedRuntimeException; import org.springframework.core.NestedRuntimeException;
import org.springframework.http.HttpStatusCode; import org.springframework.http.HttpStatusCode;
+1 -1
View File
@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>dnsjava</groupId> <groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId> <artifactId>dnsjava</artifactId>
<version>3.5.3</version> <version>${dnsjava.version}</version>
</dependency> </dependency>
<!-- Query DSL --> <!-- Query DSL -->
@@ -5,8 +5,6 @@ package de.bstly.we.oidc.businesslogic;
import java.util.Set; import java.util.Set;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -27,6 +25,7 @@ import de.bstly.we.oidc.model.OidcAuthorization;
import de.bstly.we.oidc.model.OidcClient; import de.bstly.we.oidc.model.OidcClient;
import de.bstly.we.oidc.model.QOidcClient; import de.bstly.we.oidc.model.QOidcClient;
import de.bstly.we.oidc.repository.OidcClientRepository; import de.bstly.we.oidc.repository.OidcClientRepository;
import jakarta.servlet.http.HttpServletRequest;
/** /**
* The Class OidcClientManager. * The Class OidcClientManager.
@@ -170,8 +169,11 @@ public class OidcClientManager {
* @return the by client name * @return the by client name
*/ */
public OidcClient getByClientName(String clientName) { public OidcClient getByClientName(String clientName) {
if (StringUtils.hasText(clientName)) {
return oidcClientRepository.findOne(qOidcClient.clientName.eq(clientName)).orElse(null); return oidcClientRepository.findOne(qOidcClient.clientName.eq(clientName)).orElse(null);
} }
return null;
}
/** /**
* Gets the by client id and secret. * Gets the by client id and secret.
+11 -3
View File
@@ -12,9 +12,17 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version> <java.version>17</java.version>
<querydsl.version>5.0.0</querydsl.version> <querydsl.version>5.1.0</querydsl.version>
<nimbus.version>9.37.3</nimbus.version> <nimbus.version>10.6</nimbus.version>
<revision>3.0.9-SNAPSHOT</revision> <commons-validator.version>1.10.0</commons-validator.version>
<guava.version>33.5.0-jre</guava.version>
<passay.version>1.6.6</passay.version>
<totp.version>1.7.1</totp.version>
<bouncycastle.version>1.82</bouncycastle.version>
<unit-api.version>2.2</unit-api.version>
<commons-csv.version>1.14.1</commons-csv.version>
<dnsjava.version>3.6.3</dnsjava.version>
<revision>3.1.0</revision>
</properties> </properties>
<parent> <parent>
@@ -115,7 +115,7 @@ public class ShortenedUrlManager implements SmartInitializingSingleton, UserData
public Page<ShortenedUrl> get(int page, int size, String sortBy, boolean descending, String search) { public Page<ShortenedUrl> get(int page, int size, String sortBy, boolean descending, String search) {
if (StringUtils.hasText(search)) { if (StringUtils.hasText(search)) {
return shortenedUrlRepository.findAll( return shortenedUrlRepository.findAll(
qShortenedUrl.note.containsIgnoreCase(search).or(qShortenedUrl.url.containsIgnoreCase(search)) qShortenedUrl.note.contains(search).or(qShortenedUrl.url.contains(search))
.or(qShortenedUrl.link.containsIgnoreCase(search)), .or(qShortenedUrl.link.containsIgnoreCase(search)),
PageRequest.of(page, size, PageRequest.of(page, size,
descending ? Sort.by(sortBy).descending() : Sort.by(sortBy).ascending())); descending ? Sort.by(sortBy).descending() : Sort.by(sortBy).ascending()));
@@ -147,7 +147,7 @@ public class ShortenedUrlManager implements SmartInitializingSingleton, UserData
query.and(qShortenedUrl.owner.eq(userId)); query.and(qShortenedUrl.owner.eq(userId));
if (StringUtils.hasText(search)) { if (StringUtils.hasText(search)) {
query.and(qShortenedUrl.note.containsIgnoreCase(search).or(qShortenedUrl.url.containsIgnoreCase(search)) query.and(qShortenedUrl.note.contains(search).or(qShortenedUrl.url.contains(search))
.or(qShortenedUrl.link.containsIgnoreCase(search))); .or(qShortenedUrl.link.containsIgnoreCase(search)));
} }