From 5e722dae6ad790e7bf7858a8b03294aebcdf2a02 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 8 Mar 2016 09:37:04 -0800 Subject: [PATCH] Polish --- .../boot/cli/compiler/AnnotatedNodeASTTransformation.java | 8 ++------ .../DevToolsDataSourceAutoConfigurationTests.java | 1 + .../configurationmetadata/RawConfigurationMetadata.java | 4 ++-- .../ConfigurationMetadataRepositoryJsonBuilderTests.java | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java index c16cb078e2b..124dd4726cb 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -57,14 +57,11 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio public void visit(ASTNode[] nodes, SourceUnit source) { this.sourceUnit = source; List annotationNodes = new ArrayList(); - ClassVisitor classVisitor = new ClassVisitor(source, annotationNodes); for (ASTNode node : nodes) { if (node instanceof ModuleNode) { ModuleNode module = (ModuleNode) node; - visitAnnotatedNode(module.getPackage(), annotationNodes); - for (ImportNode importNode : module.getImports()) { visitAnnotatedNode(importNode, annotationNodes); } @@ -79,14 +76,12 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio .entrySet()) { visitAnnotatedNode(entry.getValue(), annotationNodes); } - for (ClassNode classNode : module.getClasses()) { visitAnnotatedNode(classNode, annotationNodes); classNode.visitContents(classVisitor); } } } - processAnnotationNodes(annotationNodes); } @@ -117,6 +112,7 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio private class ClassVisitor extends ClassCodeVisitorSupport { private final SourceUnit source; + private List annotationNodes; ClassVisitor(SourceUnit source, List annotationNodes) { diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfigurationTests.java index 700f39509ec..51c97357430 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfigurationTests.java @@ -194,6 +194,7 @@ public class DevToolsDataSourceAutoConfigurationTests { public EntityManagerFactory entityManagerFactory() { return mock(EntityManagerFactory.class); } + } } diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java index ab4918cb796..358568e83ae 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java @@ -87,8 +87,8 @@ class RawConfigurationMetadata { } } - private static boolean hasLength(String s) { - return (s != null && s.length() > 0); + private static boolean hasLength(String string) { + return (string != null && string.length() > 0); } } diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java b/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java index 4db6baaaedb..b82efd606c5 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java @@ -206,8 +206,7 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests ConfigurationMetadataSource source = group.getSources().get("org.acme.Foo"); contains(source.getProperties(), "name"); assertEquals(1, source.getProperties().size()); - ConfigurationMetadataSource source2 = group.getSources() - .get("org.acme.Bar"); + ConfigurationMetadataSource source2 = group.getSources().get("org.acme.Bar"); contains(source2.getProperties(), "title"); assertEquals(1, source2.getProperties().size()); validatePropertyHints(repo.getAllProperties().get("name"), 0, 0);