mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.1.x'
Closes gh-37144
This commit is contained in:
commit
f6c88662b4
@ -99,7 +99,7 @@ public abstract class AbstractReactiveHealthIndicator implements ReactiveHealthI
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Actual health check logic. If an error occurs in the pipeline it will be handled
|
* Actual health check logic. If an error occurs in the pipeline, it will be handled
|
||||||
* automatically.
|
* automatically.
|
||||||
* @param builder the {@link Health.Builder} to report health status and details
|
* @param builder the {@link Health.Builder} to report health status and details
|
||||||
* @return a {@link Mono} that provides the {@link Health}
|
* @return a {@link Mono} that provides the {@link Health}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2023 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -119,8 +119,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
AnnotationCustomizableTypeExcludeFilter other = (AnnotationCustomizableTypeExcludeFilter) obj;
|
AnnotationCustomizableTypeExcludeFilter other = (AnnotationCustomizableTypeExcludeFilter) obj;
|
||||||
boolean result = true;
|
boolean result = hasAnnotation() == other.hasAnnotation();
|
||||||
result = result && hasAnnotation() == other.hasAnnotation();
|
|
||||||
for (FilterType filterType : FilterType.values()) {
|
for (FilterType filterType : FilterType.values()) {
|
||||||
result &= ObjectUtils.nullSafeEquals(getFilters(filterType), other.getFilters(filterType));
|
result &= ObjectUtils.nullSafeEquals(getFilters(filterType), other.getFilters(filterType));
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2023 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -58,7 +58,7 @@ public @interface AutoConfigureTestDatabase {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The type of connection to be established when {@link #replace() replacing} the
|
* The type of connection to be established when {@link #replace() replacing} the
|
||||||
* DataSource. By default will attempt to detect the connection based on the
|
* DataSource. By default, will attempt to detect the connection based on the
|
||||||
* classpath.
|
* classpath.
|
||||||
* @return the type of connection to use
|
* @return the type of connection to use
|
||||||
*/
|
*/
|
||||||
|
@ -163,11 +163,6 @@ public class TestDatabaseAutoConfiguration {
|
|||||||
return EmbeddedDatabase.class;
|
return EmbeddedDatabase.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSingleton() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static class EmbeddedDataSourceFactory {
|
static class EmbeddedDataSourceFactory {
|
||||||
|
@ -91,7 +91,7 @@ public class AnnotationsPropertySource extends EnumerablePropertySource<Class<?>
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Optional<Object> value = annotation.getValue(attribute.getName());
|
Optional<Object> value = annotation.getValue(attribute.getName());
|
||||||
if (!value.isPresent()) {
|
if (value.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (skip == SkipPropertyMapping.ON_DEFAULT_VALUE) {
|
if (skip == SkipPropertyMapping.ON_DEFAULT_VALUE) {
|
||||||
|
@ -98,7 +98,7 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
|
|||||||
private String getAnnotationsDescription(Set<Class<?>> annotations) {
|
private String getAnnotationsDescription(Set<Class<?>> annotations) {
|
||||||
StringBuilder result = new StringBuilder();
|
StringBuilder result = new StringBuilder();
|
||||||
for (Class<?> annotation : annotations) {
|
for (Class<?> annotation : annotations) {
|
||||||
if (result.length() != 0) {
|
if (!result.isEmpty()) {
|
||||||
result.append(", ");
|
result.append(", ");
|
||||||
}
|
}
|
||||||
result.append('@').append(ClassUtils.getShortName(annotation));
|
result.append('@').append(ClassUtils.getShortName(annotation));
|
||||||
|
@ -107,7 +107,7 @@ public class WebDriverScope implements Scope {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Register this scope with the specified context and reassign appropriate bean
|
* Register this scope with the specified context and reassign appropriate bean
|
||||||
* definitions to used it.
|
* definitions to use it.
|
||||||
* @param context the application context
|
* @param context the application context
|
||||||
*/
|
*/
|
||||||
static void registerWith(ConfigurableApplicationContext context) {
|
static void registerWith(ConfigurableApplicationContext context) {
|
||||||
|
@ -570,8 +570,8 @@ public class SpringApplication {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Apply any relevant post processing the {@link ApplicationContext}. Subclasses can
|
* Apply any relevant post-processing to the {@link ApplicationContext}. Subclasses
|
||||||
* apply additional processing as required.
|
* can apply additional processing as required.
|
||||||
* @param context the application context
|
* @param context the application context
|
||||||
*/
|
*/
|
||||||
protected void postProcessApplicationContext(ConfigurableApplicationContext context) {
|
protected void postProcessApplicationContext(ConfigurableApplicationContext context) {
|
||||||
|
Loading…
Reference in New Issue
Block a user