Browse Source

Polish

pull/2091/head
Phillip Webb 11 years ago
parent
commit
4b7c6f61b4
  1. 3
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java
  2. 4
      spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
  3. 4
      spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java

3
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java

@ -53,16 +53,13 @@ public class EndpointMBeanExportAutoConfiguration { @@ -53,16 +53,13 @@ public class EndpointMBeanExportAutoConfiguration {
@Bean
public EndpointMBeanExporter endpointMBeanExporter(MBeanServer server) {
EndpointMBeanExporter mbeanExporter = new EndpointMBeanExporter();
String domain = this.properties.getDomain();
if (StringUtils.hasText(domain)) {
mbeanExporter.setDomain(domain);
}
mbeanExporter.setServer(server);
mbeanExporter.setEnsureUniqueRuntimeObjectNames(this.properties.isUniqueNames());
mbeanExporter.setObjectNameStaticProperties(this.properties.getStaticNames());
return mbeanExporter;
}

4
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java

@ -75,7 +75,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor @@ -75,7 +75,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
private FieldValuesParser fieldValuesParser;
private ElementExcludeFilter elementExcludeFilter = new ElementExcludeFilter();
private TypeExcludeFilter typeExcludeFilter = new TypeExcludeFilter();
protected String configurationPropertiesAnnotation() {
return CONFIGURATION_PROPERTIES_ANNOTATION;
@ -179,7 +179,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor @@ -179,7 +179,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
VariableElement field = members.getFields().get(name);
Element returnType = this.processingEnv.getTypeUtils().asElement(
getter.getReturnType());
boolean isExcluded = this.elementExcludeFilter.isExcluded(getter
boolean isExcluded = this.typeExcludeFilter.isExcluded(getter
.getReturnType());
boolean isNested = isNested(returnType, field, element);
boolean isCollection = this.typeUtils.isCollectionOrMap(getter

4
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ElementExcludeFilter.java → spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java

@ -27,11 +27,11 @@ import javax.lang.model.type.TypeMirror; @@ -27,11 +27,11 @@ import javax.lang.model.type.TypeMirror;
* @author Stephane Nicoll
* @since 1.2.0
*/
class ElementExcludeFilter {
class TypeExcludeFilter {
private final Set<String> excludes = new HashSet<String>();
public ElementExcludeFilter() {
public TypeExcludeFilter() {
add("java.io.Writer");
add("java.io.PrintWriter");
add("java.lang.ClassLoader");
Loading…
Cancel
Save