Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Phillip Webb
2018-05-04 12:00:50 -07:00
parent 1314aaa368
commit 0a0247975c
36 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
View File

@@ -344,6 +344,7 @@ public class ConfigurationPropertiesReportEndpoint
}
super.serializeAsField(pojo, jgen, provider, writer);
}
}
/**
@@ -395,4 +396,5 @@ public class ConfigurationPropertiesReportEndpoint
}
}
}

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java
View File

@@ -104,8 +104,8 @@ public class DataSourcePublicMetrics implements PublicMetrics {
if (primary) {
return "datasource.primary";
}
if (name.length() > DATASOURCE_SUFFIX.length()
&& name.toLowerCase(Locale.ENGLISH).endsWith(DATASOURCE_SUFFIX.toLowerCase())) {
if (name.length() > DATASOURCE_SUFFIX.length() && name.toLowerCase(Locale.ENGLISH)
.endsWith(DATASOURCE_SUFFIX.toLowerCase())) {
name = name.substring(0, name.length() - DATASOURCE_SUFFIX.length());
}
return "datasource." + name;

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java
View File

@@ -73,6 +73,7 @@ public class FlywayEndpoint extends AbstractEndpoint<List<FlywayReport>> {
public static class FlywayReport {
private final String name;
private final List<FlywayMigration> migrations;
public FlywayReport(String name, List<FlywayMigration> migrations) {

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java
View File

@@ -142,6 +142,7 @@ public class MvcEndpointSecurityInterceptor extends HandlerInterceptorAdapter {
}
return false;
}
}
}

3
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java
View File

@@ -325,6 +325,7 @@ public class EndpointWebMvcManagementContextConfigurationTests {
TestMetricsMvcEndpoint(MetricsEndpoint delegate) {
super(delegate);
}
}
static class TestAuditEventsMvcEndpoint extends AuditEventsMvcEndpoint {
@@ -332,6 +333,7 @@ public class EndpointWebMvcManagementContextConfigurationTests {
TestAuditEventsMvcEndpoint(AuditEventRepository auditEventRepository) {
super(auditEventRepository);
}
}
static class TestShutdownMvcEndpoint extends ShutdownMvcEndpoint {
@@ -339,6 +341,7 @@ public class EndpointWebMvcManagementContextConfigurationTests {
TestShutdownMvcEndpoint(ShutdownEndpoint delegate) {
super(delegate);
}
}
}

1
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java
View File

@@ -277,4 +277,5 @@ public class HealthMvcEndpointTests {
Health health = ((ResponseEntity<Health>) result).getBody();
assertThat(health.getStatus() == Status.DOWN).isTrue();
}
}

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java vendored
View File

@@ -75,8 +75,7 @@ public class CacheAutoConfiguration {
@Bean
public CacheManagerValidator cacheAutoConfigurationValidator(
CacheProperties cacheProperties,
ObjectProvider<CacheManager> cacheManager) {
CacheProperties cacheProperties, ObjectProvider<CacheManager> cacheManager) {
return new CacheManagerValidator(cacheProperties, cacheManager);
}

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
View File

@@ -115,8 +115,8 @@ public class CassandraDataAutoConfiguration {
session.setKeyspaceName(this.properties.getKeyspaceName());
String name = this.propertyResolver.getProperty("schemaAction",
SchemaAction.NONE.name());
SchemaAction schemaAction = SchemaAction.valueOf(
name.toUpperCase(Locale.ENGLISH));
SchemaAction schemaAction = SchemaAction
.valueOf(name.toUpperCase(Locale.ENGLISH));
session.setSchemaAction(schemaAction);
return session;
}

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
View File

@@ -120,6 +120,7 @@ public class IntegrationAutoConfiguration {
@Configuration
@EnableIntegrationManagement(defaultCountsEnabled = "true", defaultStatsEnabled = "true")
protected static class EnableIntegrationManagementConfiguration {
}
}

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java
View File

@@ -77,6 +77,7 @@ class IntegrationAutoConfigurationScanRegistrar extends IntegrationComponentScan
}
return attributes;
}
}
@IntegrationComponentScan

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
View File

@@ -185,6 +185,7 @@ public class OAuth2RestOperationsConfiguration {
@Conditional(ClientCredentialsCondition.class)
static class ClientCredentialsActivated {
}
}
@@ -200,10 +201,12 @@ public class OAuth2RestOperationsConfiguration {
@ConditionalOnProperty(prefix = "security.oauth2.client", name = "grant-type", havingValue = "client_credentials", matchIfMissing = false)
static class ClientCredentialsConfigured {
}
@ConditionalOnNotWebApplication
static class NoWebApplication {
}
}

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java
View File

@@ -292,6 +292,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
public void setKeySetUri(String keySetUri) {
this.keySetUri = keySetUri;
}
}
}

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java
View File

@@ -234,6 +234,7 @@ public class ResourceServerTokenServicesConfiguration {
public TokenStore jwkTokenStore() {
return new JwkTokenStore(this.resource.getJwk().getKeySetUri());
}
}
@Configuration
@@ -415,6 +416,7 @@ public class ResourceServerTokenServicesConfiguration {
static class HasJwkConfiguration {
}
}
static class AcceptJsonRequestInterceptor implements ClientHttpRequestInterceptor {

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java
View File

@@ -75,6 +75,7 @@ public class TransactionAutoConfiguration {
public TransactionTemplate transactionTemplate() {
return new TransactionTemplate(this.transactionManager);
}
}
@Configuration

12
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java vendored
View File

@@ -776,8 +776,8 @@ public class CacheAutoConfigurationTests {
public void autoConfiguredCacheManagerCanBeSwapped() {
load(CacheManagerPostProcessorConfiguration.class, "spring.cache.type=caffeine");
validateCacheManager(SimpleCacheManager.class);
CacheManagerPostProcessor postProcessor = this.context.getBean(
CacheManagerPostProcessor.class);
CacheManagerPostProcessor postProcessor = this.context
.getBean(CacheManagerPostProcessor.class);
assertThat(postProcessor.cacheManagers).hasSize(1);
assertThat(postProcessor.cacheManagers.get(0))
.isInstanceOf(CaffeineCacheManager.class);
@@ -1193,14 +1193,14 @@ public class CacheAutoConfigurationTests {
private final List<CacheManager> cacheManagers = new ArrayList<CacheManager>();
@Override
public Object postProcessBeforeInitialization(Object bean,
String beanName) throws BeansException {
public Object postProcessBeforeInitialization(Object bean, String beanName)
throws BeansException {
return bean;
}
@Override
public Object postProcessAfterInitialization(Object bean,
String beanName) throws BeansException {
public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
if (bean instanceof CacheManager) {
this.cacheManagers.add((CacheManager) bean);
return new SimpleCacheManager();

1
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java
View File

@@ -185,6 +185,7 @@ public class CouchbaseDataAutoConfigurationTests {
public Boolean convert(CouchbaseProperties value) {
return true;
}
}
}

1
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java
View File

@@ -203,6 +203,7 @@ public class TransactionAutoConfigurationTests {
public AnotherServiceImpl anotherService() {
return new AnotherServiceImpl();
}
}
@Configuration

3
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java
View File

@@ -304,6 +304,7 @@ public class ValidationAutoConfigurationTests {
interface AnotherSampleService {
void doSomething(@Min(42) Integer counter);
}
@Validated
@@ -313,6 +314,7 @@ public class ValidationAutoConfigurationTests {
public void doSomething(Integer counter) {
}
}
@Configuration
@@ -382,6 +384,7 @@ public class ValidationAutoConfigurationTests {
}
}
}
}

7
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java
View File

@@ -131,9 +131,10 @@ abstract class ArchiveCommand extends OptionParsingCommand {
File output = new File((String) nonOptionArguments.remove(0));
Assert.isTrue(
output.getName().toLowerCase(Locale.ENGLISH).endsWith("." + this.type),
"The output '" + output + "' is not a " + this.type.toUpperCase(
Locale.ENGLISH) + " file.");
output.getName().toLowerCase(Locale.ENGLISH)
.endsWith("." + this.type),
"The output '" + output + "' is not a "
+ this.type.toUpperCase(Locale.ENGLISH) + " file.");
deleteIfExists(output);
GroovyCompiler compiler = createCompiler(options);

3
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
View File

@@ -360,7 +360,8 @@ class ProjectGenerationRequest {
return builder.build();
}
catch (URISyntaxException ex) {
throw new ReportableException("Invalid service URL (" + ex.getMessage() + ")");
throw new ReportableException(
"Invalid service URL (" + ex.getMessage() + ")");
}
}

1
spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java
View File

@@ -42,4 +42,5 @@ public class JestClientCustomizationExample {
}
// end::customizer[]
}

4
spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java
View File

@@ -55,9 +55,7 @@ public class SampleWebClientTests {
@Bean
public RestTemplateBuilder restTemplateBuilder() {
return new RestTemplateBuilder()
.setConnectTimeout(1000)
.setReadTimeout(1000);
return new RestTemplateBuilder().setConnectTimeout(1000).setReadTimeout(1000);
}
}

1
spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
View File

@@ -354,6 +354,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
public String toString() {
return this.key.toString();
}
}
/**

1
spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java
View File

@@ -30,4 +30,5 @@ public class TestMethodConfiguration {
public Object method() {
return null;
}
}

1
spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java
View File

@@ -29,4 +29,5 @@ import java.io.OutputStream;
@TestConditionalOnClass(name = "java.io.InputStream", value = OutputStream.class)
@TestAutoConfigureOrder(123)
public class TestOrderedClassConfiguration {
}

4
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View File

@@ -549,8 +549,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
"java.lang.String", null, null, null, null, null);
writeAdditionalMetadata(property);
ConfigurationMetadata metadata = compile(SimpleProperties.class);
assertThat(metadata).has(Metadata.withGroup("simple")
.fromSource(SimpleProperties.class));
assertThat(metadata)
.has(Metadata.withGroup("simple").fromSource(SimpleProperties.class));
assertThat(metadata).has(Metadata.withProperty("simple", String.class));
}

1
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
View File

@@ -160,6 +160,7 @@ public final class Layouts {
/**
* Module layout (designed to be used as a "plug-in").
*
* @deprecated as of 1.5 in favor of a custom {@link LayoutFactory}
*/
@Deprecated

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
View File

@@ -108,7 +108,7 @@ public class JarFile extends java.util.jar.JarFile {
private JarFile(RandomAccessDataFile rootFile, String pathFromRoot,
RandomAccessData data, JarEntryFilter filter, JarFileType type)
throws IOException {
throws IOException {
super(rootFile.getFile());
this.rootFile = rootFile;
this.pathFromRoot = pathFromRoot;

4
spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
View File

@@ -54,8 +54,8 @@ import org.springframework.validation.Validator;
* @param <T> the target type
* @author Dave Syer
*/
public class PropertiesConfigurationFactory<T>
implements FactoryBean<T>, ApplicationContextAware, MessageSourceAware, InitializingBean {
public class PropertiesConfigurationFactory<T> implements FactoryBean<T>,
ApplicationContextAware, MessageSourceAware, InitializingBean {
private static final char[] EXACT_DELIMITERS = { '_', '.', '[' };

4
spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java
View File

@@ -42,8 +42,8 @@ public class AnsiOutputApplicationListener
event.getEnvironment(), "spring.output.ansi.");
if (resolver.containsProperty("enabled")) {
String enabled = resolver.getProperty("enabled");
AnsiOutput.setEnabled(Enum.valueOf(Enabled.class,
enabled.toUpperCase(Locale.ENGLISH)));
AnsiOutput.setEnabled(
Enum.valueOf(Enabled.class, enabled.toUpperCase(Locale.ENGLISH)));
}
if (resolver.containsProperty("console-available")) {

1
spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
View File

@@ -130,7 +130,6 @@ public abstract class AbstractEmbeddedServletContainerFactory
/**
* Converts the given {@code url} into a decoded file path.
*
* @param url the url to convert
* @return the file path
* @deprecated Since 1.5.13 in favor of {@link File#File(java.net.URI)}

1
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View File

@@ -102,7 +102,6 @@ import org.springframework.util.StringUtils;
* @author Venil Noronha
* @author Henri Kerola
* @author Henrich Krämer
*
* @see #setPort(int)
* @see #setConfigurations(Collection)
* @see JettyEmbeddedServletContainer

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View File

@@ -701,6 +701,7 @@ public class UndertowEmbeddedServletContainerFactory
return null;
}
}
}
/**
@@ -722,6 +723,7 @@ public class UndertowEmbeddedServletContainerFactory
initializer.onStartup(servletContext);
}
}
}
/**

1
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java
View File

@@ -112,6 +112,7 @@ public class Jetty8JettyEmbeddedServletContainerFactoryTests {
resp.getWriter().print("An error occurred");
resp.flushBuffer();
}
}
}

2
spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
View File

@@ -554,6 +554,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
interface ValidatedProperties {
String getFoo();
}
@ConfigurationProperties("test")
@@ -890,6 +891,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
}
return null;
}
}
}

2
spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java
View File

@@ -117,5 +117,7 @@ public class JsonComponentModuleTests {
static class ConcreteSerializer extends AbstractSerializer {
}
}
}