You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2020/04/14 18:02:36 UTC
[sling-org-apache-sling-testing-sling-mock] branch master updated:
SLING-9372 Update to reflections 0.9.12
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to refs/heads/master by this push:
new fd48a5e SLING-9372 Update to reflections 0.9.12
fd48a5e is described below
commit fd48a5e03da592a91614e4a7fa521d10786772b5
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Apr 14 18:44:01 2020 +0200
SLING-9372 Update to reflections 0.9.12
---
.../testing/mock/sling/context/ModelAdapterFactoryUtil.java | 13 +++++++------
parent/pom.xml | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
index d915136..6331ce6 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
@@ -35,6 +35,7 @@ import java.util.Set;
import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.models.annotations.Model;
@@ -48,6 +49,8 @@ import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.reflections.Reflections;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
/**
* Helper methods for registering Sling Models from the classpath.
@@ -138,13 +141,11 @@ final class ModelAdapterFactoryUtil {
List<URL> urls = MODEL_URLS_FOR_PACKAGES.get(packageNames);
if (urls == null) {
urls = new ArrayList<URL>();
- String[] packageNameArray = StringUtils.split(packageNames, ",");
// add "." to each package name because it's a prefix, not a package name
- Object[] prefixArray = new Object[packageNameArray.length];
- for (int i = 0; i < packageNameArray.length; i++) {
- prefixArray[i] = packageNameArray[i] + ".";
- }
- Reflections reflections = new Reflections(prefixArray);
+ ConfigurationBuilder reflectionsConfig = new ConfigurationBuilder();
+ Stream.of(StringUtils.split(packageNames, ","))
+ .forEach(packageName -> reflectionsConfig.addUrls(ClasspathHelper.forPackage(packageName + ".")));
+ Reflections reflections = new Reflections(reflectionsConfig);
Set<Class<?>> classes = reflections.getTypesAnnotatedWith(Model.class);
for (Class<?> clazz : classes) {
urls.add(classToUrl(clazz));
diff --git a/parent/pom.xml b/parent/pom.xml
index cd2b0ff..eeaec58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -36,7 +36,7 @@
<properties>
- <osgi-mock.version>2.4.14</osgi-mock.version>
+ <osgi-mock.version>2.4.15-SNAPSHOT</osgi-mock.version>
<jcr-mock.version>1.4.4</jcr-mock.version>
<resourceresolver-mock.version>1.1.26</resourceresolver-mock.version>
<logging-mock.version>2.0.0</logging-mock.version>