GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #42457 from izeye 

* pr/42457:
  Polish

Closes gh-42457
pull/42467/head
Moritz Halbritter 1 year ago
parent
6f9c270a84 3882dcc2fa
commit
a19bcdeb3f
9 changed files with 32 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingConfigurations.java
  2. 26
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/OpenTelemetryLoggingAutoConfigurationTests.java
  3. 8
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationTests.java
  4. 16
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OnEnabledTracingConditionTests.java
  5. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCachePropertiesCustomizer.java
  6. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebProperties.java
  7. 4
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java
  8. 6
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
  9. 1
      spring-boot-project/spring-boot-dependencies/build.gradle

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingConfigurations.java
Unescape View File

@ -44,7 +44,7 @@ final class OtlpLoggingConfigurations {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnProperty(prefix = "management.otlp.logging", name = "endpoint") @ConditionalOnProperty(prefix = "management.otlp.logging", name = "endpoint")
OtlpLoggingConnectionDetails otlpLogsConnectionDetails(OtlpLoggingProperties properties) { OtlpLoggingConnectionDetails otlpLoggingConnectionDetails(OtlpLoggingProperties properties) {
return new PropertiesOtlpLoggingConnectionDetails(properties); return new PropertiesOtlpLoggingConnectionDetails(properties);
} }

26
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/OpenTelemetryLoggingAutoConfigurationTests.java
Unescape View File

@ -32,6 +32,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@ -50,9 +51,8 @@ class OpenTelemetryLoggingAutoConfigurationTests {
private final ApplicationContextRunner contextRunner; private final ApplicationContextRunner contextRunner;
OpenTelemetryLoggingAutoConfigurationTests() { OpenTelemetryLoggingAutoConfigurationTests() {
this.contextRunner = new ApplicationContextRunner().withConfiguration(AutoConfigurations.of( this.contextRunner = new ApplicationContextRunner().withConfiguration(AutoConfigurations
org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration.class, .of(OpenTelemetryAutoConfiguration.class, OpenTelemetryLoggingAutoConfiguration.class));
OpenTelemetryLoggingAutoConfiguration.class));
} }
@Test @Test
@ -82,8 +82,8 @@ class OpenTelemetryLoggingAutoConfigurationTests {
} }
@Test @Test
void shouldAllowMultipleLogRecordExporter() { void shouldAllowMultipleLogRecordExporters() {
this.contextRunner.withUserConfiguration(MultipleLogRecordExporterConfig.class).run((context) -> { this.contextRunner.withUserConfiguration(MultipleLogRecordExportersConfig.class).run((context) -> {
assertThat(context).hasSingleBean(BatchLogRecordProcessor.class); assertThat(context).hasSingleBean(BatchLogRecordProcessor.class);
assertThat(context.getBeansOfType(LogRecordExporter.class)).hasSize(2); assertThat(context.getBeansOfType(LogRecordExporter.class)).hasSize(2);
assertThat(context).hasBean("customLogRecordExporter1"); assertThat(context).hasBean("customLogRecordExporter1");
@ -92,8 +92,8 @@ class OpenTelemetryLoggingAutoConfigurationTests {
} }
@Test @Test
void shouldAllowMultipleLogRecordProcessorInAdditionToBatchLogRecordProcessor() { void shouldAllowMultipleLogRecordProcessorsInAdditionToBatchLogRecordProcessor() {
this.contextRunner.withUserConfiguration(MultipleLogRecordProcessorConfig.class).run((context) -> { this.contextRunner.withUserConfiguration(MultipleLogRecordProcessorsConfig.class).run((context) -> {
assertThat(context).hasSingleBean(BatchLogRecordProcessor.class); assertThat(context).hasSingleBean(BatchLogRecordProcessor.class);
assertThat(context).hasSingleBean(SdkLoggerProvider.class); assertThat(context).hasSingleBean(SdkLoggerProvider.class);
assertThat(context.getBeansOfType(LogRecordProcessor.class)).hasSize(3); assertThat(context.getBeansOfType(LogRecordProcessor.class)).hasSize(3);
@ -104,11 +104,11 @@ class OpenTelemetryLoggingAutoConfigurationTests {
} }
@Test @Test
void shouldAllowMultipleSdkLoggerProviderBuilderCustomizer() { void shouldAllowMultipleSdkLoggerProviderBuilderCustomizers() {
this.contextRunner.withUserConfiguration(MultipleSdkLoggerProviderBuilderCustomizerConfig.class) this.contextRunner.withUserConfiguration(MultipleSdkLoggerProviderBuilderCustomizersConfig.class)
.run((context) -> { .run((context) -> {
assertThat(context).hasSingleBean(SdkLoggerProvider.class); assertThat(context).hasSingleBean(SdkLoggerProvider.class);
assertThat(context.getBeansOfType(NoopSdkLoggerProviderBuilderCustomizer.class)).hasSize(2); assertThat(context.getBeansOfType(SdkLoggerProviderBuilderCustomizer.class)).hasSize(2);
assertThat(context).hasBean("customSdkLoggerProviderBuilderCustomizer1"); assertThat(context).hasBean("customSdkLoggerProviderBuilderCustomizer1");
assertThat(context).hasBean("customSdkLoggerProviderBuilderCustomizer2"); assertThat(context).hasBean("customSdkLoggerProviderBuilderCustomizer2");
assertThat(context assertThat(context
@ -136,7 +136,7 @@ class OpenTelemetryLoggingAutoConfigurationTests {
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
public static class MultipleLogRecordExporterConfig { public static class MultipleLogRecordExportersConfig {
@Bean @Bean
public LogRecordExporter customLogRecordExporter1() { public LogRecordExporter customLogRecordExporter1() {
@ -151,7 +151,7 @@ class OpenTelemetryLoggingAutoConfigurationTests {
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
public static class MultipleLogRecordProcessorConfig { public static class MultipleLogRecordProcessorsConfig {
@Bean @Bean
public LogRecordProcessor customLogRecordProcessor1() { public LogRecordProcessor customLogRecordProcessor1() {
@ -166,7 +166,7 @@ class OpenTelemetryLoggingAutoConfigurationTests {
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
public static class MultipleSdkLoggerProviderBuilderCustomizerConfig { public static class MultipleSdkLoggerProviderBuilderCustomizersConfig {
@Bean @Bean
public SdkLoggerProviderBuilderCustomizer customSdkLoggerProviderBuilderCustomizer1() { public SdkLoggerProviderBuilderCustomizer customSdkLoggerProviderBuilderCustomizer1() {

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingAutoConfigurationTests.java
Unescape View File

@ -89,8 +89,8 @@ class OtlpLoggingAutoConfigurationTests {
} }
@Test @Test
void shouldBackOffWhenCustomOtlpLogsConnectionDetailsIsDefined() { void shouldBackOffWhenCustomOtlpLoggingConnectionDetailsIsDefined() {
this.contextRunner.withUserConfiguration(CustomOtlpLogsConnectionDetails.class).run((context) -> { this.contextRunner.withUserConfiguration(CustomOtlpLoggingConnectionDetails.class).run((context) -> {
assertThat(context).hasSingleBean(OtlpLoggingConnectionDetails.class) assertThat(context).hasSingleBean(OtlpLoggingConnectionDetails.class)
.doesNotHaveBean(PropertiesOtlpLoggingConnectionDetails.class); .doesNotHaveBean(PropertiesOtlpLoggingConnectionDetails.class);
OtlpHttpLogRecordExporter otlpHttpLogRecordExporter = context.getBean(OtlpHttpLogRecordExporter.class); OtlpHttpLogRecordExporter otlpHttpLogRecordExporter = context.getBean(OtlpHttpLogRecordExporter.class);
@ -121,10 +121,10 @@ class OtlpLoggingAutoConfigurationTests {
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
public static class CustomOtlpLogsConnectionDetails { public static class CustomOtlpLoggingConnectionDetails {
@Bean @Bean
public OtlpLoggingConnectionDetails customOtlpLogsConnectionDetails() { public OtlpLoggingConnectionDetails customOtlpLoggingConnectionDetails() {
return (transport) -> "https://otel.example.com/v1/logs"; return (transport) -> "https://otel.example.com/v1/logs";
} }

16
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OnEnabledTracingConditionTests.java
Unescape View File

@ -40,7 +40,7 @@ class OnEnabledTracingConditionTests {
@Test @Test
void shouldMatchIfNoPropertyIsSet() { void shouldMatchIfNoPropertyIsSet() {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition.getMatchOutcome(mockConditionContext(), mockMetaData("")); ConditionOutcome outcome = condition.getMatchOutcome(mockConditionContext(), mockMetadata(""));
assertThat(outcome.isMatch()).isTrue(); assertThat(outcome.isMatch()).isTrue();
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnEnabledTracing tracing is enabled by default"); assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnEnabledTracing tracing is enabled by default");
} }
@ -49,7 +49,7 @@ class OnEnabledTracingConditionTests {
void shouldNotMatchIfGlobalPropertyIsFalse() { void shouldNotMatchIfGlobalPropertyIsFalse() {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition ConditionOutcome outcome = condition
.getMatchOutcome(mockConditionContext(Map.of("management.tracing.enabled", "false")), mockMetaData("")); .getMatchOutcome(mockConditionContext(Map.of("management.tracing.enabled", "false")), mockMetadata(""));
assertThat(outcome.isMatch()).isFalse(); assertThat(outcome.isMatch()).isFalse();
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnEnabledTracing management.tracing.enabled is false"); assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnEnabledTracing management.tracing.enabled is false");
} }
@ -58,7 +58,7 @@ class OnEnabledTracingConditionTests {
void shouldMatchIfGlobalPropertyIsTrue() { void shouldMatchIfGlobalPropertyIsTrue() {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition ConditionOutcome outcome = condition
.getMatchOutcome(mockConditionContext(Map.of("management.tracing.enabled", "true")), mockMetaData("")); .getMatchOutcome(mockConditionContext(Map.of("management.tracing.enabled", "true")), mockMetadata(""));
assertThat(outcome.isMatch()).isTrue(); assertThat(outcome.isMatch()).isTrue();
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnEnabledTracing management.tracing.enabled is true"); assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnEnabledTracing management.tracing.enabled is true");
} }
@ -68,7 +68,7 @@ class OnEnabledTracingConditionTests {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition.getMatchOutcome( ConditionOutcome outcome = condition.getMatchOutcome(
mockConditionContext(Map.of("management.zipkin.tracing.export.enabled", "false")), mockConditionContext(Map.of("management.zipkin.tracing.export.enabled", "false")),
mockMetaData("zipkin")); mockMetadata("zipkin"));
assertThat(outcome.isMatch()).isFalse(); assertThat(outcome.isMatch()).isFalse();
assertThat(outcome.getMessage()) assertThat(outcome.getMessage())
.isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is false"); .isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is false");
@ -79,7 +79,7 @@ class OnEnabledTracingConditionTests {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition.getMatchOutcome( ConditionOutcome outcome = condition.getMatchOutcome(
mockConditionContext(Map.of("management.zipkin.tracing.export.enabled", "true")), mockConditionContext(Map.of("management.zipkin.tracing.export.enabled", "true")),
mockMetaData("zipkin")); mockMetadata("zipkin"));
assertThat(outcome.isMatch()).isTrue(); assertThat(outcome.isMatch()).isTrue();
assertThat(outcome.getMessage()) assertThat(outcome.getMessage())
.isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is true"); .isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is true");
@ -90,7 +90,7 @@ class OnEnabledTracingConditionTests {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition.getMatchOutcome(mockConditionContext( ConditionOutcome outcome = condition.getMatchOutcome(mockConditionContext(
Map.of("management.tracing.enabled", "false", "management.zipkin.tracing.export.enabled", "true")), Map.of("management.tracing.enabled", "false", "management.zipkin.tracing.export.enabled", "true")),
mockMetaData("zipkin")); mockMetadata("zipkin"));
assertThat(outcome.isMatch()).isTrue(); assertThat(outcome.isMatch()).isTrue();
assertThat(outcome.getMessage()) assertThat(outcome.getMessage())
.isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is true"); .isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is true");
@ -101,7 +101,7 @@ class OnEnabledTracingConditionTests {
OnEnabledTracingCondition condition = new OnEnabledTracingCondition(); OnEnabledTracingCondition condition = new OnEnabledTracingCondition();
ConditionOutcome outcome = condition.getMatchOutcome(mockConditionContext( ConditionOutcome outcome = condition.getMatchOutcome(mockConditionContext(
Map.of("management.tracing.enabled", "true", "management.zipkin.tracing.export.enabled", "false")), Map.of("management.tracing.enabled", "true", "management.zipkin.tracing.export.enabled", "false")),
mockMetaData("zipkin")); mockMetadata("zipkin"));
assertThat(outcome.isMatch()).isFalse(); assertThat(outcome.isMatch()).isFalse();
assertThat(outcome.getMessage()) assertThat(outcome.getMessage())
.isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is false"); .isEqualTo("@ConditionalOnEnabledTracing management.zipkin.tracing.export.enabled is false");
@ -119,7 +119,7 @@ class OnEnabledTracingConditionTests {
return context; return context;
} }
private AnnotatedTypeMetadata mockMetaData(String exporter) { private AnnotatedTypeMetadata mockMetadata(String exporter) {
AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class); AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class);
given(metadata.getAnnotationAttributes(ConditionalOnEnabledTracing.class.getName())) given(metadata.getAnnotationAttributes(ConditionalOnEnabledTracing.class.getName()))
.willReturn(Map.of("value", exporter)); .willReturn(Map.of("value", exporter));

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCachePropertiesCustomizer.java vendored
Unescape View File

@ -34,7 +34,6 @@ public interface JCachePropertiesCustomizer {
/** /**
* Customize the properties. * Customize the properties.
* @param properties the current properties * @param properties the current properties
*
*/ */
void customize(Properties properties); void customize(Properties properties);

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebProperties.java
Unescape View File

@ -84,7 +84,7 @@ public class SpringDataWebProperties {
private int maxPageSize = 2000; private int maxPageSize = 2000;
/** /**
* Configures how to render spring data Pageable instances. * Configures how to render Spring Data Pageable instances.
*/ */
private PageSerializationMode serializationMode = PageSerializationMode.DIRECT; private PageSerializationMode serializationMode = PageSerializationMode.DIRECT;

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java
Unescape View File

@ -65,12 +65,12 @@ class ConditionalOnExpressionTests {
MockEnvironment environment = new MockEnvironment(); MockEnvironment environment = new MockEnvironment();
ConditionContext conditionContext = mock(ConditionContext.class); ConditionContext conditionContext = mock(ConditionContext.class);
given(conditionContext.getEnvironment()).willReturn(environment); given(conditionContext.getEnvironment()).willReturn(environment);
ConditionOutcome outcome = condition.getMatchOutcome(conditionContext, mockMetaData("invalid-spel")); ConditionOutcome outcome = condition.getMatchOutcome(conditionContext, mockMetadata("invalid-spel"));
assertThat(outcome.isMatch()).isFalse(); assertThat(outcome.isMatch()).isFalse();
assertThat(outcome.getMessage()).contains("invalid-spel").contains("no BeanFactory available"); assertThat(outcome.getMessage()).contains("invalid-spel").contains("no BeanFactory available");
} }
private AnnotatedTypeMetadata mockMetaData(String value) { private AnnotatedTypeMetadata mockMetadata(String value) {
AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class); AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class);
given(metadata.getAnnotationAttributes(ConditionalOnExpression.class.getName())) given(metadata.getAnnotationAttributes(ConditionalOnExpression.class.getName()))
.willReturn(Collections.singletonMap("value", value)); .willReturn(Collections.singletonMap("value", value));

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
Unescape View File

@ -101,14 +101,14 @@ class ConditionalOnJndiTests {
@Test @Test
void jndiLocationNotFound() { void jndiLocationNotFound() {
ConditionOutcome outcome = this.condition.getMatchOutcome(null, mockMetaData("java:/a")); ConditionOutcome outcome = this.condition.getMatchOutcome(null, mockMetadata("java:/a"));
assertThat(outcome.isMatch()).isFalse(); assertThat(outcome.isMatch()).isFalse();
} }
@Test @Test
void jndiLocationFound() { void jndiLocationFound() {
this.condition.setFoundLocation("java:/b"); this.condition.setFoundLocation("java:/b");
ConditionOutcome outcome = this.condition.getMatchOutcome(null, mockMetaData("java:/a", "java:/b")); ConditionOutcome outcome = this.condition.getMatchOutcome(null, mockMetadata("java:/a", "java:/b"));
assertThat(outcome.isMatch()).isTrue(); assertThat(outcome.isMatch()).isTrue();
} }
@ -117,7 +117,7 @@ class ConditionalOnJndiTests {
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestableInitialContextFactory.class.getName()); System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestableInitialContextFactory.class.getName());
} }
private AnnotatedTypeMetadata mockMetaData(String... value) { private AnnotatedTypeMetadata mockMetadata(String... value) {
AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class); AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class);
Map<String, Object> attributes = new HashMap<>(); Map<String, Object> attributes = new HashMap<>();
attributes.put("value", value); attributes.put("value", value);

1
spring-boot-project/spring-boot-dependencies/build.gradle
Unescape View File

@ -1489,7 +1489,6 @@ bom {
group("com.oracle.database.security") { group("com.oracle.database.security") {
modules = [ modules = [
"oraclepki" "oraclepki"
] ]
} }
group("com.oracle.database.xml") { group("com.oracle.database.xml") {

Write Preview
Loading…
Cancel
Save