From 135107fef568107baca1bd95ef76d9a048d2fe7e Mon Sep 17 00:00:00 2001 From: Jongyeol Choi Date: Tue, 31 May 2016 21:45:25 +0900 Subject: [PATCH] Fix Reflections' WARN log when jsonDir doesn't exist. Motivation: When com.linecorp.armeria.thrift.jsonDir doesn't exist, WARN log will occured. 12:04:57.463 [WARN ](o.r.Reflections) [main] given scan urls are empty. set urls in the configuration Modifications: Check jsonDir before scan. Result: DocService will not warn when jsonDir doesn't exist. --- .../armeria/server/docs/ThriftDocString.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/linecorp/armeria/server/docs/ThriftDocString.java b/src/main/java/com/linecorp/armeria/server/docs/ThriftDocString.java index 2071c1f0177..53d8afa5995 100644 --- a/src/main/java/com/linecorp/armeria/server/docs/ThriftDocString.java +++ b/src/main/java/com/linecorp/armeria/server/docs/ThriftDocString.java @@ -19,12 +19,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.reflections.Configuration; import org.reflections.Reflections; import org.reflections.scanners.ResourcesScanner; import org.reflections.util.ClasspathHelper; @@ -98,13 +100,15 @@ static Map parseDocStrings(ClassLoader classLoader, Iterable getAllThriftJsons(ClassLoader classLoader) { - final Reflections reflections = new Reflections( - new ConfigurationBuilder() - .filterInputsBy(new FilterBuilder().includePackage(THRIFT_JSON_PATH)) - .setUrls(ClasspathHelper.forPackage(THRIFT_JSON_PATH)) - .addClassLoader(classLoader) - .addScanners(new ResourcesScanner())); - return reflections.getResources(filename -> filename.endsWith(".json")); + final Configuration configuration = new ConfigurationBuilder() + .filterInputsBy(new FilterBuilder().includePackage(THRIFT_JSON_PATH)) + .setUrls(ClasspathHelper.forPackage(THRIFT_JSON_PATH)) + .addClassLoader(classLoader) + .addScanners(new ResourcesScanner()); + if (configuration.getUrls() == null || configuration.getUrls().isEmpty()) { + return Collections.emptyList(); + } + return new Reflections(configuration).getResources(filename -> filename.endsWith(".json")); } /**