Upgrade to spring-javaformat 0.0.11

Author: wilkinsona

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -82,8 +82,7 @@ public AuditEvent(String principal, String type, String... data) {
 	 * @param type the event type
 	 * @param data the event data
 	 */
-	public AuditEvent(Date timestamp, String principal, String type,
-			Map<String, Object> data) {
+	public AuditEvent(Date timestamp, String principal, String type, Map<String, Object> data) {
 		Assert.notNull(timestamp, "Timestamp must not be null");
 		Assert.notNull(type, "Type must not be null");
 		this.timestamp = timestamp;
@@ -142,8 +141,8 @@ public Map<String, Object> getData() {
 
 	@Override
 	public String toString() {
-		return "AuditEvent [timestamp=" + this.timestamp + ", principal=" + this.principal
-				+ ", type=" + this.type + ", data=" + this.data + "]";
+		return "AuditEvent [timestamp=" + this.timestamp + ", principal=" + this.principal + ", type=" + this.type
+				+ ", data=" + this.data + "]";
 	}
 
 }

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AbstractAuditListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -25,8 +25,7 @@
  * @author Vedran Pavic
  * @since 1.4.0
  */
-public abstract class AbstractAuditListener
-		implements ApplicationListener<AuditApplicationEvent> {
+public abstract class AbstractAuditListener implements ApplicationListener<AuditApplicationEvent> {
 
 	@Override
 	public void onApplicationEvent(AuditApplicationEvent event) {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -40,8 +40,7 @@ public class AuditApplicationEvent extends ApplicationEvent {
 	 * @param data the event data
 	 * @see AuditEvent#AuditEvent(String, String, Map)
 	 */
-	public AuditApplicationEvent(String principal, String type,
-			Map<String, Object> data) {
+	public AuditApplicationEvent(String principal, String type, Map<String, Object> data) {
 		this(new AuditEvent(principal, type, data));
 	}
 
@@ -66,8 +65,7 @@ public AuditApplicationEvent(String principal, String type, String... data) {
 	 * @param data the event data
 	 * @see AuditEvent#AuditEvent(Date, String, String, Map)
 	 */
-	public AuditApplicationEvent(Date timestamp, String principal, String type,
-			Map<String, Object> data) {
+	public AuditApplicationEvent(Date timestamp, String principal, String type, Map<String, Object> data) {
 		this(new AuditEvent(timestamp, principal, type, data));
 	}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ActuatorMetricWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -32,8 +32,7 @@
  * @author Dave Syer
  */
 @Qualifier
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE,
-		ElementType.ANNOTATION_TYPE })
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java

@@ -43,8 +43,7 @@ public class AuditAutoConfiguration {
 
 	private final AuditEventRepository auditEventRepository;
 
-	public AuditAutoConfiguration(
-			ObjectProvider<AuditEventRepository> auditEventRepository) {
+	public AuditAutoConfiguration(ObjectProvider<AuditEventRepository> auditEventRepository) {
 		this.auditEventRepository = auditEventRepository.getIfAvailable();
 	}
 
@@ -55,16 +54,14 @@ public AuditListener auditListener() throws Exception {
 	}
 
 	@Bean
-	@ConditionalOnClass(
-			name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
+	@ConditionalOnClass(name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
 	@ConditionalOnMissingBean(AbstractAuthenticationAuditListener.class)
 	public AuthenticationAuditListener authenticationAuditListener() throws Exception {
 		return new AuthenticationAuditListener();
 	}
 
 	@Bean
-	@ConditionalOnClass(
-			name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
+	@ConditionalOnClass(name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
 	@ConditionalOnMissingBean(AbstractAuthorizationAuditListener.class)
 	public AuthorizationAuditListener authorizationAuditListener() throws Exception {
 		return new AuthorizationAuditListener();

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -152,8 +152,7 @@ static class NoOpCacheStatisticsConfiguration {
 		public CacheStatisticsProvider<Cache> noOpCacheStatisticsProvider() {
 			return new CacheStatisticsProvider<Cache>() {
 				@Override
-				public CacheStatistics getCacheStatistics(CacheManager cacheManager,
-						Cache cache) {
+				public CacheStatistics getCacheStatistics(CacheManager cacheManager, Cache cache) {
 					if (cacheManager instanceof NoOpCacheManager) {
 						return NO_OP_STATS;
 					}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CompositeHealthIndicatorConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -42,28 +42,25 @@ protected HealthIndicator createHealthIndicator(Map<String, S> beans) {
 		if (beans.size() == 1) {
 			return createHealthIndicator(beans.values().iterator().next());
 		}
-		CompositeHealthIndicator composite = new CompositeHealthIndicator(
-				this.healthAggregator);
+		CompositeHealthIndicator composite = new CompositeHealthIndicator(this.healthAggregator);
 		for (Map.Entry<String, S> entry : beans.entrySet()) {
-			composite.addHealthIndicator(entry.getKey(),
-					createHealthIndicator(entry.getValue()));
+			composite.addHealthIndicator(entry.getKey(), createHealthIndicator(entry.getValue()));
 		}
 		return composite;
 	}
 
 	@SuppressWarnings("unchecked")
 	protected H createHealthIndicator(S source) {
-		Class<?>[] generics = ResolvableType
-				.forClass(CompositeHealthIndicatorConfiguration.class, getClass())
+		Class<?>[] generics = ResolvableType.forClass(CompositeHealthIndicatorConfiguration.class, getClass())
 				.resolveGenerics();
 		Class<H> indicatorClass = (Class<H>) generics[0];
 		Class<S> sourceClass = (Class<S>) generics[1];
 		try {
 			return indicatorClass.getConstructor(sourceClass).newInstance(source);
 		}
 		catch (Exception ex) {
-			throw new IllegalStateException("Unable to create indicator " + indicatorClass
-					+ " for source " + sourceClass, ex);
+			throw new IllegalStateException(
+					"Unable to create indicator " + indicatorClass + " for source " + sourceClass, ex);
 		}
 	}