Apply formatting and cleanup rules

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

@@ -33,8 +33,8 @@ import org.springframework.http.HttpStatus;
 public class HealthMvcEndpointProperties {
 
 	/**
-	 * Mapping of health statuses to HttpStatus codes. By default, registered
-	 * health statuses map to sensible defaults (i.e. UP maps to 200).
+	 * Mapping of health statuses to HttpStatus codes. By default, registered health
+	 * statuses map to sensible defaults (i.e. UP maps to 200).
 	 */
 	private Map<String, HttpStatus> mapping = new HashMap<String, HttpStatus>();
 

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

@@ -31,8 +31,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class JolokiaProperties {
 
 	/**
-	 * Jolokia settings. These are traditionally set using servlet parameters, refer
-	 * to the documentation of Jolokia for more details.
+	 * Jolokia settings. These are traditionally set using servlet parameters, refer to
+	 * the documentation of Jolokia for more details.
 	 */
 	private Map<String, String> config = new HashMap<String, String>();
 

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

@@ -43,8 +43,8 @@ public class ShellProperties {
 
 	/**
 	 * Authentication type (can be "simple", "spring", "key" or "jaas"). Auto-detected
-	 * according to the environment (i.e. if Spring Security is available, "spring" is used by
-	 * default).
+	 * according to the environment (i.e. if Spring Security is available, "spring" is
+	 * used by default).
 	 */
 	private String auth = "simple";
 
@@ -75,8 +75,8 @@ public class ShellProperties {
 	private String[] disabledCommands = new String[] { "jpa*", "jdbc*", "jndi*" };
 
 	/**
-	 * Comma-separated list of plugins to disable. Certain plugins are disabled
-	 * by default based on the environment.
+	 * Comma-separated list of plugins to disable. Certain plugins are disabled by default
+	 * based on the environment.
 	 */
 	private String[] disabledPlugins = new String[0];
 
@@ -287,7 +287,8 @@ public class ShellProperties {
 	public static class Telnet extends CrshShellProperties {
 
 		/**
-		 * Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is available.
+		 * Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is
+		 * available.
 		 */
 		private boolean enabled = ClassUtils.isPresent("org.crsh.telnet.TelnetPlugin",
 				ClassUtils.getDefaultClassLoader());

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java

@@ -28,8 +28,8 @@ import javax.validation.constraints.Pattern;
 public abstract class AbstractEndpoint<T> implements Endpoint<T> {
 
 	/**
-	 * Endpoint identifier. With HTTP monitoring the identifier
-	 * of the endpoint is mapped to a URL (e.g. 'foo' is mapped to '/foo').
+	 * Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped
+	 * to a URL (e.g. 'foo' is mapped to '/foo').
 	 */
 	@NotNull
 	@Pattern(regexp = "\\w+", message = "ID must only contains letters, numbers and '_'")

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java

@@ -38,8 +38,8 @@ class Sanitizer {
 	}
 
 	/**
-	 * Keys that should be sanitized. Keys can be simple strings that the property
-	 * ends with or regex expressions.
+	 * Keys that should be sanitized. Keys can be simple strings that the property ends
+	 * with or regex expressions.
 	 * @param keysToSanitize the keys to sanitize
 	 */
 	public void setKeysToSanitize(String... keysToSanitize) {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java

@@ -46,7 +46,7 @@ import com.codahale.metrics.Timer;
  * {@link MetricRegistry}. Gauges and Counters are reflected as a single value. Timers,
  * Meters and Histograms are expanded into sets of metrics containing all the properties
  * of type Number.
- * 
+ *
  * @author Dave Syer
  *
  */
@@ -121,6 +121,7 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 		remove(name);
 	}
 
+	@Override
 	public void onCounterAdded(String name, Counter counter) {
 		names.put(name, name);
 		reverse.add(name, name);
@@ -209,10 +210,11 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 			String name = iterator.next();
 			return MetricRegistryMetricReader.this.findOne(name);
 		}
-		
+
 		@Override
 		public void remove() {
-			throw new UnsupportedOperationException("You cannot remove from this iterator.");
+			throw new UnsupportedOperationException(
+					"You cannot remove from this iterator.");
 		}
 
 	}