spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Check resolver set when API version config customized

Browse Source 
Closes gh-35256
This commit is contained in:
rstoyanchev
2025-07-31 15:32:12 +01:00
parent 5a3bad6d61
commit 18ee8adaeb
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webflux/src/main/java/org/springframework/web/reactive/config/ApiVersionConfigurer.java
+11 -3
View File
@@ -26,6 +26,7 @@ import java.util.Set;
import org.jspecify.annotations.Nullable;
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
import org.springframework.web.accept.ApiVersionParser;
import org.springframework.web.accept.InvalidApiVersionException;
import org.springframework.web.accept.SemanticApiVersionParser;
@@ -49,7 +50,7 @@ public class ApiVersionConfigurer {
private @Nullable ApiVersionParser<?> versionParser;
private boolean versionRequired = true;
private @Nullable Boolean versionRequired;
private @Nullable String defaultVersion;
@@ -188,18 +189,25 @@ public class ApiVersionConfigurer {
}
protected @Nullable ApiVersionStrategy getApiVersionStrategy() {
if (this.versionResolvers.isEmpty()) {
Assert.state(isNotCustomized(), "API version config customized, but no ApiVersionResolver provided");
return null;
}
DefaultApiVersionStrategy strategy = new DefaultApiVersionStrategy(this.versionResolvers,
(this.versionParser != null ? this.versionParser : new SemanticApiVersionParser()),
this.versionRequired, this.defaultVersion, this.detectSupportedVersions,
this.deprecationHandler);
(this.versionRequired != null ? this.versionRequired : true),
this.defaultVersion, this.detectSupportedVersions, this.deprecationHandler);
this.supportedVersions.forEach(strategy::addSupportedVersion);
return strategy;
}
private boolean isNotCustomized() {
return (this.versionParser == null && this.versionRequired == null &&
this.defaultVersion == null && this.supportedVersions.isEmpty());
}
}
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ApiVersionConfigurer.java
+11 -2
View File
@@ -26,6 +26,7 @@ import java.util.Set;
import org.jspecify.annotations.Nullable;
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
import org.springframework.web.accept.ApiVersionDeprecationHandler;
import org.springframework.web.accept.ApiVersionParser;
import org.springframework.web.accept.ApiVersionResolver;
@@ -49,7 +50,7 @@ public class ApiVersionConfigurer {
private @Nullable ApiVersionParser<?> versionParser;
private boolean versionRequired = true;
private @Nullable Boolean versionRequired;
private @Nullable String defaultVersion;
@@ -188,13 +189,16 @@ public class ApiVersionConfigurer {
}
protected @Nullable ApiVersionStrategy getApiVersionStrategy() {
if (this.versionResolvers.isEmpty()) {
Assert.state(isNotCustomized(), "API version config customized, but no ApiVersionResolver provided");
return null;
}
DefaultApiVersionStrategy strategy = new DefaultApiVersionStrategy(this.versionResolvers,
(this.versionParser != null ? this.versionParser : new SemanticApiVersionParser()),
this.versionRequired, this.defaultVersion, this.detectSupportedVersions,
(this.versionRequired != null ? this.versionRequired : true),
this.defaultVersion, this.detectSupportedVersions,
this.deprecationHandler);
this.supportedVersions.forEach(strategy::addSupportedVersion);
@@ -202,4 +206,9 @@ public class ApiVersionConfigurer {
return strategy;
}
private boolean isNotCustomized() {
return (this.versionParser == null && this.versionRequired == null &&
this.defaultVersion == null && this.supportedVersions.isEmpty());
}
}