diff --git a/build.gradle b/build.gradle index 862b17bb629..6e082d46006 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ configure(allprojects) { project -> dependencyManagement { imports { mavenBom "com.fasterxml.jackson:jackson-bom:2.13.1" - mavenBom "io.netty:netty-bom:4.1.76.Final" + mavenBom "io.netty:netty-bom:4.1.77.Final" mavenBom "io.projectreactor:reactor-bom:2022.0.0-M2" mavenBom "io.r2dbc:r2dbc-bom:Borca-SR1" mavenBom "io.rsocket:rsocket-bom:1.1.2" @@ -63,7 +63,7 @@ configure(allprojects) { project -> entry 'groovy-xml' } - dependency "io.reactivex.rxjava3:rxjava:3.1.3" + dependency "io.reactivex.rxjava3:rxjava:3.1.4" dependency "io.smallrye.reactive:mutiny:1.4.0" dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE" diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java index 3532753e8cc..7e86c84fce4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ import org.springframework.lang.Nullable; * @author Juergen Hoeller * @since 2.5 * @see java.sql.SQLTransientException - * @see java.sql.SQLTransientException + * @see java.sql.SQLNonTransientException * @see java.sql.SQLRecoverableException */ public class SQLExceptionSubclassTranslator extends AbstractFallbackSQLExceptionTranslator { diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java index 284c82497b9..8f6403f8eed 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,13 +100,12 @@ abstract class DefaultParts { /** - * Abstract base class. + * Abstract base class for {@link Part} implementations. */ private static abstract class AbstractPart implements Part { private final HttpHeaders headers; - protected AbstractPart(HttpHeaders headers) { Assert.notNull(headers, "HttpHeaders is required"); this.headers = headers; @@ -119,7 +118,6 @@ abstract class DefaultParts { return name; } - @Override public HttpHeaders headers() { return this.headers; @@ -172,7 +170,6 @@ abstract class DefaultParts { protected final Content content; - public DefaultPart(HttpHeaders headers, Content content) { super(headers); this.content = content; @@ -198,7 +195,6 @@ abstract class DefaultParts { return "DefaultPart"; } } - } @@ -213,7 +209,7 @@ abstract class DefaultParts { @Override public String filename() { - String filename = this.headers().getContentDisposition().getFilename(); + String filename = headers().getContentDisposition().getFilename(); Assert.state(filename != null, "No filename found"); return filename; } @@ -235,7 +231,6 @@ abstract class DefaultParts { return "DefaultFilePart{(" + filename + ")}"; } } - } @@ -249,9 +244,9 @@ abstract class DefaultParts { Mono transferTo(Path dest); Mono delete(); - } + /** * {@code Content} implementation based on a flux of data buffers. */ @@ -259,12 +254,10 @@ abstract class DefaultParts { private final Flux content; - public FluxContent(Flux content) { this.content = content; } - @Override public Flux content() { return this.content; @@ -279,7 +272,6 @@ abstract class DefaultParts { public Mono delete() { return Mono.empty(); } - } @@ -292,13 +284,11 @@ abstract class DefaultParts { private final Scheduler scheduler; - public FileContent(Path file, Scheduler scheduler) { this.file = file; this.scheduler = scheduler; } - @Override public Flux content() { return DataBufferUtils.readByteChannel(