[sling-org-apache-sling-junit-core] 01/05: SLING-9915 Refactored ServiceGetter.java and made public such that it can be used by AnnotationsProcessor.java

[cr...@apache.org]

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

cris pushed a commit to branch SLING-9915-Support-for-SlingAnnotationsTestRunner
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-core.git

commit 4945fd89e2e9beb99f409bc2274838db514c810f
Author: Cris Rockwell <cm...@umich.edu>
AuthorDate: Fri Nov 20 18:28:14 2020 -0500

    SLING-9915 Refactored ServiceGetter.java and made public such that it can be used by AnnotationsProcessor.java
---
 src/main/java/org/apache/sling/junit/{rules => }/ServiceGetter.java  | 4 ++--
 src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java | 1 +
 src/main/java/org/apache/sling/junit/rules/Service.java              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/junit/rules/ServiceGetter.java b/src/main/java/org/apache/sling/junit/ServiceGetter.java
similarity index 97%
rename from src/main/java/org/apache/sling/junit/rules/ServiceGetter.java
rename to src/main/java/org/apache/sling/junit/ServiceGetter.java
index d506db8..85a3851 100644
--- a/src/main/java/org/apache/sling/junit/rules/ServiceGetter.java
+++ b/src/main/java/org/apache/sling/junit/ServiceGetter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.sling.junit.rules;
+package org.apache.sling.junit;
 
 import java.io.Closeable;
 
@@ -27,7 +27,7 @@ import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.util.tracker.ServiceTracker;
 
 /** Implements the logic used to get a service */
-class ServiceGetter<T> implements Closeable {
+public class ServiceGetter<T> implements Closeable {
 
     private final ServiceTracker tracker;
     private final BundleContext bundleContext;
diff --git a/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java b/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
index 3de6538..dfd5964 100644
--- a/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
+++ b/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.sling.junit.Activator;
+import org.apache.sling.junit.ServiceGetter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/src/main/java/org/apache/sling/junit/rules/Service.java b/src/main/java/org/apache/sling/junit/rules/Service.java
index ba84c18..4d8b598 100644
--- a/src/main/java/org/apache/sling/junit/rules/Service.java
+++ b/src/main/java/org/apache/sling/junit/rules/Service.java
@@ -18,6 +18,7 @@
 package org.apache.sling.junit.rules;
 
 import org.apache.sling.junit.Activator;
+import org.apache.sling.junit.ServiceGetter;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;