Move spring.resources.* properties to spring.web.resources.*
Closes gh-23917pull/23986/head
Andy Wilkinson
4 years ago
parent
929d8fcd3c
commit
c22e655848
@ -0,0 +1,69 @@
|
||||
/*
|
||||
* Copyright 2012-2020 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.autoconfigure.web;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.web.WebProperties.Resources;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
|
||||
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||
import org.springframework.boot.test.context.runner.ContextConsumer;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Binding tests for {@link WebProperties.Resources}.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
class WebPropertiesResourcesBindingTests {
|
||||
|
||||
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withUserConfiguration(TestConfiguration.class);
|
||||
|
||||
@Test
|
||||
void staticLocationsExpandArray() {
|
||||
this.contextRunner
|
||||
.withPropertyValues("spring.web.resources.static-locations[0]=classpath:/one/",
|
||||
"spring.web.resources.static-locations[1]=classpath:/two",
|
||||
"spring.web.resources.static-locations[2]=classpath:/three/",
|
||||
"spring.web.resources.static-locations[3]=classpath:/four",
|
||||
"spring.web.resources.static-locations[4]=classpath:/five/",
|
||||
"spring.web.resources.static-locations[5]=classpath:/six")
|
||||
.run(assertResourceProperties((properties) -> assertThat(properties.getStaticLocations()).contains(
|
||||
"classpath:/one/", "classpath:/two/", "classpath:/three/", "classpath:/four/",
|
||||
"classpath:/five/", "classpath:/six/")));
|
||||
}
|
||||
|
||||
private ContextConsumer<AssertableApplicationContext> assertResourceProperties(Consumer<Resources> consumer) {
|
||||
return (context) -> {
|
||||
assertThat(context).hasSingleBean(WebProperties.class);
|
||||
consumer.accept(context.getBean(WebProperties.class).getResources());
|
||||
};
|
||||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@EnableConfigurationProperties(WebProperties.class)
|
||||
static class TestConfiguration {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,108 @@
|
||||
/*
|
||||
* Copyright 2012-2020 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.autoconfigure.web;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.web.WebProperties.Resources;
|
||||
import org.springframework.boot.autoconfigure.web.WebProperties.Resources.Cache;
|
||||
import org.springframework.http.CacheControl;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link WebProperties.Resources}.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author Kristine Jetzke
|
||||
*/
|
||||
@Deprecated
|
||||
class WebPropertiesResourcesTests {
|
||||
|
||||
private final Resources properties = new WebProperties().getResources();
|
||||
|
||||
@Test
|
||||
void resourceChainNoCustomization() {
|
||||
assertThat(this.properties.getChain().getEnabled()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void resourceChainStrategyEnabled() {
|
||||
this.properties.getChain().getStrategy().getFixed().setEnabled(true);
|
||||
assertThat(this.properties.getChain().getEnabled()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void resourceChainEnabled() {
|
||||
this.properties.getChain().setEnabled(true);
|
||||
assertThat(this.properties.getChain().getEnabled()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void resourceChainDisabled() {
|
||||
this.properties.getChain().setEnabled(false);
|
||||
assertThat(this.properties.getChain().getEnabled()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void defaultStaticLocationsAllEndWithTrailingSlash() {
|
||||
assertThat(this.properties.getStaticLocations()).allMatch((location) -> location.endsWith("/"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void customStaticLocationsAreNormalizedToEndWithTrailingSlash() {
|
||||
this.properties.setStaticLocations(new String[] { "/foo", "/bar", "/baz/" });
|
||||
String[] actual = this.properties.getStaticLocations();
|
||||
assertThat(actual).containsExactly("/foo/", "/bar/", "/baz/");
|
||||
}
|
||||
|
||||
@Test
|
||||
void emptyCacheControl() {
|
||||
CacheControl cacheControl = this.properties.getCache().getCachecontrol().toHttpCacheControl();
|
||||
assertThat(cacheControl).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void cacheControlAllPropertiesSet() {
|
||||
Cache.Cachecontrol properties = this.properties.getCache().getCachecontrol();
|
||||
properties.setMaxAge(Duration.ofSeconds(4));
|
||||
properties.setCachePrivate(true);
|
||||
properties.setCachePublic(true);
|
||||
properties.setMustRevalidate(true);
|
||||
properties.setNoTransform(true);
|
||||
properties.setProxyRevalidate(true);
|
||||
properties.setSMaxAge(Duration.ofSeconds(5));
|
||||
properties.setStaleIfError(Duration.ofSeconds(6));
|
||||
properties.setStaleWhileRevalidate(Duration.ofSeconds(7));
|
||||
CacheControl cacheControl = properties.toHttpCacheControl();
|
||||
assertThat(cacheControl.getHeaderValue())
|
||||
.isEqualTo("max-age=4, must-revalidate, no-transform, public, private, proxy-revalidate,"
|
||||
+ " s-maxage=5, stale-if-error=6, stale-while-revalidate=7");
|
||||
}
|
||||
|
||||
@Test
|
||||
void invalidCacheControlCombination() {
|
||||
Cache.Cachecontrol properties = this.properties.getCache().getCachecontrol();
|
||||
properties.setMaxAge(Duration.ofSeconds(4));
|
||||
properties.setNoStore(true);
|
||||
CacheControl cacheControl = properties.toHttpCacheControl();
|
||||
assertThat(cacheControl.getHeaderValue()).isEqualTo("no-store");
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue