Merge pull request #37112 from hakan-krgn

* gh-37112:
  Polish "Polish code and javadoc"
  Polish code and javadoc

Closes gh-37112
pull/37210/head
Andy Wilkinson 1 year ago
commit d071ec8243

@ -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
*/ */

@ -159,11 +159,6 @@ public class TestDatabaseAutoConfiguration {
return EmbeddedDatabase.class; return EmbeddedDatabase.class;
} }
@Override
public boolean isSingleton() {
return true;
}
} }
static class EmbeddedDataSourceFactory { static class EmbeddedDataSourceFactory {

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 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.
@ -103,7 +103,7 @@ 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) {

@ -567,8 +567,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…
Cancel
Save