Skip to content

Commit 612688b

Browse files
committed
updated dependencies and resolved deprecations
1 parent 46a908d commit 612688b

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

para-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<name>para-server</name>
1313

1414
<properties>
15-
<springSecVer>6.4.6</springSecVer>
15+
<springSecVer>6.5.0</springSecVer>
1616
<springLdapVer>3.3.0</springLdapVer>
1717
</properties>
1818

@@ -153,7 +153,7 @@
153153
<dependency>
154154
<groupId>com.github.ben-manes.caffeine</groupId>
155155
<artifactId>caffeine</artifactId>
156-
<version>3.2.0</version>
156+
<version>3.2.1</version>
157157
</dependency>
158158

159159
<!-- JERSEY -->

para-server/src/main/java/com/erudika/para/server/security/IgnoredRequestMatcher.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import jakarta.servlet.http.HttpServletRequest;
2424
import java.util.ArrayList;
2525
import java.util.List;
26-
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
26+
import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
2727
import org.springframework.security.web.util.matcher.OrRequestMatcher;
2828
import org.springframework.security.web.util.matcher.RequestMatcher;
2929

@@ -43,10 +43,10 @@ private IgnoredRequestMatcher() {
4343
List<RequestMatcher> list = new ArrayList<>();
4444
if (c != null) {
4545
for (ConfigValue configValue : c) {
46-
list.add(new AntPathRequestMatcher((String) configValue.unwrapped()));
46+
list.add(PathPatternRequestMatcher.withDefaults().matcher((String) configValue.unwrapped()));
4747
}
4848
} else {
49-
list.add(new AntPathRequestMatcher("/"));
49+
list.add(PathPatternRequestMatcher.withDefaults().matcher("/"));
5050
}
5151
orMatcher = new OrRequestMatcher(list);
5252
}

para-server/src/main/java/com/erudika/para/server/security/JWTRestfulAuthFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.springframework.security.core.Authentication;
6161
import org.springframework.security.core.AuthenticationException;
6262
import org.springframework.security.core.context.SecurityContextHolder;
63-
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
63+
import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
6464
import org.springframework.util.Assert;
6565
import org.springframework.web.filter.GenericFilterBean;
6666

@@ -74,7 +74,7 @@ public class JWTRestfulAuthFilter extends GenericFilterBean {
7474
private static final Logger logger = LoggerFactory.getLogger(JWTRestfulAuthFilter.class);
7575

7676
private AuthenticationManager authenticationManager;
77-
private AntPathRequestMatcher authenticationRequestMatcher;
77+
private PathPatternRequestMatcher authenticationRequestMatcher;
7878

7979
private FacebookAuthFilter facebookAuth;
8080
private GoogleAuthFilter googleAuth;
@@ -329,7 +329,7 @@ private UserAuthentication getOrCreateUser(App app, String identityProvider, Str
329329
}
330330

331331
private void setFilterProcessesUrl(String filterProcessesUrl) {
332-
this.authenticationRequestMatcher = new AntPathRequestMatcher(filterProcessesUrl);
332+
this.authenticationRequestMatcher = PathPatternRequestMatcher.withDefaults().matcher(filterProcessesUrl);
333333
}
334334

335335
/**

para-server/src/main/java/com/erudika/para/server/security/SimpleRequestCache.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
package com.erudika.para.server.security;
1919

2020
import com.erudika.para.core.utils.Para;
21-
import com.erudika.para.server.utils.HttpUtils;
2221
import com.erudika.para.core.utils.Utils;
22+
import com.erudika.para.server.utils.HttpUtils;
2323
import jakarta.servlet.http.HttpServletRequest;
2424
import jakarta.servlet.http.HttpServletResponse;
25-
import org.springframework.security.web.PortResolver;
26-
import org.springframework.security.web.PortResolverImpl;
2725
import org.springframework.security.web.savedrequest.DefaultSavedRequest;
2826
import org.springframework.security.web.savedrequest.RequestCache;
2927
import org.springframework.security.web.savedrequest.SavedRequest;
@@ -38,7 +36,6 @@ public class SimpleRequestCache implements RequestCache {
3836

3937
private final RequestMatcher anyRequestMatcher = AnyRequestMatcher.INSTANCE;
4038
private final RequestMatcher ajaxRequestMatcher = AjaxRequestMatcher.INSTANCE;
41-
private final PortResolver portResolver = new PortResolverImpl();
4239

4340
/**
4441
* Saves a request in cache.
@@ -48,7 +45,7 @@ public class SimpleRequestCache implements RequestCache {
4845
@Override
4946
public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
5047
if (anyRequestMatcher.matches(request) && !ajaxRequestMatcher.matches(request)) {
51-
DefaultSavedRequest savedRequest = new DefaultSavedRequest(request, portResolver);
48+
DefaultSavedRequest savedRequest = new DefaultSavedRequest(request);
5249
HttpUtils.setStateParam(Para.getConfig().returnToCookieName(),
5350
Utils.base64enc(savedRequest.getRedirectUrl().getBytes()), request, response);
5451
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@
8282
<awsJdkVer>[2.21.23,)</awsJdkVer>
8383
<jerseyVer>3.1.6</jerseyVer>
8484
<springBootVer>3.5.0</springBootVer>
85-
<metricsVer>4.2.25</metricsVer>
85+
<metricsVer>4.2.32</metricsVer>
8686
<httpClientVer>5.4.4</httpClientVer>
8787
<httpCoreVer>5.3.4</httpCoreVer>
8888
<commonsCodecVer>1.16.1</commonsCodecVer>
8989
<lucenePluginVer>1.49.3</lucenePluginVer>
9090
<sqlPluginVer>1.49.1</sqlPluginVer>
91-
<junitVer>5.12.2</junitVer>
91+
<junitVer>5.13.1</junitVer>
9292
<junitPlatformVer>1.12.2</junitPlatformVer>
9393
</properties>
9494

@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>org.mockito</groupId>
9999
<artifactId>mockito-core</artifactId>
100-
<version>5.17.0</version>
100+
<version>5.18.0</version>
101101
<scope>test</scope>
102102
</dependency>
103103
<dependency>

0 commit comments

Comments
 (0)