Polish formatting

This commit is contained in:
Phillip Webb
2016-12-19 10:30:48 -08:00
parent e578ace7d7
commit bd74c3d327
346 changed files with 578 additions and 53 deletions

View File

@@ -95,6 +95,7 @@ public class CacheStatisticsAutoConfiguration {
public HazelcastCacheStatisticsProvider hazelcastCacheStatisticsProvider() {
return new HazelcastCacheStatisticsProvider();
}
}
@Configuration

View File

@@ -429,6 +429,7 @@ public class CrshAutoConfiguration {
}
return true;
}
}
/**
@@ -540,6 +541,7 @@ public class CrshAutoConfiguration {
}
return false;
}
}
/**

View File

@@ -83,4 +83,5 @@ public class EndpointMBeanExportProperties {
public void setStaticNames(String[] staticNames) {
this.staticNames = StringUtils.splitArrayElementsIntoProperties(staticNames, "=");
}
}

View File

@@ -266,6 +266,7 @@ public class EndpointWebMvcAutoConfiguration
@Conditional(OnManagementMvcCondition.class)
@Import(ManagementContextConfigurationsImportSelector.class)
protected static class EndpointWebMvcConfiguration {
}
/**

View File

@@ -43,4 +43,5 @@ public class JolokiaProperties {
public void setConfig(Map<String, String> config) {
this.config = config;
}
}

View File

@@ -211,6 +211,7 @@ public class ManagementWebSecurityAutoConfiguration {
@Conditional(WebSecurityEnablerCondition.class)
@EnableWebSecurity
protected static class WebSecurityEnabler extends AuthenticationManagerConfiguration {
}
/**

View File

@@ -73,7 +73,6 @@ import org.springframework.messaging.MessageChannel;
* @see MetricWriter
* @see InMemoryMetricRepository
* @see Exporter
*
* @author Dave Syer
*/
@Configuration
@@ -140,6 +139,7 @@ public class MetricRepositoryAutoConfiguration {
public BufferGaugeService gaugeService(GaugeBuffers writer) {
return new BufferGaugeService(writer);
}
}
@Configuration

View File

@@ -145,7 +145,8 @@ final class MetricsFilter extends OncePerRequestFilter {
suffix);
}
private String determineMetricNameSuffix(HttpServletRequest request, String path, int status) {
private String determineMetricNameSuffix(HttpServletRequest request, String path,
int status) {
Object bestMatchingPattern = request
.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
if (bestMatchingPattern != null) {

View File

@@ -327,6 +327,7 @@ public class ShellProperties {
public void setAuthTimeout(Integer authTimeout) {
this.authTimeout = authTimeout;
}
}
/**

View File

@@ -146,4 +146,5 @@ public class AutoConfigurationReportEndpoint extends AbstractEndpoint<Report> {
}
}
}

View File

@@ -59,4 +59,5 @@ public class BeansEndpoint extends AbstractEndpoint<List<Object>>
public List<Object> invoke() {
return this.parser.parseList(this.liveBeansView.getSnapshotAsJson());
}
}

View File

@@ -332,6 +332,7 @@ public class ConfigurationPropertiesReportEndpoint
}
return setter;
}
}
}

View File

@@ -93,4 +93,5 @@ public class HealthEndpoint extends AbstractEndpoint<Health> {
}
return name;
}
}

View File

@@ -47,4 +47,5 @@ public class TraceEndpoint extends AbstractEndpoint<List<Trace>> {
public List<Trace> invoke() {
return this.repository.findAll();
}
}

View File

@@ -47,4 +47,5 @@ public class ShutdownEndpointMBean extends EndpointMBean {
public Object shutdown() {
return convert(getEndpoint().invoke());
}
}

View File

@@ -58,4 +58,5 @@ public class HalJsonMvcEndpoint extends AbstractMvcEndpoint {
protected final ManagementServletContext getManagementServletContext() {
return this.managementServletContext;
}
}

View File

@@ -116,6 +116,7 @@ public class JolokiaMvcEndpoint extends AbstractMvcEndpoint implements Initializ
}
return value;
}
}
}

View File

@@ -49,4 +49,5 @@ public class ShutdownMvcEndpoint extends EndpointMvcAdapter {
}
return super.invoke();
}
}

View File

@@ -50,4 +50,5 @@ public abstract class AbstractHealthIndicator implements HealthIndicator {
* system status.
*/
protected abstract void doHealthCheck(Health.Builder builder) throws Exception;
}

View File

@@ -61,4 +61,5 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator {
.withDetail("free", diskFreeInBytes)
.withDetail("threshold", this.properties.getThreshold());
}
}

View File

@@ -299,6 +299,7 @@ public final class Health {
public Health build() {
return new Health(this);
}
}
}

View File

@@ -42,4 +42,5 @@ public interface HealthAggregator {
* @return the aggregated health
*/
Health aggregate(Map<String, Health> healths);
}

View File

@@ -167,6 +167,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService {
public void setValue(double value) {
this.value = value;
}
}
}

View File

@@ -240,4 +240,5 @@ public class MetricCopyExporter extends AbstractMetricExporter {
}
};
}

View File

@@ -90,7 +90,6 @@ public class OpenTsdbGaugeWriter implements GaugeWriter {
/**
* Creates a new {@code OpenTsdbGaugeWriter} with the given millisecond
* {@code connectTimeout} and {@code readTimeout}.
*
* @param connectTimeout the connect timeout in milliseconds
* @param readTimeout the read timeout in milliseconds
*/

View File

@@ -58,7 +58,6 @@ public class RedisMetricRepository implements MetricRepository {
* Create a RedisMetricRepository with a default prefix to apply to all metric names.
* If multiple repositories share a redis instance they will feed into the same global
* metrics.
*
* @param redisConnectionFactory the redis connection factory
*/
public RedisMetricRepository(RedisConnectionFactory redisConnectionFactory) {
@@ -70,7 +69,6 @@ public class RedisMetricRepository implements MetricRepository {
* unique to this repository or to a logical repository contributed to by multiple
* instances, where they all see the same values). Recommended constructor for general
* purpose use.
*
* @param redisConnectionFactory the redis connection factory
* @param prefix the prefix to set for all metrics keys
*/
@@ -84,7 +82,6 @@ public class RedisMetricRepository implements MetricRepository {
* redis store will hold a zset under the key just so the metric names can be
* enumerated. Read operations, especially {@link #findAll()} and {@link #count()},
* will only be accurate if the key is unique to the prefix of this repository.
*
* @param redisConnectionFactory the redis connection factory
* @param prefix the prefix to set for all metrics keys
* @param key the key to set

View File

@@ -51,4 +51,5 @@ final class RedisUtils {
RedisConnectionFactory redisConnectionFactory) {
return new StringRedisTemplate(redisConnectionFactory);
}
}

View File

@@ -78,4 +78,5 @@ public class InMemoryRichGaugeRepository implements RichGaugeRepository {
public long count() {
return this.repository.count();
}
}

View File

@@ -99,6 +99,7 @@ public class SimpleInMemoryRepository<T> {
/**
* Callback used to update a value.
*
* @param <T> the value type
*/
public interface Callback<T> {

View File

@@ -101,6 +101,7 @@ public class AuditAutoConfigurationTests {
}
public static class TestAuditEventRepository extends InMemoryAuditEventRepository {
}
@Configuration

View File

@@ -528,6 +528,7 @@ public class HealthIndicatorAutoConfigurationTests {
public JestClient jestClient() {
return mock(JestClient.class);
}
}
}

View File

@@ -274,11 +274,13 @@ public class ManagementWebSecurityAutoConfigurationTests {
@EnableGlobalAuthentication
@Configuration
static class AuthenticationConfig {
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication().withUser("user").password("password")
.roles("USER");
}
}
@Configuration

View File

@@ -279,6 +279,7 @@ public class PublicMetricsAutoConfigurationTests {
public DataSource commonsDbcpDataSource() {
return InitializedBuilder.create().type(BasicDataSource.class).build();
}
}
@Configuration
@@ -295,6 +296,7 @@ public class PublicMetricsAutoConfigurationTests {
public DataSource commonsDbcpDataSource() {
return InitializedBuilder.create().type(BasicDataSource.class).build();
}
}
@Configuration
@@ -311,6 +313,7 @@ public class PublicMetricsAutoConfigurationTests {
public DataSource dataSource() {
return InitializedBuilder.create().type(BasicDataSource.class).build();
}
}
@Configuration
@@ -326,6 +329,7 @@ public class PublicMetricsAutoConfigurationTests {
}
};
}
}
@Configuration
@@ -386,4 +390,5 @@ public class PublicMetricsAutoConfigurationTests {
}
}
}

View File

@@ -266,5 +266,7 @@ public class ShellPropertiesTests {
}
};
}
}
}

View File

@@ -84,6 +84,7 @@ public class AutoConfigurationReportEndpointTests
public AutoConfigurationReportEndpoint endpoint() {
return new AutoConfigurationReportEndpoint();
}
}
}

View File

@@ -87,10 +87,12 @@ public class ConfigurationPropertiesReportEndpointParentTests {
@Configuration
@EnableConfigurationProperties
public static class Parent {
@Bean
public TestProperties testProperties() {
return new TestProperties();
}
}
@Configuration
@@ -127,6 +129,7 @@ public class ConfigurationPropertiesReportEndpointParentTests {
}
public static class OtherProperties {
}
@ConfigurationProperties(prefix = "test")
@@ -143,4 +146,5 @@ public class ConfigurationPropertiesReportEndpointParentTests {
}
}
}

View File

@@ -318,6 +318,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
}
public static class Bar {
private String name = "123456";
public String getName() {
@@ -327,6 +328,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
public void setName(String name) {
this.name = name;
}
}
}

View File

@@ -186,10 +186,12 @@ public class ConfigurationPropertiesReportEndpointTests
@Configuration
@EnableConfigurationProperties
public static class Parent {
@Bean
public TestProperties testProperties() {
return new TestProperties();
}
}
@Configuration
@@ -281,4 +283,5 @@ public class ConfigurationPropertiesReportEndpointTests
}
}
}

View File

@@ -54,4 +54,5 @@ public class DumpEndpointTests extends AbstractEndpointTests<DumpEndpoint> {
}
}
}

View File

@@ -197,4 +197,5 @@ public class EnvironmentEndpointTests extends AbstractEndpointTests<EnvironmentE
}
}
}

View File

@@ -74,5 +74,7 @@ public class HealthEndpointTests extends AbstractEndpointTests<HealthEndpoint> {
public HealthAggregator healthAggregator() {
return new OrderedHealthAggregator();
}
}
}

View File

@@ -111,4 +111,5 @@ public class MetricsEndpointTests extends AbstractEndpointTests<MetricsEndpoint>
}
}
}

View File

@@ -126,6 +126,7 @@ public class RequestMappingEndpointTests {
@Configuration
protected static class MappingConfiguration {
@Bean
@Lazy
@Scope(proxyMode = ScopedProxyMode.TARGET_CLASS)
@@ -134,5 +135,7 @@ public class RequestMappingEndpointTests {
mapping.setUrlMap(Collections.singletonMap("/foo", new Object()));
return mapping;
}
}
}

View File

@@ -102,4 +102,5 @@ public class ShutdownEndpointTests extends AbstractEndpointTests<ShutdownEndpoin
}
}
}

View File

@@ -96,9 +96,12 @@ public class ShutdownParentEndpointTests {
};
}
}
@Configuration
public static class Empty {
}
}

View File

@@ -56,5 +56,7 @@ public class TraceEndpointTests extends AbstractEndpointTests<TraceEndpoint> {
repository.add(Collections.<String, Object>singletonMap("a", "b"));
return new TraceEndpoint(repository);
}
}
}

View File

@@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class EndpointHandlerMappingTests {
private final StaticApplicationContext context = new StaticApplicationContext();
private Method method;
@Before

View File

@@ -88,14 +88,17 @@ public class JolokiaMvcEndpointContextPathTests {
EndpointWebMvcAutoConfiguration.class, JolokiaAutoConfiguration.class,
ManagementServerPropertiesAutoConfiguration.class })
public static class Config {
}
public static class ContextPathListener
implements ApplicationContextInitializer<ConfigurableApplicationContext> {
@Override
public void initialize(ConfigurableApplicationContext context) {
EnvironmentTestUtils.addEnvironment(context, "management.contextPath:/admin");
}
}
}

View File

@@ -89,6 +89,7 @@ public class MvcEndpointsTests {
public String invoke() {
return "foo";
}
}
}

View File

@@ -235,4 +235,5 @@ public class ElasticsearchHealthIndicatorTests {
}
}
}

View File

@@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class DropwizardMetricServicesTests {
private final MetricRegistry registry = new MetricRegistry();
private final DropwizardMetricServices writer = new DropwizardMetricServices(
this.registry);
@@ -89,7 +90,6 @@ public class DropwizardMetricServicesTests {
* thread is updating the same set of metrics. This would be an example case of the
* writer being used with the MetricsFilter handling several requests/sec to the same
* URL.
*
* @throws Exception if an error occurs
*/
@Test

View File

@@ -53,10 +53,12 @@ public class SpringIntegrationMetricReaderTests {
@Configuration
@Import({ JmxAutoConfiguration.class, IntegrationAutoConfiguration.class })
protected static class TestConfiguration {
@Bean
public SpringIntegrationMetricReader reader(IntegrationMBeanExporter exporter) {
return new SpringIntegrationMetricReader(exporter);
}
}
}

View File

@@ -32,9 +32,12 @@ import static org.assertj.core.api.Assertions.assertThat;
public class MultiMetricRichGaugeReaderTests {
private InMemoryMetricRepository repository = new InMemoryMetricRepository();
private MultiMetricRichGaugeReader reader = new MultiMetricRichGaugeReader(
this.repository);
private InMemoryRichGaugeRepository data = new InMemoryRichGaugeRepository();
private RichGaugeExporter exporter = new RichGaugeExporter(this.data,
this.repository);