Commit 4e96587d authored by Phillip Webb's avatar Phillip Webb

Polish modifier declaration ordering

Follow that Java language specification.
parent 64930d4e
...@@ -338,7 +338,7 @@ public class EndpointWebMvcChildContextConfiguration { ...@@ -338,7 +338,7 @@ public class EndpointWebMvcChildContextConfiguration {
} }
static abstract class AccessLogCustomizer<T extends EmbeddedServletContainerFactory> abstract static class AccessLogCustomizer<T extends EmbeddedServletContainerFactory>
implements EmbeddedServletContainerCustomizer, Ordered { implements EmbeddedServletContainerCustomizer, Ordered {
private final Class<T> factoryClass; private final Class<T> factoryClass;
......
...@@ -190,7 +190,7 @@ public class ShellProperties { ...@@ -190,7 +190,7 @@ public class ShellProperties {
/** /**
* Base class for CRaSH properties. * Base class for CRaSH properties.
*/ */
public static abstract class CrshShellProperties { public abstract static class CrshShellProperties {
/** /**
* Apply the properties to a CRaSH configuration. * Apply the properties to a CRaSH configuration.
...@@ -203,7 +203,7 @@ public class ShellProperties { ...@@ -203,7 +203,7 @@ public class ShellProperties {
/** /**
* Base class for Auth specific properties. * Base class for Auth specific properties.
*/ */
public static abstract class CrshShellAuthenticationProperties public abstract static class CrshShellAuthenticationProperties
extends CrshShellProperties { extends CrshShellProperties {
} }
......
...@@ -199,7 +199,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService { ...@@ -199,7 +199,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService {
/** /**
* Simple {@link Gauge} implementation to {@literal double} value. * Simple {@link Gauge} implementation to {@literal double} value.
*/ */
private final static class SimpleGauge implements Gauge<Double> { private static final class SimpleGauge implements Gauge<Double> {
private volatile double value; private volatile double value;
...@@ -221,7 +221,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService { ...@@ -221,7 +221,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService {
/** /**
* Strategy used to register metrics. * Strategy used to register metrics.
*/ */
private static abstract class MetricRegistrar<T extends Metric> { private abstract static class MetricRegistrar<T extends Metric> {
private final Class<T> type; private final Class<T> type;
......
...@@ -100,7 +100,7 @@ public class ConfigurationPropertiesReportEndpointProxyTests { ...@@ -100,7 +100,7 @@ public class ConfigurationPropertiesReportEndpointProxyTests {
} }
public static abstract class AbstractExecutor implements Executor { public abstract static class AbstractExecutor implements Executor {
} }
......
...@@ -110,7 +110,7 @@ public class HalBrowserMvcEndpointVanillaIntegrationTests { ...@@ -110,7 +110,7 @@ public class HalBrowserMvcEndpointVanillaIntegrationTests {
if ("/actuator".equals(path)) { if ("/actuator".equals(path)) {
continue; continue;
} }
path = path.startsWith("/") ? path.substring(1) : path; path = (path.startsWith("/") ? path.substring(1) : path);
this.mockMvc.perform(get("/actuator").accept(MediaType.APPLICATION_JSON)) this.mockMvc.perform(get("/actuator").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$._links.%s.href", path).exists()); .andExpect(jsonPath("$._links.%s.href", path).exists());
...@@ -126,7 +126,7 @@ public class HalBrowserMvcEndpointVanillaIntegrationTests { ...@@ -126,7 +126,7 @@ public class HalBrowserMvcEndpointVanillaIntegrationTests {
if (collections.contains(path)) { if (collections.contains(path)) {
continue; continue;
} }
path = path.length() > 0 ? path : "/"; path = (path.length() > 0 ? path : "/");
this.mockMvc.perform(get(path).accept(MediaType.APPLICATION_JSON)) this.mockMvc.perform(get(path).accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()).andExpect(jsonPath("$._links.self.href") .andExpect(status().isOk()).andExpect(jsonPath("$._links.self.href")
.value("http://localhost" + endpoint.getPath())); .value("http://localhost" + endpoint.getPath()));
......
...@@ -164,7 +164,7 @@ public class ElasticsearchHealthIndicatorTests { ...@@ -164,7 +164,7 @@ public class ElasticsearchHealthIndicatorTests {
assertThat((T) details.get(detail)).isEqualTo(value); assertThat((T) details.get(detail)).isEqualTo(value);
} }
private final static class StubClusterHealthResponse extends ClusterHealthResponse { private static final class StubClusterHealthResponse extends ClusterHealthResponse {
private final ClusterHealthStatus status; private final ClusterHealthStatus status;
......
...@@ -142,7 +142,7 @@ public abstract class AutoConfigurationPackages { ...@@ -142,7 +142,7 @@ public abstract class AutoConfigurationPackages {
/** /**
* Wrapper for a package import. * Wrapper for a package import.
*/ */
private final static class PackageImport { private static final class PackageImport {
private final String packageName; private final String packageName;
......
...@@ -228,7 +228,7 @@ public class EmbeddedMongoAutoConfiguration { ...@@ -228,7 +228,7 @@ public class EmbeddedMongoAutoConfiguration {
* A workaround for the lack of a {@code toString} implementation on * A workaround for the lack of a {@code toString} implementation on
* {@code GenericFeatureAwareVersion}. * {@code GenericFeatureAwareVersion}.
*/ */
private final static class ToStringFriendlyFeatureAwareVersion private static final class ToStringFriendlyFeatureAwareVersion
implements IFeatureAwareVersion { implements IFeatureAwareVersion {
private final String version; private final String version;
......
...@@ -77,7 +77,7 @@ public abstract class PathBasedTemplateAvailabilityProvider ...@@ -77,7 +77,7 @@ public abstract class PathBasedTemplateAvailabilityProvider
return false; return false;
} }
protected static abstract class TemplateAvailabilityProperties { protected abstract static class TemplateAvailabilityProperties {
private String prefix; private String prefix;
......
...@@ -1149,7 +1149,7 @@ public class CacheAutoConfigurationTests { ...@@ -1149,7 +1149,7 @@ public class CacheAutoConfigurationTests {
} }
static abstract class CacheManagerTestCustomizer<T extends CacheManager> abstract static class CacheManagerTestCustomizer<T extends CacheManager>
implements CacheManagerCustomizer<T> { implements CacheManagerCustomizer<T> {
private T cacheManager; private T cacheManager;
......
...@@ -317,7 +317,7 @@ public class ArtemisAutoConfigurationTests { ...@@ -317,7 +317,7 @@ public class ArtemisAutoConfigurationTests {
return applicationContext; return applicationContext;
} }
private final static class DestinationChecker { private static final class DestinationChecker {
private final JmsTemplate jmsTemplate; private final JmsTemplate jmsTemplate;
......
...@@ -64,7 +64,7 @@ public class TestableInitialContextFactory implements InitialContextFactory { ...@@ -64,7 +64,7 @@ public class TestableInitialContextFactory implements InitialContextFactory {
return context; return context;
} }
private final static class TestableContext extends InitialContext { private static final class TestableContext extends InitialContext {
private final Map<String, Object> bindings = new HashMap<String, Object>(); private final Map<String, Object> bindings = new HashMap<String, Object>();
......
...@@ -227,7 +227,7 @@ class InitializrServiceMetadata { ...@@ -227,7 +227,7 @@ class InitializrServiceMetadata {
return result; return result;
} }
private final static class MetadataHolder<K, T> { private static final class MetadataHolder<K, T> {
private final Map<K, T> content; private final Map<K, T> content;
......
...@@ -43,7 +43,7 @@ class Connection { ...@@ -43,7 +43,7 @@ class Connection {
private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern
.compile("^Sec-WebSocket-Key:(.*)$", Pattern.MULTILINE); .compile("^Sec-WebSocket-Key:(.*)$", Pattern.MULTILINE);
public final static String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; public static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
private final Socket socket; private final Socket socket;
......
...@@ -606,7 +606,7 @@ public class Restarter { ...@@ -606,7 +606,7 @@ public class Restarter {
* Set the restarter instance (useful for testing). * Set the restarter instance (useful for testing).
* @param instance the instance to set * @param instance the instance to set
*/ */
final static void setInstance(Restarter instance) { static final void setInstance(Restarter instance) {
synchronized (INSTANCE_MONITOR) { synchronized (INSTANCE_MONITOR) {
Restarter.instance = instance; Restarter.instance = instance;
} }
......
...@@ -91,9 +91,9 @@ public class RestartClassLoader extends URLClassLoader implements SmartClassLoad ...@@ -91,9 +91,9 @@ public class RestartClassLoader extends URLClassLoader implements SmartClassLoad
} }
Method classLoadingLockMethod = ReflectionUtils.findMethod(ClassLoader.class, Method classLoadingLockMethod = ReflectionUtils.findMethod(ClassLoader.class,
"getClassLoadingLock", String.class); "getClassLoadingLock", String.class);
this.classLoadingLockSupplier = classLoadingLockMethod != null this.classLoadingLockSupplier = (classLoadingLockMethod != null
? new StandardClassLoadingLockSupplier() ? new StandardClassLoadingLockSupplier()
: new Java6ClassLoadingLockSupplier(); : new Java6ClassLoadingLockSupplier());
} }
@Override @Override
......
...@@ -45,7 +45,7 @@ public class HttpTunnelPayload { ...@@ -45,7 +45,7 @@ public class HttpTunnelPayload {
private static final int BUFFER_SIZE = 1024 * 100; private static final int BUFFER_SIZE = 1024 * 100;
final protected static char[] HEX_CHARS = "0123456789ABCDEF".toCharArray(); protected static final char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
private static final Log logger = LogFactory.getLog(HttpTunnelPayload.class); private static final Log logger = LogFactory.getLog(HttpTunnelPayload.class);
......
...@@ -76,7 +76,7 @@ public class SilentExitExceptionHandlerTests { ...@@ -76,7 +76,7 @@ public class SilentExitExceptionHandlerTests {
} }
private static abstract class TestThread extends Thread { private abstract static class TestThread extends Thread {
private Throwable thrown; private Throwable thrown;
......
...@@ -356,7 +356,7 @@ public abstract class AbstractJsonMarshalTester<T> { ...@@ -356,7 +356,7 @@ public abstract class AbstractJsonMarshalTester<T> {
* *
* @param <M> The marshaller type * @param <M> The marshaller type
*/ */
protected static abstract class FieldInitializer<M> { protected abstract static class FieldInitializer<M> {
private final Class<?> testerClass; private final Class<?> testerClass;
......
...@@ -66,7 +66,7 @@ public class GsonTesterTests extends AbstractJsonMarshalTesterTests { ...@@ -66,7 +66,7 @@ public class GsonTesterTests extends AbstractJsonMarshalTesterTests {
new GsonBuilder().create()); new GsonBuilder().create());
} }
static abstract class InitFieldsBaseClass { abstract static class InitFieldsBaseClass {
public GsonTester<ExampleObject> base; public GsonTester<ExampleObject> base;
......
...@@ -64,7 +64,7 @@ public class JacksonTesterTests extends AbstractJsonMarshalTesterTests { ...@@ -64,7 +64,7 @@ public class JacksonTesterTests extends AbstractJsonMarshalTesterTests {
return new JacksonTester<Object>(resourceLoadClass, type, new ObjectMapper()); return new JacksonTester<Object>(resourceLoadClass, type, new ObjectMapper());
} }
static abstract class InitFieldsBaseClass { abstract static class InitFieldsBaseClass {
public JacksonTester<ExampleObject> base; public JacksonTester<ExampleObject> base;
......
...@@ -72,7 +72,7 @@ public class ConfigurationWarningsApplicationContextInitializer ...@@ -72,7 +72,7 @@ public class ConfigurationWarningsApplicationContextInitializer
/** /**
* {@link BeanDefinitionRegistryPostProcessor} to report warnings. * {@link BeanDefinitionRegistryPostProcessor} to report warnings.
*/ */
protected final static class ConfigurationWarningsPostProcessor protected static final class ConfigurationWarningsPostProcessor
implements PriorityOrdered, BeanDefinitionRegistryPostProcessor { implements PriorityOrdered, BeanDefinitionRegistryPostProcessor {
private Check[] checks; private Check[] checks;
......
...@@ -354,7 +354,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine ...@@ -354,7 +354,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
/** /**
* An active Undertow port. * An active Undertow port.
*/ */
private final static class Port { private static final class Port {
private final int number; private final int number;
......
...@@ -642,7 +642,7 @@ public class RestTemplateBuilder { ...@@ -642,7 +642,7 @@ public class RestTemplateBuilder {
/** /**
* {@link RequestFactoryCustomizer} to call a "set timeout" method. * {@link RequestFactoryCustomizer} to call a "set timeout" method.
*/ */
private static abstract class TimeoutRequestFactoryCustomizer private abstract static class TimeoutRequestFactoryCustomizer
implements RequestFactoryCustomizer { implements RequestFactoryCustomizer {
private final int timeout; private final int timeout;
......
...@@ -131,7 +131,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher { ...@@ -131,7 +131,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
/** /**
* Base class for profile matchers. * Base class for profile matchers.
*/ */
private static abstract class ProfilesMatcher { private abstract static class ProfilesMatcher {
public final MatchStatus matches(Set<String> profiles) { public final MatchStatus matches(Set<String> profiles) {
if (CollectionUtils.isEmpty(profiles)) { if (CollectionUtils.isEmpty(profiles)) {
......
...@@ -109,7 +109,7 @@ public class JsonComponentModuleTests { ...@@ -109,7 +109,7 @@ public class JsonComponentModuleTests {
@JsonComponent @JsonComponent
static class ComponentWithInnerAbstractClass { static class ComponentWithInnerAbstractClass {
private static abstract class AbstractSerializer private abstract static class AbstractSerializer
extends NameAndAgeJsonComponent.Serializer { extends NameAndAgeJsonComponent.Serializer {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment