diff --git a/application/src/main/java/de/bstly/we/Application.java b/application/src/main/java/de/bstly/we/Application.java index 5f8e767..9701da5 100755 --- a/application/src/main/java/de/bstly/we/Application.java +++ b/application/src/main/java/de/bstly/we/Application.java @@ -12,6 +12,8 @@ import jakarta.servlet.SessionTrackingMode; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; 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; /** @@ -19,6 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; */ @SpringBootApplication @EnableScheduling +@EnableSpringDataWebSupport(pageSerializationMode = PageSerializationMode.VIA_DTO) public class Application extends SpringBootServletInitializer { /** diff --git a/core/pom.xml b/core/pom.xml index aea09aa..0f04020 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,13 +56,13 @@ commons-validator commons-validator - 1.9.0 + ${commons-validator.version} com.google.guava guava - 33.3.1-jre + ${guava.version} @@ -73,19 +73,19 @@ org.passay passay - 1.6.5 + ${passay.version} dev.samstevens.totp totp-spring-boot-starter - 1.7.1 + ${totp.version} org.bouncycastle bcprov-jdk18on - 1.78.1 + ${bouncycastle.version} @@ -96,13 +96,13 @@ javax.measure unit-api - 2.2 + ${unit-api.version} org.apache.commons commons-csv - 1.12.0 + ${commons-csv.version} \ No newline at end of file diff --git a/core/src/main/java/de/bstly/we/controller/support/EntityResponseStatusException.java b/core/src/main/java/de/bstly/we/controller/support/EntityResponseStatusException.java index 4e5daa7..5705439 100644 --- a/core/src/main/java/de/bstly/we/controller/support/EntityResponseStatusException.java +++ b/core/src/main/java/de/bstly/we/controller/support/EntityResponseStatusException.java @@ -3,7 +3,7 @@ */ package de.bstly.we.controller.support; -import javax.annotation.Nullable; +import org.springframework.lang.Nullable; import org.springframework.core.NestedRuntimeException; import org.springframework.http.HttpStatusCode; diff --git a/dyndns/pom.xml b/dyndns/pom.xml index d848e5c..bd3fa0d 100755 --- a/dyndns/pom.xml +++ b/dyndns/pom.xml @@ -21,7 +21,7 @@ dnsjava dnsjava - 3.5.3 + ${dnsjava.version} diff --git a/oidc/src/main/java/de/bstly/we/oidc/businesslogic/OidcClientManager.java b/oidc/src/main/java/de/bstly/we/oidc/businesslogic/OidcClientManager.java index 30609f6..69ca6be 100644 --- a/oidc/src/main/java/de/bstly/we/oidc/businesslogic/OidcClientManager.java +++ b/oidc/src/main/java/de/bstly/we/oidc/businesslogic/OidcClientManager.java @@ -5,8 +5,6 @@ package de.bstly.we.oidc.businesslogic; import java.util.Set; -import jakarta.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; 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.QOidcClient; import de.bstly.we.oidc.repository.OidcClientRepository; +import jakarta.servlet.http.HttpServletRequest; /** * The Class OidcClientManager. @@ -170,7 +169,10 @@ public class OidcClientManager { * @return the by client name */ public OidcClient getByClientName(String clientName) { - return oidcClientRepository.findOne(qOidcClient.clientName.eq(clientName)).orElse(null); + if (StringUtils.hasText(clientName)) { + return oidcClientRepository.findOne(qOidcClient.clientName.eq(clientName)).orElse(null); + } + return null; } /** diff --git a/pom.xml b/pom.xml index 6517e89..a6df56d 100755 --- a/pom.xml +++ b/pom.xml @@ -12,9 +12,17 @@ UTF-8 17 - 5.0.0 - 9.37.3 - 3.0.9-SNAPSHOT + 5.1.0 + 10.6 + 1.10.0 + 33.5.0-jre + 1.6.6 + 1.7.1 + 1.82 + 2.2 + 1.14.1 + 3.6.3 + 3.1.0 diff --git a/urlshortener/src/main/java/de/bstly/we/urlshortener/businesslogic/ShortenedUrlManager.java b/urlshortener/src/main/java/de/bstly/we/urlshortener/businesslogic/ShortenedUrlManager.java index 3767498..4dbf97e 100644 --- a/urlshortener/src/main/java/de/bstly/we/urlshortener/businesslogic/ShortenedUrlManager.java +++ b/urlshortener/src/main/java/de/bstly/we/urlshortener/businesslogic/ShortenedUrlManager.java @@ -115,7 +115,7 @@ public class ShortenedUrlManager implements SmartInitializingSingleton, UserData public Page get(int page, int size, String sortBy, boolean descending, String search) { if (StringUtils.hasText(search)) { 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)), PageRequest.of(page, size, 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)); 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))); }