Remove superfluous semi-colons

pull/2250/head
Phillip Webb 10 years ago
parent fe20116b68
commit d7a12a8791

@ -229,7 +229,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
throw ex; throw ex;
} }
} }
}; }
/** /**
* Add an alias for 'local.management.port' that actually resolves using * Add an alias for 'local.management.port' that actually resolves using
@ -298,7 +298,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
DISABLE, SAME, DIFFERENT; DISABLE, SAME, DIFFERENT;
public static ManagementServerPort get(BeanFactory beanFactory) { public static ManagementServerPort get(BeanFactory beanFactory) {
ServerProperties serverProperties; ServerProperties serverProperties;
try { try {
serverProperties = beanFactory.getBean(ServerProperties.class); serverProperties = beanFactory.getBean(ServerProperties.class);
@ -306,7 +305,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
catch (NoSuchBeanDefinitionException ex) { catch (NoSuchBeanDefinitionException ex) {
serverProperties = new ServerProperties(); serverProperties = new ServerProperties();
} }
ManagementServerProperties managementServerProperties; ManagementServerProperties managementServerProperties;
try { try {
managementServerProperties = beanFactory managementServerProperties = beanFactory
@ -315,7 +313,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
catch (NoSuchBeanDefinitionException ex) { catch (NoSuchBeanDefinitionException ex) {
managementServerProperties = new ManagementServerProperties(); managementServerProperties = new ManagementServerProperties();
} }
Integer port = managementServerProperties.getPort(); Integer port = managementServerProperties.getPort();
if (port != null && port < 0) { if (port != null && port < 0) {
return DISABLE; return DISABLE;
@ -329,5 +326,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
|| (port != 0 && port.equals(serverProperties.getPort())) ? SAME || (port != 0 && port.equals(serverProperties.getPort())) ? SAME
: DIFFERENT); : DIFFERENT);
} }
};
}
} }

@ -197,7 +197,7 @@ public class MessageSourceAutoConfiguration {
if (classLoader != ROOT_CLASSLOADER) { if (classLoader != ROOT_CLASSLOADER) {
super.addAllClassLoaderJarRoots(classLoader, result); super.addAllClassLoaderJarRoots(classLoader, result);
} }
}; }
@Override @Override
protected Set<Resource> doFindAllClassPathResources(String path) protected Set<Resource> doFindAllClassPathResources(String path)

@ -65,7 +65,7 @@ public @interface ConditionalOnJava {
/** /**
* Older than the specified {@link JavaVersion}. * Older than the specified {@link JavaVersion}.
*/ */
OLDER_THAN; OLDER_THAN
} }
@ -138,5 +138,7 @@ public @interface ConditionalOnJava {
} }
return SIX; return SIX;
} }
} }
} }

@ -126,6 +126,6 @@ class OnClassCondition extends SpringBootCondition {
public abstract boolean matches(String className, ConditionContext context); public abstract boolean matches(String className, ConditionContext context);
}; }
} }

@ -36,6 +36,6 @@ public enum SearchStrategy {
/** /**
* Search the entire hierarchy * Search the entire hierarchy
*/ */
ALL; ALL
} }

@ -67,7 +67,7 @@ public class JerseyProperties {
} }
public enum Type { public enum Type {
SERVLET, FILTER; SERVLET, FILTER
} }
public static class Filter { public static class Filter {

@ -154,7 +154,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
} }
return ConditionOutcome.match("No error template view detected"); return ConditionOutcome.match("No error template view detected");
}; }
} }

@ -227,7 +227,7 @@ public class RepackageTask extends DefaultTask {
+ "'springBoot.mainClass'"); + "'springBoot.mainClass'");
} }
} }
}; }
} }
void setOutputFile(File file) { void setOutputFile(File file) {

@ -29,40 +29,48 @@ public interface LibraryScope {
* The library is used at compile time and runtime. * The library is used at compile time and runtime.
*/ */
public static final LibraryScope COMPILE = new LibraryScope() { public static final LibraryScope COMPILE = new LibraryScope() {
@Override @Override
public String toString() { public String toString() {
return "compile"; return "compile";
}; }
}; };
/** /**
* The library is used at runtime but not needed for compile. * The library is used at runtime but not needed for compile.
*/ */
public static final LibraryScope RUNTIME = new LibraryScope() { public static final LibraryScope RUNTIME = new LibraryScope() {
@Override @Override
public String toString() { public String toString() {
return "runtime"; return "runtime";
}; }
}; };
/** /**
* The library is needed for compile but is usually provided when running. * The library is needed for compile but is usually provided when running.
*/ */
public static final LibraryScope PROVIDED = new LibraryScope() { public static final LibraryScope PROVIDED = new LibraryScope() {
@Override @Override
public String toString() { public String toString() {
return "provided"; return "provided";
}; }
}; };
/** /**
* Marker for custom scope when custom configuration is used. * Marker for custom scope when custom configuration is used.
*/ */
public static final LibraryScope CUSTOM = new LibraryScope() { public static final LibraryScope CUSTOM = new LibraryScope() {
@Override @Override
public String toString() { public String toString() {
return "custom"; return "custom";
}; }
}; };
} }

@ -128,6 +128,7 @@ public class RunProcess {
final BufferedReader reader = new BufferedReader(new InputStreamReader( final BufferedReader reader = new BufferedReader(new InputStreamReader(
process.getInputStream())); process.getInputStream()));
new Thread() { new Thread() {
@Override @Override
public void run() { public void run() {
try { try {
@ -141,7 +142,8 @@ public class RunProcess {
} }
catch (Exception ex) { catch (Exception ex) {
} }
}; }
}.start(); }.start();
} }

@ -147,6 +147,6 @@ public abstract class AnsiOutput {
*/ */
NEVER NEVER
}; }
} }

@ -97,7 +97,7 @@ public class VcapApplicationListener implements
private static final String VCAP_SERVICES = "VCAP_SERVICES"; private static final String VCAP_SERVICES = "VCAP_SERVICES";
// Before ConfigFileApplicationListener so values there can use these ones // Before ConfigFileApplicationListener so values there can use these ones
private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1;; private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1;
private final JsonParser parser = JsonParserFactory.getJsonParser(); private final JsonParser parser = JsonParserFactory.getJsonParser();

@ -76,4 +76,4 @@ public class FileEncodingApplicationListener implements
} }
} }
}; }

@ -128,7 +128,7 @@ public class ConfigFileApplicationListener implements
if (event instanceof ApplicationPreparedEvent) { if (event instanceof ApplicationPreparedEvent) {
onApplicationPreparedEvent((ApplicationPreparedEvent) event); onApplicationPreparedEvent((ApplicationPreparedEvent) event);
} }
}; }
private void onApplicationEnvironmentPreparedEvent( private void onApplicationEnvironmentPreparedEvent(
ApplicationEnvironmentPreparedEvent event) { ApplicationEnvironmentPreparedEvent event) {

@ -196,7 +196,7 @@ public class Ssl {
} }
public enum ClientAuth { public enum ClientAuth {
WANT, NEED; WANT, NEED
} }
} }

@ -133,10 +133,12 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer
private void startDaemonAwaitThread() { private void startDaemonAwaitThread() {
Thread awaitThread = new Thread("container-" + (containerCounter.get())) { Thread awaitThread = new Thread("container-" + (containerCounter.get())) {
@Override @Override
public void run() { public void run() {
TomcatEmbeddedServletContainer.this.tomcat.getServer().await(); TomcatEmbeddedServletContainer.this.tomcat.getServer().await();
}; }
}; };
awaitThread.setDaemon(false); awaitThread.setDaemon(false);
awaitThread.start(); awaitThread.start();

@ -67,25 +67,25 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
@Override @Override
public Result filter(LogEvent event) { public Result filter(LogEvent event) {
return Result.DENY; return Result.DENY;
}; }
@Override @Override
public Result filter(Logger logger, Level level, Marker marker, Message msg, public Result filter(Logger logger, Level level, Marker marker, Message msg,
Throwable t) { Throwable t) {
return Result.DENY; return Result.DENY;
}; }
@Override @Override
public Result filter(Logger logger, Level level, Marker marker, Object msg, public Result filter(Logger logger, Level level, Marker marker, Object msg,
Throwable t) { Throwable t) {
return Result.DENY; return Result.DENY;
}; }
@Override @Override
public Result filter(Logger logger, Level level, Marker marker, String msg, public Result filter(Logger logger, Level level, Marker marker, String msg,
Object... params) { Object... params) {
return Result.DENY; return Result.DENY;
}; }
}; };

Loading…
Cancel
Save