Minor changes to class scan utilities
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a621886 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a621886 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a621886 Branch: refs/heads/master-jaxrs-2.1 Commit: 1a621886ff0c509f0a1d1eca9cfd38b27b256bb6 Parents: 9c5b14d Author: Sergey Beryozkin <[email protected]> Authored: Thu Jun 30 21:55:18 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Jun 30 21:55:18 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/common/util/ClasspathScanner.java | 2 +- .../java/org/apache/cxf/common/util/SpringClasspathScanner.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1a621886/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java index cc43731..7b4c34a 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java +++ b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java @@ -75,7 +75,7 @@ public class ClasspathScanner { public static Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClasses( String basePackage, Class< ? extends Annotation > ... annotations) throws IOException, ClassNotFoundException { - return findClasses(Collections.singletonList(basePackage), + return findClasses(parsePackages(basePackage), Collections.unmodifiableList(Arrays.asList(annotations))); } http://git-wip-us.apache.org/repos/asf/cxf/blob/1a621886/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java index e8dd183..650e793 100644 --- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java +++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java @@ -85,8 +85,8 @@ class SpringClasspathScanner extends ClasspathScanner { for (final String basePackage: basePackages) { final boolean scanAllPackages = basePackage.equals(WILDCARD); final String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + (scanAllPackages ? "" : basePackage.contains(WILDCARD) ? basePackage - : ClassUtils.convertClassNameToResourcePath(basePackage)) + ALL_CLASS_FILES; + + (scanAllPackages ? "" : ClassUtils.convertClassNameToResourcePath(basePackage)) + + ALL_CLASS_FILES; final Resource[] resources = resolver.getResources(packageSearchPath);
