mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Apply eclipse formatting and cleanup rules
This commit is contained in:
parent
9cc893cd35
commit
8bf1f9567a
@ -186,11 +186,13 @@ public class ConfigurationPropertiesReportEndpoint extends
|
||||
@SuppressWarnings("unchecked")
|
||||
private Map<String, Object> sanitize(Map<String, Object> map) {
|
||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||
if (entry.getValue() instanceof Map) {
|
||||
map.put(entry.getKey(), sanitize((Map<String, Object>) entry.getValue()));
|
||||
String key = entry.getKey();
|
||||
Object value = entry.getValue();
|
||||
if (value instanceof Map) {
|
||||
map.put(key, sanitize((Map<String, Object>) value));
|
||||
}
|
||||
else {
|
||||
map.put(entry.getKey(), this.sanitizer.sanitize(entry.getKey(), entry.getValue()));
|
||||
map.put(key, this.sanitizer.sanitize(key, value));
|
||||
}
|
||||
}
|
||||
return map;
|
||||
|
@ -27,7 +27,7 @@ import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* {@link Endpoint} to expose application health.
|
||||
*
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Christian Dupuis
|
||||
*/
|
||||
|
@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
|
||||
|
||||
/**
|
||||
* Tests for {@link EndpointAutoConfiguration}.
|
||||
*
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Phillip Webb
|
||||
* @author Greg Turnquist
|
||||
|
@ -35,7 +35,6 @@ import org.springframework.stereotype.Component;
|
||||
@Component
|
||||
public class BatchDatabaseInitializer {
|
||||
|
||||
|
||||
@Autowired
|
||||
private BatchProperties properties;
|
||||
|
||||
|
@ -24,7 +24,8 @@ import org.apache.tomcat.jdbc.pool.DataSource;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class TomcatDataSourcePoolMetadata extends AbstractDataSourcePoolMetadata<DataSource> {
|
||||
public class TomcatDataSourcePoolMetadata extends
|
||||
AbstractDataSourcePoolMetadata<DataSource> {
|
||||
|
||||
public TomcatDataSourcePoolMetadata(DataSource dataSource) {
|
||||
super(dataSource);
|
||||
|
@ -45,7 +45,8 @@ import org.springframework.context.annotation.Import;
|
||||
@ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class })
|
||||
@ConditionalOnMissingBean(ConnectionFactory.class)
|
||||
@EnableConfigurationProperties(ActiveMQProperties.class)
|
||||
@Import({ ActiveMQXAConnectionFactoryConfiguration.class, ActiveMQConnectionFactoryConfiguration.class })
|
||||
@Import({ ActiveMQXAConnectionFactoryConfiguration.class,
|
||||
ActiveMQConnectionFactoryConfiguration.class })
|
||||
public class ActiveMQAutoConfiguration {
|
||||
|
||||
}
|
||||
|
@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.jdbc.metadata;
|
||||
import org.apache.commons.dbcp.BasicDataSource;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.springframework.boot.autoconfigure.jdbc.metadata.CommonsDbcpDataSourcePoolMetadata;
|
||||
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNull;
|
||||
|
@ -17,7 +17,6 @@
|
||||
package org.springframework.boot.autoconfigure.jdbc.metadata;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.springframework.boot.autoconfigure.jdbc.metadata.HikariDataSourcePoolMetadata;
|
||||
|
||||
import com.zaxxer.hikari.HikariDataSource;
|
||||
|
||||
|
@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.jdbc.metadata;
|
||||
|
||||
import org.apache.tomcat.jdbc.pool.DataSource;
|
||||
import org.junit.Before;
|
||||
import org.springframework.boot.autoconfigure.jdbc.metadata.TomcatDataSourcePoolMetadata;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
|
@ -73,5 +73,4 @@ public class ReproIntegrationTests {
|
||||
this.cli.jar("secure.groovy", "crsh.groovy");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -19,7 +19,6 @@ package org.springframework.boot.cli;
|
||||
import java.io.File;
|
||||
import java.net.URI;
|
||||
|
||||
import org.codehaus.plexus.util.FileUtils;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
|
@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock;
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
public class JettyEmbeddedServletContainerFactoryTests extends
|
||||
AbstractEmbeddedServletContainerFactoryTests {
|
||||
AbstractEmbeddedServletContainerFactoryTests {
|
||||
|
||||
@Override
|
||||
protected JettyEmbeddedServletContainerFactory getFactory() {
|
||||
|
Loading…
Reference in New Issue
Block a user