Polish
This commit is contained in:
parent
3cf8e81a8b
commit
b9fd99e268
|
|
@ -105,7 +105,8 @@ public class CachePublicMetrics implements PublicMetrics {
|
|||
}
|
||||
|
||||
private Cache unwrapIfNecessary(Cache cache) {
|
||||
if (ClassUtils.isPresent("org.springframework.cache.transaction.TransactionAwareCacheDecorator",
|
||||
if (ClassUtils.isPresent(
|
||||
"org.springframework.cache.transaction.TransactionAwareCacheDecorator",
|
||||
getClass().getClassLoader())) {
|
||||
return TransactionAwareCacheDecoratorHandler.unwrapIfNecessary(cache);
|
||||
}
|
||||
|
|
@ -165,6 +166,7 @@ public class CachePublicMetrics implements PublicMetrics {
|
|||
}
|
||||
return cache;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -340,7 +340,8 @@ public class ConfigurationPropertiesReportEndpoint
|
|||
// that's what the metadata generator does. This filter is not used if there
|
||||
// is JSON metadata for the property, so it's mainly for user-defined beans.
|
||||
return (setter != null)
|
||||
|| ClassUtils.getPackageName(parentType).equals(ClassUtils.getPackageName(type))
|
||||
|| ClassUtils.getPackageName(parentType)
|
||||
.equals(ClassUtils.getPackageName(type))
|
||||
|| Map.class.isAssignableFrom(type)
|
||||
|| Collection.class.isAssignableFrom(type);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -217,11 +217,9 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
|
|||
Map<String, Object> propertiesMap = (Map<String, Object>) nestedProperties
|
||||
.get("properties");
|
||||
assertThat(propertiesMap).containsOnlyKeys("bar", "name", "map", "list");
|
||||
Map<String, Object> map = (Map<String, Object>) propertiesMap
|
||||
.get("map");
|
||||
Map<String, Object> map = (Map<String, Object>) propertiesMap.get("map");
|
||||
assertThat(map).containsOnly(entry("entryOne", true));
|
||||
List<String> list = (List<String>) propertiesMap
|
||||
.get("list");
|
||||
List<String> list = (List<String>) propertiesMap.get("list");
|
||||
assertThat(list).containsExactly("abc");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -29,9 +29,8 @@ import org.springframework.context.annotation.Conditional;
|
|||
|
||||
/**
|
||||
* {@link Conditional} that only matches when the specified bean classes and/or names are
|
||||
* already contained in the {@link BeanFactory}.
|
||||
* When placed on a {@code @Bean} method, the bean class default to the return type of
|
||||
* the factory method:
|
||||
* already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
|
||||
* the bean class default to the return type of the factory method:
|
||||
*
|
||||
* <pre class="code">
|
||||
* @Configuration
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
|
|||
* {@link Conditional} that only matches when the specified bean classes and/or names are
|
||||
* not already contained in the {@link BeanFactory}.
|
||||
* <p>
|
||||
* When placed on a {@code @Bean} method, the bean class default to the return type of
|
||||
* the factory method:
|
||||
* When placed on a {@code @Bean} method, the bean class default to the return type of the
|
||||
* factory method:
|
||||
*
|
||||
* <pre class="code">
|
||||
* @Configuration
|
||||
|
|
|
|||
|
|
@ -102,10 +102,8 @@ public class SessionAutoConfiguration {
|
|||
+ "auto-configured, check your configuration (session store "
|
||||
+ "type is '" + storeType.name().toLowerCase() + "')");
|
||||
}
|
||||
else {
|
||||
throw new IllegalArgumentException("No Spring Session store is "
|
||||
+ "configured: set the 'spring.session.store-type' property");
|
||||
}
|
||||
throw new IllegalArgumentException("No Spring Session store is "
|
||||
+ "configured: set the 'spring.session.store-type' property");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
|
|||
Loading…
Reference in New Issue