Minimize what remains of actuator-autoconfigure-all
This commit is contained in:
committed by
Phillip Webb
parent
d337c44c2f
commit
679ef5e7ff
@@ -138,6 +138,12 @@
|
||||
"description": "Whether to enable readiness state health check.",
|
||||
"defaultValue": false
|
||||
},
|
||||
{
|
||||
"name": "management.health.ssl.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"description": "Whether to enable SSL certificate health check.",
|
||||
"defaultValue": true
|
||||
},
|
||||
{
|
||||
"name": "management.httpexchanges.recording.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
/*
|
||||
* Copyright 2012-2023 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.actuate.autoconfigure.web.server;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
|
||||
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
|
||||
import org.springframework.boot.context.annotation.ImportCandidates;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.core.type.AnnotationMetadata;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link ManagementContextConfigurationImportSelector}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
class ManagementContextConfigurationImportSelectorTests {
|
||||
|
||||
@Test
|
||||
void selectImportsShouldOrderResult() {
|
||||
String[] imports = new TestManagementContextConfigurationsImportSelector(C.class, A.class, D.class, B.class)
|
||||
.selectImports(AnnotationMetadata.introspect(EnableChildContext.class));
|
||||
assertThat(imports).containsExactly(A.class.getName(), B.class.getName(), C.class.getName(), D.class.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
void selectImportsFiltersChildOnlyConfigurationWhenUsingSameContext() {
|
||||
String[] imports = new TestManagementContextConfigurationsImportSelector(ChildOnly.class, SameOnly.class,
|
||||
A.class)
|
||||
.selectImports(AnnotationMetadata.introspect(EnableSameContext.class));
|
||||
assertThat(imports).containsExactlyInAnyOrder(SameOnly.class.getName(), A.class.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
void selectImportsFiltersSameOnlyConfigurationWhenUsingChildContext() {
|
||||
String[] imports = new TestManagementContextConfigurationsImportSelector(ChildOnly.class, SameOnly.class,
|
||||
A.class)
|
||||
.selectImports(AnnotationMetadata.introspect(EnableChildContext.class));
|
||||
assertThat(imports).containsExactlyInAnyOrder(ChildOnly.class.getName(), A.class.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
void selectImportsLoadsFromResources() {
|
||||
String[] imports = new ManagementContextConfigurationImportSelector()
|
||||
.selectImports(AnnotationMetadata.introspect(EnableChildContext.class));
|
||||
Set<String> expected = new HashSet<>();
|
||||
ImportCandidates
|
||||
.load(ManagementContextConfiguration.class,
|
||||
ManagementContextConfigurationImportSelectorTests.class.getClassLoader())
|
||||
.forEach(expected::add);
|
||||
// Remove JerseySameManagementContextConfiguration, as it specifies
|
||||
// ManagementContextType.SAME and we asked for ManagementContextType.CHILD
|
||||
expected.remove(
|
||||
"org.springframework.boot.jersey.actuate.autoconfigure.web.JerseySameManagementContextConfiguration");
|
||||
assertThat(imports).containsExactlyInAnyOrderElementsOf(expected);
|
||||
}
|
||||
|
||||
private static final class TestManagementContextConfigurationsImportSelector
|
||||
extends ManagementContextConfigurationImportSelector {
|
||||
|
||||
private final List<String> factoryNames;
|
||||
|
||||
private TestManagementContextConfigurationsImportSelector(Class<?>... classes) {
|
||||
this.factoryNames = Stream.of(classes).map(Class::getName).toList();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<String> loadFactoryNames() {
|
||||
return this.factoryNames;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Order(1)
|
||||
static class A {
|
||||
|
||||
}
|
||||
|
||||
@Order(2)
|
||||
static class B {
|
||||
|
||||
}
|
||||
|
||||
@Order(3)
|
||||
static class C {
|
||||
|
||||
}
|
||||
|
||||
static class D {
|
||||
|
||||
}
|
||||
|
||||
@ManagementContextConfiguration(ManagementContextType.CHILD)
|
||||
static class ChildOnly {
|
||||
|
||||
}
|
||||
|
||||
@ManagementContextConfiguration(ManagementContextType.SAME)
|
||||
static class SameOnly {
|
||||
|
||||
}
|
||||
|
||||
@EnableManagementContext(ManagementContextType.CHILD)
|
||||
static class EnableChildContext {
|
||||
|
||||
}
|
||||
|
||||
@EnableManagementContext(ManagementContextType.SAME)
|
||||
static class EnableSameContext {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Copyright 2012-2025 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.actuate.autoconfigure.web.server;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link ManagementServerProperties}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Stephane Nicoll
|
||||
* @author Moritz Halbritter
|
||||
*/
|
||||
class ManagementServerPropertiesTests {
|
||||
|
||||
@Test
|
||||
void defaultPortIsNull() {
|
||||
ManagementServerProperties properties = new ManagementServerProperties();
|
||||
assertThat(properties.getPort()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void definedPort() {
|
||||
ManagementServerProperties properties = new ManagementServerProperties();
|
||||
properties.setPort(123);
|
||||
assertThat(properties.getPort()).isEqualTo(123);
|
||||
}
|
||||
|
||||
@Test
|
||||
void defaultBasePathIsEmptyString() {
|
||||
ManagementServerProperties properties = new ManagementServerProperties();
|
||||
assertThat(properties.getBasePath()).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
void definedBasePath() {
|
||||
ManagementServerProperties properties = new ManagementServerProperties();
|
||||
properties.setBasePath("/foo");
|
||||
assertThat(properties.getBasePath()).isEqualTo("/foo");
|
||||
}
|
||||
|
||||
@Test
|
||||
void trailingSlashOfBasePathIsRemoved() {
|
||||
ManagementServerProperties properties = new ManagementServerProperties();
|
||||
properties.setBasePath("/foo/");
|
||||
assertThat(properties.getBasePath()).isEqualTo("/foo");
|
||||
}
|
||||
|
||||
@Test
|
||||
void slashOfBasePathIsDefaultValue() {
|
||||
ManagementServerProperties properties = new ManagementServerProperties();
|
||||
properties.setBasePath("/");
|
||||
assertThat(properties.getBasePath()).isEmpty();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user