[sling-org-apache-sling-junit-core] 01/02: SLING-10497 - JUnit Jupiter ParameterResolver for OSGi

[js...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jsedding pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-core.git

commit 32bdaf477f625ba64734472a522b0b75f64785e8
Author: Julian Sedding <js...@apache.org>
AuthorDate: Mon Jun 21 11:19:15 2021 +0200

    SLING-10497 - JUnit Jupiter ParameterResolver for OSGi
    
    - eliminate "private references" warning
---
 .../jupiter/osgi/{impl => }/BundleContextParameterResolver.java     | 5 +++--
 .../junit/jupiter/osgi/{impl => }/BundleParameterResolver.java      | 5 +++--
 src/main/java/org/apache/sling/junit/jupiter/osgi/OSGi.java         | 3 ---
 .../junit/jupiter/osgi/{impl => }/ServiceParameterResolver.java     | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/sling/junit/jupiter/osgi/impl/BundleContextParameterResolver.java b/src/main/java/org/apache/sling/junit/jupiter/osgi/BundleContextParameterResolver.java
similarity index 86%
rename from src/main/java/org/apache/sling/junit/jupiter/osgi/impl/BundleContextParameterResolver.java
rename to src/main/java/org/apache/sling/junit/jupiter/osgi/BundleContextParameterResolver.java
index a77b747..13b5f6d 100644
--- a/src/main/java/org/apache/sling/junit/jupiter/osgi/impl/BundleContextParameterResolver.java
+++ b/src/main/java/org/apache/sling/junit/jupiter/osgi/BundleContextParameterResolver.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.junit.jupiter.osgi.impl;
+package org.apache.sling.junit.jupiter.osgi;
 
+import org.apache.sling.junit.jupiter.osgi.impl.TypeBasedParameterResolver;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.osgi.framework.BundleContext;
@@ -25,7 +26,7 @@ import org.osgi.framework.FrameworkUtil;
 
 import java.lang.reflect.Type;
 
-public class BundleContextParameterResolver extends TypeBasedParameterResolver<BundleContext> {
+class BundleContextParameterResolver extends TypeBasedParameterResolver<BundleContext> {
     @Override
     protected BundleContext resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext, Type resolvedParameterType) {
         return FrameworkUtil.getBundle(extensionContext.getRequiredTestClass()).getBundleContext();
diff --git a/src/main/java/org/apache/sling/junit/jupiter/osgi/impl/BundleParameterResolver.java b/src/main/java/org/apache/sling/junit/jupiter/osgi/BundleParameterResolver.java
similarity index 86%
rename from src/main/java/org/apache/sling/junit/jupiter/osgi/impl/BundleParameterResolver.java
rename to src/main/java/org/apache/sling/junit/jupiter/osgi/BundleParameterResolver.java
index 4bcc7e1..cde68f3 100644
--- a/src/main/java/org/apache/sling/junit/jupiter/osgi/impl/BundleParameterResolver.java
+++ b/src/main/java/org/apache/sling/junit/jupiter/osgi/BundleParameterResolver.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.junit.jupiter.osgi.impl;
+package org.apache.sling.junit.jupiter.osgi;
 
+import org.apache.sling.junit.jupiter.osgi.impl.TypeBasedParameterResolver;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.osgi.framework.Bundle;
@@ -25,7 +26,7 @@ import org.osgi.framework.FrameworkUtil;
 
 import java.lang.reflect.Type;
 
-public class BundleParameterResolver extends TypeBasedParameterResolver<Bundle> {
+class BundleParameterResolver extends TypeBasedParameterResolver<Bundle> {
     @Override
     protected Bundle resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext, Type resolvedParameterType) {
         return FrameworkUtil.getBundle(extensionContext.getRequiredTestClass());
diff --git a/src/main/java/org/apache/sling/junit/jupiter/osgi/OSGi.java b/src/main/java/org/apache/sling/junit/jupiter/osgi/OSGi.java
index f5a07ae..db8cd8f 100644
--- a/src/main/java/org/apache/sling/junit/jupiter/osgi/OSGi.java
+++ b/src/main/java/org/apache/sling/junit/jupiter/osgi/OSGi.java
@@ -18,9 +18,6 @@
  */
 package org.apache.sling.junit.jupiter.osgi;
 
-import org.apache.sling.junit.jupiter.osgi.impl.BundleContextParameterResolver;
-import org.apache.sling.junit.jupiter.osgi.impl.BundleParameterResolver;
-import org.apache.sling.junit.jupiter.osgi.impl.ServiceParameterResolver;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
diff --git a/src/main/java/org/apache/sling/junit/jupiter/osgi/impl/ServiceParameterResolver.java b/src/main/java/org/apache/sling/junit/jupiter/osgi/ServiceParameterResolver.java
similarity index 98%
rename from src/main/java/org/apache/sling/junit/jupiter/osgi/impl/ServiceParameterResolver.java
rename to src/main/java/org/apache/sling/junit/jupiter/osgi/ServiceParameterResolver.java
index 5c03252..f2addda 100644
--- a/src/main/java/org/apache/sling/junit/jupiter/osgi/impl/ServiceParameterResolver.java
+++ b/src/main/java/org/apache/sling/junit/jupiter/osgi/ServiceParameterResolver.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.junit.jupiter.osgi.impl;
+package org.apache.sling.junit.jupiter.osgi;
 
-import org.apache.sling.junit.jupiter.osgi.Service;
+import org.apache.sling.junit.jupiter.osgi.impl.AbstractTypeBasedParameterResolver;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -50,7 +50,7 @@ import java.util.stream.Stream;
 
 import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
 
-public class ServiceParameterResolver extends AbstractTypeBasedParameterResolver {
+class ServiceParameterResolver extends AbstractTypeBasedParameterResolver {
 
     private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(ServiceParameterResolver.class);