This is an automated email from the ASF dual-hosted git repository. pottlinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git
commit aa2a5e518c29f48495c5434693345248b0c76cd2 Author: Hugo Hirsch <[email protected]> AuthorDate: Sun May 12 00:52:28 2019 +0200 TAMAYA-277: Fix sonar warning, update reflections lib --- documentation/pom.xml | 2 +- .../src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java | 11 ++++++----- .../java/org/apache/tamaya/doc/formats/HtmlDocFormat.java | 6 +----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/documentation/pom.xml b/documentation/pom.xml index 15269fc..1dda64f 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> - <version>0.9.9-RC1</version> + <version>0.9.11</version> </dependency> <dependency> <groupId>com.j2html</groupId> diff --git a/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java b/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java index 8e1892e..0f8a91d 100644 --- a/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java +++ b/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java @@ -28,6 +28,8 @@ import org.reflections.Reflections; import org.reflections.scanners.FieldAnnotationsScanner; import org.reflections.scanners.MethodAnnotationsScanner; import org.reflections.scanners.TypeAnnotationsScanner; +import org.reflections.scanners.SubTypesScanner; +import org.reflections.scanners.Scanner; import org.reflections.util.ClasspathHelper; import org.reflections.util.ConfigurationBuilder; import org.reflections.util.FilterBuilder; @@ -44,9 +46,9 @@ import java.util.List; */ public class ConfigDocumenter { + private static final Scanner[] SCANNERS = {new TypeAnnotationsScanner(), new MethodAnnotationsScanner(), new FieldAnnotationsScanner(), new SubTypesScanner()}; private DocumentedConfiguration docs = new DocumentedConfiguration(); - public static ConfigDocumenter getInstance(){ return ServiceContextManager.getServiceContext() .getService(ConfigDocumenter.class, ConfigDocumenter::new); @@ -70,7 +72,7 @@ public class ConfigDocumenter { urls.add(ClasspathHelper.forClass(clazz)); } ConfigurationBuilder configBuilder = new ConfigurationBuilder() - .setScanners(new TypeAnnotationsScanner(), new MethodAnnotationsScanner(), new FieldAnnotationsScanner()) + .setScanners(SCANNERS) .setUrls(urls) .filterInputsBy(filterBuilder); Reflections reflections = new Reflections(configBuilder); @@ -83,7 +85,7 @@ public class ConfigDocumenter { */ public void readClasses(ClassLoader classLoader){ ConfigurationBuilder configBuilder = new ConfigurationBuilder() - .setScanners(new TypeAnnotationsScanner(), new MethodAnnotationsScanner(), new FieldAnnotationsScanner()) + .setScanners(SCANNERS) .setUrls(ClasspathHelper.forClassLoader(classLoader)); Reflections reflections = new Reflections(configBuilder); readSpecs(reflections); @@ -101,8 +103,7 @@ public class ConfigDocumenter { } configBuilder.filterInputsBy(filterBuilder); configBuilder.setUrls(ClasspathHelper.forJavaClassPath()); - configBuilder.setScanners(new TypeAnnotationsScanner(), - new MethodAnnotationsScanner(), new FieldAnnotationsScanner()); + configBuilder.setScanners(SCANNERS); Reflections reflections = new Reflections(configBuilder); readSpecs(reflections); } diff --git a/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java b/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java index 6b43280..577e360 100644 --- a/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java +++ b/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java @@ -80,13 +80,9 @@ public class HtmlDocFormat implements DocFormat<String> { } private void writeResultToFile(String result) { - File file = new File("./doc.html"); - FileWriter w; - try { - w = new FileWriter(file); + try (FileWriter w = new FileWriter(new File("./doc.html"));) { w.append(result); w.flush(); - w.close(); } catch (IOException e) { e.printStackTrace(); }
