Skip to content

Commit b9fd99e

Browse files
committed
Polish
1 parent 3cf8e81 commit b9fd99e

File tree

8 files changed

+18
-20
lines changed

8 files changed

+18
-20
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ private void addMetrics(Collection<Metric<?>> metrics, String cacheName,
105105
}
106106

107107
private Cache unwrapIfNecessary(Cache cache) {
108-
if (ClassUtils.isPresent("org.springframework.cache.transaction.TransactionAwareCacheDecorator",
108+
if (ClassUtils.isPresent(
109+
"org.springframework.cache.transaction.TransactionAwareCacheDecorator",
109110
getClass().getClassLoader())) {
110111
return TransactionAwareCacheDecoratorHandler.unwrapIfNecessary(cache);
111112
}
@@ -165,6 +166,7 @@ private static Cache unwrapIfNecessary(Cache cache) {
165166
}
166167
return cache;
167168
}
169+
168170
}
169171

170172
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@ private boolean isReadable(BeanDescription beanDesc, BeanPropertyWriter writer)
340340
// that's what the metadata generator does. This filter is not used if there
341341
// is JSON metadata for the property, so it's mainly for user-defined beans.
342342
return (setter != null)
343-
|| ClassUtils.getPackageName(parentType).equals(ClassUtils.getPackageName(type))
343+
|| ClassUtils.getPackageName(parentType)
344+
.equals(ClassUtils.getPackageName(type))
344345
|| Map.class.isAssignableFrom(type)
345346
|| Collection.class.isAssignableFrom(type);
346347
}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -217,11 +217,9 @@ public void testInitializedMapAndList() throws Exception {
217217
Map<String, Object> propertiesMap = (Map<String, Object>) nestedProperties
218218
.get("properties");
219219
assertThat(propertiesMap).containsOnlyKeys("bar", "name", "map", "list");
220-
Map<String, Object> map = (Map<String, Object>) propertiesMap
221-
.get("map");
220+
Map<String, Object> map = (Map<String, Object>) propertiesMap.get("map");
222221
assertThat(map).containsOnly(entry("entryOne", true));
223-
List<String> list = (List<String>) propertiesMap
224-
.get("list");
222+
List<String> list = (List<String>) propertiesMap.get("list");
225223
assertThat(list).containsExactly("abc");
226224
}
227225

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,9 +29,8 @@
2929

3030
/**
3131
* {@link Conditional} that only matches when the specified bean classes and/or names are
32-
* already contained in the {@link BeanFactory}.
33-
* When placed on a {@code @Bean} method, the bean class default to the return type of
34-
* the factory method:
32+
* already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
33+
* the bean class default to the return type of the factory method:
3534
*
3635
* <pre class="code">
3736
* &#064;Configuration

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@
3131
* {@link Conditional} that only matches when the specified bean classes and/or names are
3232
* not already contained in the {@link BeanFactory}.
3333
* <p>
34-
* When placed on a {@code @Bean} method, the bean class default to the return type of
35-
* the factory method:
34+
* When placed on a {@code @Bean} method, the bean class default to the return type of the
35+
* factory method:
3636
*
3737
* <pre class="code">
3838
* &#064;Configuration

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ public void checkSessionRepository() {
102102
+ "auto-configured, check your configuration (session store "
103103
+ "type is '" + storeType.name().toLowerCase() + "')");
104104
}
105-
else {
106-
throw new IllegalArgumentException("No Spring Session store is "
107-
+ "configured: set the 'spring.session.store-type' property");
108-
}
105+
throw new IllegalArgumentException("No Spring Session store is "
106+
+ "configured: set the 'spring.session.store-type' property");
109107
}
110108
}
111109

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)