This commit is contained in:
Stephane Nicoll
2015-07-24 07:19:53 +02:00
parent d6e914be87
commit 42e230192f
50 changed files with 100 additions and 104 deletions

View File

@@ -42,12 +42,12 @@ public @interface ConditionalOnEnabledEndpoint {
* The name of the endpoint.
* @return The name of the endpoint
*/
public String value();
String value();
/**
* Returns whether or not the endpoint is enabled by default.
* @return {@code true} if the endpoint is enabled by default, otherwise {@code false}
*/
public boolean enabledByDefault() default true;
boolean enabledByDefault() default true;
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2015 the original author or authors.
* Copyright 2012-2015 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.
@@ -30,7 +30,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.boot.actuate.endpoint.Endpoint;
import org.springframework.boot.actuate.endpoint.ShutdownEndpoint;
@@ -60,7 +59,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author Andy Wilkinson
*/
public class EndpointMBeanExporter extends MBeanExporter implements SmartLifecycle,
BeanFactoryAware, ApplicationContextAware {
ApplicationContextAware {
public static final String DEFAULT_DOMAIN = "org.springframework.boot";

View File

@@ -25,7 +25,6 @@ import java.util.Set;
import org.springframework.boot.actuate.endpoint.Endpoint;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.cors.CorsConfiguration;
@@ -49,8 +48,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
* @author Christian Dupuis
* @author Dave Syer
*/
public class EndpointHandlerMapping extends RequestMappingHandlerMapping implements
ApplicationContextAware {
public class EndpointHandlerMapping extends RequestMappingHandlerMapping {
private final Set<MvcEndpoint> endpoints;

View File

@@ -66,7 +66,7 @@ abstract class NamePatternFilter<T> {
protected abstract Object getValue(T source, String name);
protected static interface NameCallback {
protected interface NameCallback {
void addName(String name);

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.concurrent.ConcurrentNavigableMap;
import org.springframework.boot.actuate.metrics.Metric;
import org.springframework.boot.actuate.metrics.reader.PrefixMetricReader;
import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository;
import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository.Callback;
import org.springframework.boot.actuate.metrics.writer.Delta;
@@ -34,8 +33,7 @@ import org.springframework.boot.actuate.metrics.writer.Delta;
*
* @author Dave Syer
*/
public class InMemoryMetricRepository implements MetricRepository, MultiMetricRepository,
PrefixMetricReader {
public class InMemoryMetricRepository implements MetricRepository, MultiMetricRepository {
private final SimpleInMemoryRepository<Metric<?>> metrics = new SimpleInMemoryRepository<Metric<?>>();

View File

@@ -36,7 +36,7 @@ public class SimpleInMemoryRepository<T> {
private final ConcurrentMap<String, Object> locks = new ConcurrentReferenceHashMap<String, Object>();
public static interface Callback<T> {
public interface Callback<T> {
T modify(T current);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 the original author or authors.
* Copyright 2012-2015 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.
@@ -189,7 +189,7 @@ public class ApplicationPidFileWriter implements
/**
* Provides access to a property value.
*/
private static interface Property {
private interface Property {
String getValue(SpringApplicationEvent event);

View File

@@ -110,7 +110,7 @@ public class EndpointMvcIntegrationTests {
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
JacksonAutoConfiguration.class, ErrorMvcAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -94,9 +94,9 @@ public class ConfigurationPropertiesReportEndpointProxyTests {
}
public static interface Executor {
public interface Executor {
public void execute();
void execute();
}