Skip to content

Commit 42e2301

Browse files
committed
Polish
1 parent d6e914b commit 42e2301

File tree

50 files changed

+100
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+100
-104
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/condition/ConditionalOnEnabledEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
* The name of the endpoint.
4343
* @return The name of the endpoint
4444
*/
45-
public String value();
45+
String value();
4646

4747
/**
4848
* Returns whether or not the endpoint is enabled by default.
4949
* @return {@code true} if the endpoint is enabled by default, otherwise {@code false}
5050
*/
51-
public boolean enabledByDefault() default true;
51+
boolean enabledByDefault() default true;
5252

5353
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2015 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
3030
import org.apache.commons.logging.LogFactory;
3131
import org.springframework.beans.BeansException;
3232
import org.springframework.beans.factory.BeanFactory;
33-
import org.springframework.beans.factory.BeanFactoryAware;
3433
import org.springframework.beans.factory.ListableBeanFactory;
3534
import org.springframework.boot.actuate.endpoint.Endpoint;
3635
import org.springframework.boot.actuate.endpoint.ShutdownEndpoint;
@@ -60,7 +59,7 @@
6059
* @author Andy Wilkinson
6160
*/
6261
public class EndpointMBeanExporter extends MBeanExporter implements SmartLifecycle,
63-
BeanFactoryAware, ApplicationContextAware {
62+
ApplicationContextAware {
6463

6564
public static final String DEFAULT_DOMAIN = "org.springframework.boot";
6665

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.springframework.boot.actuate.endpoint.Endpoint;
2727
import org.springframework.context.ApplicationContext;
28-
import org.springframework.context.ApplicationContextAware;
2928
import org.springframework.util.Assert;
3029
import org.springframework.util.StringUtils;
3130
import org.springframework.web.cors.CorsConfiguration;
@@ -49,8 +48,7 @@
4948
* @author Christian Dupuis
5049
* @author Dave Syer
5150
*/
52-
public class EndpointHandlerMapping extends RequestMappingHandlerMapping implements
53-
ApplicationContextAware {
51+
public class EndpointHandlerMapping extends RequestMappingHandlerMapping {
5452

5553
private final Set<MvcEndpoint> endpoints;
5654

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private boolean isRegex(String name) {
6666

6767
protected abstract Object getValue(T source, String name);
6868

69-
protected static interface NameCallback {
69+
protected interface NameCallback {
7070

7171
void addName(String name);
7272

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2014 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
2323
import java.util.concurrent.ConcurrentNavigableMap;
2424

2525
import org.springframework.boot.actuate.metrics.Metric;
26-
import org.springframework.boot.actuate.metrics.reader.PrefixMetricReader;
2726
import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository;
2827
import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository.Callback;
2928
import org.springframework.boot.actuate.metrics.writer.Delta;
@@ -34,8 +33,7 @@
3433
*
3534
* @author Dave Syer
3635
*/
37-
public class InMemoryMetricRepository implements MetricRepository, MultiMetricRepository,
38-
PrefixMetricReader {
36+
public class InMemoryMetricRepository implements MetricRepository, MultiMetricRepository {
3937

4038
private final SimpleInMemoryRepository<Metric<?>> metrics = new SimpleInMemoryRepository<Metric<?>>();
4139

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class SimpleInMemoryRepository<T> {
3636

3737
private final ConcurrentMap<String, Object> locks = new ConcurrentReferenceHashMap<String, Object>();
3838

39-
public static interface Callback<T> {
39+
public interface Callback<T> {
4040
T modify(T current);
4141
}
4242

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2015 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -189,7 +189,7 @@ static void reset() {
189189
/**
190190
* Provides access to a property value.
191191
*/
192-
private static interface Property {
192+
private interface Property {
193193

194194
String getValue(SpringApplicationEvent event);
195195

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void healthEndpointNotHidden() throws InterruptedException {
110110
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
111111
JacksonAutoConfiguration.class, ErrorMvcAutoConfiguration.class,
112112
PropertyPlaceholderAutoConfiguration.class })
113-
protected static @interface MinimalWebConfiguration {
113+
protected @interface MinimalWebConfiguration {
114114

115115
}
116116

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2014 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -94,9 +94,9 @@ public DataSource dataSource() {
9494

9595
}
9696

97-
public static interface Executor {
97+
public interface Executor {
9898

99-
public void execute();
99+
void execute();
100100

101101
}
102102

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
* classpath.
4242
* @return the classes that must be present
4343
*/
44-
public Class<?>[] value() default {};
44+
Class<?>[] value() default {};
4545

4646
/**
4747
* The classes names that must be present.
4848
* @return the class names that must be present.
4949
*/
50-
public String[] name() default {};
50+
String[] name() default {};
5151

5252
}

0 commit comments

Comments
 (0)