Polish

See gh-15134

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java

@@ -21,7 +21,7 @@ import java.time.Duration;
 import io.micrometer.core.instrument.Meter;
 
 /**
- * A service level agreement boundary for use when configuring micrometer. Can be
+ * A service level agreement boundary for use when configuring Micrometer. Can be
  * specified as either a {@link Long} (applicable to timers and distribution summaries) or
  * a {@link Duration} (applicable to only timers).
  *
@@ -57,7 +57,7 @@ public final class ServiceLevelAgreementBoundary {
 	}
 
 	/**
-	 * Return a new {@link ServiceLevelAgreementBoundary} instance for the given long
+	 * Return a new {@link ServiceLevelAgreementBoundary} instance for the given String
 	 * value.
 	 * @param value the source value
 	 * @return a {@link ServiceLevelAgreementBoundary} instance

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java

@@ -131,8 +131,7 @@ public class PrometheusMetricsExportAutoConfiguration {
 			String job = properties.getJob();
 			job = (job != null) ? job
 					: environment.getProperty("spring.application.name");
-			job = (job != null) ? job : FALLBACK_JOB;
+			return (job != null) ? job : FALLBACK_JOB;
-			return job;
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java

@@ -43,7 +43,7 @@ public class PrometheusProperties {
 	 * Configuration options for using Prometheus Pushgateway, allowing metrics to be
 	 * pushed when they cannot be scraped.
 	 */
-	private Pushgateway pushgateway = new Pushgateway();
+	private final Pushgateway pushgateway = new Pushgateway();
 
 	/**
 	 * Step size (i.e. reporting frequency) to use.
@@ -70,10 +70,6 @@ public class PrometheusProperties {
 		return this.pushgateway;
 	}
 
-	public void setPushgateway(Pushgateway pushgateway) {
-		this.pushgateway = pushgateway;
-	}
-
 	/**
 	 * Configuration options for push-based interaction with Prometheus.
 	 */

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusPushGatewayManager.java

@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Class that can be used to managed the pushing of metrics to a {@link PushGateway
+ * Class that can be used to manage the pushing of metrics to a {@link PushGateway
  * Prometheus PushGateway}. Handles the scheduling of push operations, error handling and
  * shutdown operations.
  *
@@ -115,9 +115,9 @@ public class PrometheusPushGatewayManager {
 		}
 		catch (UnknownHostException ex) {
 			String host = ex.getMessage();
-			String message = "Unable to locate prometheus push gateway host";
+			String message = "Unable to locate prometheus push gateway host"
-			message += StringUtils.hasLength(host) ? " '" + host + "'" : "";
+					+ (StringUtils.hasLength(host) ? " '" + host + "'" : "")
-			message += ". No longer attempting metrics publication to this host";
+					+ ". No longer attempting metrics publication to this host";
 			logger.error(message, ex);
 			shutdown(ShutdownOperation.NONE);
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java

@@ -213,13 +213,12 @@ class OnClassCondition extends FilteringSpringBootCondition {
 		private ConditionOutcome getOutcome(String candidates) {
 			try {
 				if (!candidates.contains(",")) {
-					return getOutcome(candidates, ClassNameFilter.MISSING,
+					return getOutcome(candidates, this.beanClassLoader);
-							this.beanClassLoader);
 				}
 				for (String candidate : StringUtils
 						.commaDelimitedListToStringArray(candidates)) {
 					ConditionOutcome outcome = getOutcome(candidate,
-							ClassNameFilter.MISSING, this.beanClassLoader);
+							this.beanClassLoader);
 					if (outcome != null) {
 						return outcome;
 					}
@@ -231,9 +230,8 @@ class OnClassCondition extends FilteringSpringBootCondition {
 			return null;
 		}
 
-		private ConditionOutcome getOutcome(String className,
+		private ConditionOutcome getOutcome(String className, ClassLoader classLoader) {
-				ClassNameFilter classNameFilter, ClassLoader classLoader) {
+			if (ClassNameFilter.MISSING.matches(className, classLoader)) {
-			if (classNameFilter.matches(className, classLoader)) {
 				return ConditionOutcome.noMatch(ConditionMessage
 						.forCondition(ConditionalOnClass.class)
 						.didNotFind("required class").items(Style.QUOTE, className));

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -1011,11 +1011,6 @@
 				<artifactId>netty-tcnative-boringssl-static</artifactId>
 				<version>${netty-tcnative.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>io.prometheus</groupId>
-				<artifactId>simpleclient_pushgateway</artifactId>
-				<version>${prometheus-pushgateway.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>io.projectreactor</groupId>
 				<artifactId>reactor-bom</artifactId>
@@ -1023,6 +1018,11 @@
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
+			<dependency>
+				<groupId>io.prometheus</groupId>
+				<artifactId>simpleclient_pushgateway</artifactId>
+				<version>${prometheus-pushgateway.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>io.reactivex</groupId>
 				<artifactId>rxjava</artifactId>

spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -2013,7 +2013,7 @@ include::{code-examples}/jpa/HibernateSecondLevelCacheExample.java[tag=configura
 ----
 
 This customizer will configure Hibernate to use the same `CacheManager` as the one that
-the application uses. It is also possible to use separate `CacheManager` instances, refer
+the application uses. It is also possible to use separate `CacheManager` instances. For details, refer
 to {hibernate-documentation}#caching-provider-jcache[the Hibernate user guide].
 
 

spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -1436,7 +1436,7 @@ annotation markers.
 
 [[production-ready-metrics-export-appoptics]]
 ==== AppOptics
-By default, the AppOptics registry pushes metrics to https://www.appoptics.com/
+By default, the AppOptics registry pushes metrics to https://api.appoptics.com/v1/measurements
 periodically. To export metrics to SaaS
 {micrometer-registry-documentation}/appoptics[AppOptics], your API token must be provided:
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java

@@ -62,6 +62,7 @@ public class FilteredClassLoader extends URLClassLoader {
 	 * Create a {@link FilteredClassLoader} that hides resources from the given
 	 * {@link ClassPathResource classpath resources}.
 	 * @param hiddenResources the resources to hide
+	 * @since 2.1.0
 	 */
 	public FilteredClassLoader(ClassPathResource... hiddenResources) {
 		this(Collections.emptyList(),
@@ -164,6 +165,8 @@ public class FilteredClassLoader extends URLClassLoader {
 
 	/**
 	 * Filter to restrict the resources that can be loaded.
+	 *
+	 * @since 2.1.0
 	 */
 	public static final class ClassPathResourceFilter implements Predicate<String> {
 

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java

@@ -243,7 +243,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 
 		NamedValuesExtractor(String... names) {
 			this.names = new HashSet<>(Arrays.asList(names));
-		};
+		}
 
 		@Override
 		public List<Object> getValues(AnnotationMirror annotation) {