iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-31000 : Upgrade Spring Boot Runtime and Spring Boot Runtime2 to Spring Boot 3. (#16138)

Browse Source 
* JAVA-31000 : Upgrade Spring Boot Runtime and Spring Boot Runtime2 to Spring Boot 3

* JAVA-31000 :- Uncomment in Parent module POM.

* Remove unnecessary imports
This commit is contained in:
Amit Pandey 2024-03-17 17:34:56 +05:30 committed by GitHub
parent 90b019d0bf
commit aaeb72e89d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-modules/pom.xml
View File

@ -66,8 +66,8 @@
<module>spring-boot-performance</module> <module>spring-boot-performance</module>
<module>spring-boot-property-exp</module> <module>spring-boot-property-exp</module>
<module>spring-boot-request-params</module> <module>spring-boot-request-params</module>
<!-- <module>spring-boot-runtime</module>--> <!-- failing after upgrading to spring boot 3.2.x --> <module>spring-boot-runtime</module>
<!-- <module>spring-boot-runtime-2</module>--> <!-- failing after upgrading to spring boot 3.2.x --> <module>spring-boot-runtime-2</module>
<module>spring-boot-security</module> <module>spring-boot-security</module>
<module>spring-boot-security-2</module> <module>spring-boot-security-2</module>
<module>spring-boot-ssl-bundles</module> <module>spring-boot-ssl-bundles</module>

1
spring-boot-modules/spring-boot-runtime-2/pom.xml
View File

@ -75,5 +75,6 @@
<properties> <properties>
<springcloud.version>3.1.3</springcloud.version> <springcloud.version>3.1.3</springcloud.version>
<start-class>com.baeldung.heap.HeapSizeDemoApplication</start-class>
</properties> </properties>
</project> </project>

10
spring-boot-modules/spring-boot-runtime/pom.xml
View File

@ -69,8 +69,8 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>jakarta.persistence</groupId>
<artifactId>javax.persistence-api</artifactId> <artifactId>jakarta.persistence-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.subethamail</groupId> <groupId>org.subethamail</groupId>
@ -79,14 +79,16 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient5</artifactId>
<version>5.3.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<subethasmtp.version>3.1.7</subethasmtp.version> <subethasmtp.version>3.1.7</subethasmtp.version>
<springcloud.version>3.1.3</springcloud.version> <springcloud.version>3.1.3</springcloud.version>
<start-class>com.baeldung.shutdown.Application</start-class>
</properties> </properties>
</project> </project>

2
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/sampleapp/web/controller/MyFooController.java
View File

@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

2
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java
View File

@ -1,6 +1,6 @@
package com.baeldung.sampleapp.web.controller.redirect; package com.baeldung.sampleapp.web.controller.redirect;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

2
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/shutdown/TerminateBean.java
View File

@ -1,6 +1,6 @@
package com.baeldung.shutdown; package com.baeldung.shutdown;
import javax.annotation.PreDestroy; import jakarta.annotation.PreDestroy;
public class TerminateBean { public class TerminateBean {

4
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/SecurityConfig.java
View File

@ -9,8 +9,8 @@ import org.springframework.security.web.SecurityFilterChain;
public class SecurityConfig { public class SecurityConfig {
@Bean @Bean
public SecurityFilterChain securityFilter(HttpSecurity http) throws Exception { public SecurityFilterChain securityFilter(HttpSecurity http) throws Exception {
return http.csrf() return http
.ignoringAntMatchers("/actuator/**").and() .csrf(csrf -> csrf.ignoringRequestMatchers("/actuator/**") )
.build(); .build();
} }
} }

13
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/CustomTraceRepository.java
View File

@ -4,22 +4,23 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.springframework.boot.actuate.trace.http.HttpTrace; import org.apache.hc.client5.http.classic.methods.HttpTrace;
import org.springframework.boot.actuate.trace.http.HttpTraceRepository; import org.springframework.boot.actuate.web.exchanges.HttpExchange;
import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@Repository @Repository
public class CustomTraceRepository implements HttpTraceRepository { public class CustomTraceRepository implements HttpExchangeRepository {
AtomicReference<HttpTrace> lastTrace = new AtomicReference<>(); AtomicReference<HttpExchange> lastTrace = new AtomicReference<>();
@Override @Override
public List<HttpTrace> findAll() { public List<HttpExchange> findAll() {
return Collections.singletonList(lastTrace.get()); return Collections.singletonList(lastTrace.get());
} }
@Override @Override
public void add(HttpTrace trace) { public void add(HttpExchange trace) {
if ("GET".equals(trace.getRequest() if ("GET".equals(trace.getRequest()
.getMethod())) { .getMethod())) {
lastTrace.set(trace); lastTrace.set(trace);

19
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/TraceRequestFilter.java
View File

@ -1,23 +1,22 @@
package com.baeldung.spring.boot.management.trace; package com.baeldung.spring.boot.management.trace;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.boot.actuate.trace.http.HttpExchangeTracer; import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository;
import org.springframework.boot.actuate.trace.http.HttpTraceRepository; import org.springframework.boot.actuate.web.exchanges.Include;
import org.springframework.boot.actuate.web.trace.servlet.HttpTraceFilter; import org.springframework.boot.actuate.web.exchanges.servlet.HttpExchangesFilter;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
public class TraceRequestFilter extends HttpTraceFilter { public class TraceRequestFilter extends HttpExchangesFilter {
/** /**
* Create a new {@link HttpTraceFilter} instance. * Create a new {@link HttpExchangesFilter} instance.
* *
* @param repository the trace repository * @param repository the trace repository
* @param tracer used to trace exchanges
*/ */
public TraceRequestFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) { public TraceRequestFilter(HttpExchangeRepository repository) {
super(repository, tracer); super(repository, Include.defaultIncludes());
} }
@Override @Override

6
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/app/CachedHttpServletRequest.java
View File

@ -2,9 +2,9 @@ package com.baeldung.web.log.app;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import javax.servlet.ServletInputStream; import jakarta.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.*; import java.io.*;
public class CachedHttpServletRequest extends HttpServletRequestWrapper { public class CachedHttpServletRequest extends HttpServletRequestWrapper {

4
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/app/CachedServletInputStream.java
View File

@ -3,8 +3,8 @@ package com.baeldung.web.log.app;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.servlet.ReadListener; import jakarta.servlet.ReadListener;
import javax.servlet.ServletInputStream; import jakarta.servlet.ServletInputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

10
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/app/RequestCachingFilter.java
View File

@ -8,11 +8,11 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;

2
spring-boot-modules/spring-boot-runtime/src/main/java/com/baeldung/web/log/controller/TaxiFareController.java
View File

@ -1,6 +1,6 @@
package com.baeldung.web.log.controller; package com.baeldung.web.log.controller;
import javax.validation.Valid; import jakarta.validation.Valid;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;