Commit a03ddd33 authored by Andy Wilkinson's avatar Andy Wilkinson

Polishing

parent bddf9232
......@@ -202,8 +202,7 @@ public class CacheProperties {
*/
private Resource config;
@DeprecatedConfigurationProperty(replacement = "spring.hazelcast.config",
reason = "Use general hazelcast auto-configuration instead.")
@DeprecatedConfigurationProperty(replacement = "spring.hazelcast.config", reason = "Use general hazelcast auto-configuration instead.")
@Deprecated
public Resource getConfig() {
return this.config;
......
......@@ -59,7 +59,7 @@ public class JooqExceptionTranslatorTests {
new Object[] { SQLDialect.POSTGRES_9_3, sqlException("03000") },
new Object[] { SQLDialect.POSTGRES_9_4, sqlException("03000") },
new Object[] { SQLDialect.POSTGRES_9_5, sqlException("03000") },
new Object[] { SQLDialect.SQLITE, sqlException("21000") }};
new Object[] { SQLDialect.SQLITE, sqlException("21000") } };
}
private static SQLException sqlException(String sqlState) {
......
......@@ -54,8 +54,7 @@ public class WebMvcValidatorTests {
@Test
public void wrapLocalValidatorFactoryBean() {
WebMvcValidator wrapper = load(
LocalValidatorFactoryBeanConfig.class);
WebMvcValidator wrapper = load(LocalValidatorFactoryBeanConfig.class);
assertThat(wrapper.supports(SampleData.class)).isTrue();
MapBindingResult errors = new MapBindingResult(new HashMap<String, Object>(),
"test");
......
......@@ -102,7 +102,8 @@ public final class LoggerConfiguration {
rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name);
rtn = rtn && ObjectUtils.nullSafeEquals(this.configuredLevel,
other.configuredLevel);
rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel);
rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel,
other.effectiveLevel);
return rtn;
}
return super.equals(obj);
......
......@@ -263,11 +263,11 @@ public class UndertowEmbeddedServletContainerFactoryTests
}
private ServletContainer getServletContainerFromNewFactory() {
UndertowEmbeddedServletContainer container = (UndertowEmbeddedServletContainer)
getFactory().getEmbeddedServletContainer();
UndertowEmbeddedServletContainer container = (UndertowEmbeddedServletContainer) getFactory()
.getEmbeddedServletContainer();
try {
return ((DeploymentManager) ReflectionTestUtils.getField(container, "manager"))
.getDeployment().getServletContainer();
return ((DeploymentManager) ReflectionTestUtils.getField(container,
"manager")).getDeployment().getServletContainer();
}
finally {
container.stop();
......
......@@ -75,8 +75,7 @@ public class AtomikosPropertiesTests {
assertThat(properties).contains(defaultOf(defaultSettings,
"com.atomikos.icatch.max_timeout",
"com.atomikos.icatch.default_jta_timeout",
"com.atomikos.icatch.max_actives",
"com.atomikos.icatch.enable_logging",
"com.atomikos.icatch.max_actives", "com.atomikos.icatch.enable_logging",
"com.atomikos.icatch.serial_jta_transactions",
"com.atomikos.icatch.force_shutdown_on_vm_exit",
"com.atomikos.icatch.log_base_name",
......@@ -96,7 +95,8 @@ public class AtomikosPropertiesTests {
private Properties loadDefaultSettings() {
try {
Class<?> target = ClassUtils.forName("com.atomikos.icatch.standalone.UserTransactionServiceImp",
Class<?> target = ClassUtils.forName(
"com.atomikos.icatch.standalone.UserTransactionServiceImp",
getClass().getClassLoader());
Method m = target.getMethod("getDefaultProperties");
m.setAccessible(true);
......
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