root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Expose combine method in CorsConfiguration 

Closes gh-25716
This commit is contained in:
Rossen Stoyanchev 2020-09-25 21:36:18 +01:00
parent 852e904b08
commit b9ef5416b9
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webflux/src/main/java/org/springframework/web/reactive/config/CorsRegistration.java
View File

@ -134,6 +134,18 @@ public class CorsRegistration {
return this;
}
/**
* Apply the given {@code CorsConfiguration} to the one being configured via
* {@link CorsConfiguration#combine(CorsConfiguration)} which in turn has been
* initialized with {@link CorsConfiguration#applyPermitDefaultValues()}.
* @param other the configuration to apply
* @since 5.3
*/
public CorsRegistration combine(CorsConfiguration other) {
this.config.combine(other);
return this;
}
protected String getPathPattern() {
return this.pathPattern;
}

12
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsRegistration.java
View File

@ -135,6 +135,18 @@ public class CorsRegistration {
return this;
}
/**
* Apply the given {@code CorsConfiguration} to the one being configured via
* {@link CorsConfiguration#combine(CorsConfiguration)} which in turn has been
* initialized with {@link CorsConfiguration#applyPermitDefaultValues()}.
* @param other the configuration to apply
* @since 5.3
*/
public CorsRegistration combine(CorsConfiguration other) {
this.config.combine(other);
return this;
}
protected String getPathPattern() {
return this.pathPattern;
}