Skip to content

Commit 9acb53c

Browse files
committed
Adopt Vaadin / Spring Boot changes
1 parent 4f90208 commit 9acb53c

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

demo/webapp-rest/src/main/java/software/xdev/sse/demo/Application.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
import java.util.stream.Stream;
66

77
import org.springframework.boot.SpringApplication;
8-
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
98
import org.springframework.boot.autoconfigure.SpringBootApplication;
10-
import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
9+
import org.springframework.boot.webmvc.autoconfigure.error.ErrorMvcAutoConfiguration;
1110

1211

1312
@SuppressWarnings({"checkstyle:HideUtilityClassConstructor", "PMD.UseUtilityClass"})
14-
@SpringBootApplication
15-
@EnableAutoConfiguration(exclude = {ErrorMvcAutoConfiguration.class})
13+
@SpringBootApplication(exclude = {ErrorMvcAutoConfiguration.class})
1614
public class Application
1715
{
1816
@SuppressWarnings("PMD.AvoidSystemSetterCall")

oauth2-oidc/src/test/java/jakarta/servlet/http/DummyHttpServletResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void sendError(final int sc) throws IOException
6161
}
6262

6363
@Override
64-
public void sendRedirect(final String location) throws IOException
64+
public void sendRedirect(final String location, final int sc, final boolean clearBuffer) throws IOException
6565
{
6666
}
6767

vaadin/src/main/java/software/xdev/sse/vaadin/TotalVaadinFlowSecurityConfigurer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void setBuilder(final HttpSecurity builder)
144144
}
145145

146146
@Override
147-
public void init(final HttpSecurity http) throws Exception
147+
public void init(final HttpSecurity http)
148148
{
149149
if(this.customizeVaadinSecurityConfigurer != null)
150150
{
@@ -171,7 +171,7 @@ public void init(final HttpSecurity http) throws Exception
171171
}
172172

173173
@Override
174-
public void configure(final HttpSecurity http) throws Exception
174+
public void configure(final HttpSecurity http)
175175
{
176176
this.vaadinSecurityConfigurer.configure(http);
177177

@@ -182,7 +182,7 @@ public void configure(final HttpSecurity http) throws Exception
182182
}
183183

184184
// region Exception Handling
185-
protected void initExceptionHandling(final HttpSecurity http) throws Exception
185+
protected void initExceptionHandling(final HttpSecurity http)
186186
{
187187
http.exceptionHandling(cfg -> {
188188
this.configureExceptionHandler(cfg);
@@ -213,7 +213,7 @@ protected AccessDeniedHandler createAccessDeniedHandler()
213213
// endregion
214214

215215
// region CSRF
216-
protected void initCSRF(final HttpSecurity http) throws Exception
216+
protected void initCSRF(final HttpSecurity http)
217217
{
218218
final List<RequestMatcher> vaadinCSRFDisableRequestMatchers = this.getApplicationContext()
219219
.getBeansOfType(VaadinCSRFDisableRequestMatcherProvider.class)
@@ -244,7 +244,7 @@ protected void initCSRF(final HttpSecurity http) throws Exception
244244

245245
// region RequestCache
246246

247-
protected void initRequestCache(final HttpSecurity http) throws Exception
247+
protected void initRequestCache(final HttpSecurity http)
248248
{
249249
final SecureVaadinRequestCache vaadinDefaultRequestCache = Objects.requireNonNull(
250250
this.getApplicationContext().getBean(SecureVaadinRequestCache.class),
@@ -260,7 +260,7 @@ protected void initRequestCache(final HttpSecurity http) throws Exception
260260

261261
// region HTTP Requests
262262

263-
protected void initAuthorizeHttpRequests(final HttpSecurity http) throws Exception
263+
protected void initAuthorizeHttpRequests(final HttpSecurity http)
264264
{
265265
http.authorizeHttpRequests(this::configureAuthorizeHttpRequests);
266266
}

0 commit comments

Comments
 (0)