[sling-org-apache-sling-resourceresolver] branch feature/resource-provider-mode updated: Minor code clean up

[cziegeler]

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

cziegeler pushed a commit to branch feature/resource-provider-mode
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git


The following commit(s) were added to refs/heads/feature/resource-provider-mode 
by this push:
     new 738720d  Minor code clean up
738720d is described below

commit 738720df9dfcd60575d6eb467bc06d00155acc60
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Jun 15 07:22:09 2022 +0200

    Minor code clean up
---
 .../apache/sling/resourceresolver/impl/FactoryPreconditions.java | 1 +
 .../impl/console/ResourceResolverWebConsolePlugin.java           | 1 +
 .../resourceresolver/impl/providers/ResourceProviderInfo.java    | 9 ++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/FactoryPreconditions.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/FactoryPreconditions.java
index 3262805..4473142 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/FactoryPreconditions.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/FactoryPreconditions.java
@@ -110,6 +110,7 @@ public class FactoryPreconditions {
                             // ignore and continue
                             continue;
                         }
+                        @SuppressWarnings("rawtypes")
                         final ServiceReference ref = 
info.getServiceReference();
                         final Object servicePid = 
ref.getProperty(Constants.SERVICE_PID);
                         if ( unavailableServicePid != null && 
unavailableServicePid.equals(servicePid) ) {
diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/console/ResourceResolverWebConsolePlugin.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/console/ResourceResolverWebConsolePlugin.java
index 99d7276..7d440a1 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/console/ResourceResolverWebConsolePlugin.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/console/ResourceResolverWebConsolePlugin.java
@@ -395,6 +395,7 @@ public class ResourceResolverWebConsolePlugin extends 
HttpServlet {
         }
     }
 
+    @SuppressWarnings("rawtypes")
     private ServiceReference<ResourceProvider<?>> getServiceReference(final 
long id) {
         try {
             final Collection<ServiceReference<ResourceProvider>> refs = 
this.bundleContext.getServiceReferences(ResourceProvider.class,
diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
index 18320c7..495f433 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
@@ -44,7 +44,8 @@ public class ResourceProviderInfo implements 
Comparable<ResourceProviderInfo> {
 
     private static final Logger logger = 
LoggerFactory.getLogger(ResourceProviderInfo.class);
 
-    private final ServiceReference ref;
+    @SuppressWarnings("rawtypes")
+    private final ServiceReference<ResourceProvider> ref;
 
     private final String path;
 
@@ -64,7 +65,8 @@ public class ResourceProviderInfo implements 
Comparable<ResourceProviderInfo> {
 
     private final Mode mode;
 
-    public ResourceProviderInfo(final ServiceReference ref) {
+    @SuppressWarnings("rawtypes")
+    public ResourceProviderInfo(final ServiceReference<ResourceProvider> ref) {
         this.ref = ref;
         this.path = 
PropertiesUtil.toString(ref.getProperty(ResourceProvider.PROPERTY_ROOT), "");
         this.name = 
PropertiesUtil.toString(ref.getProperty(ResourceProvider.PROPERTY_NAME), null);
@@ -108,7 +110,8 @@ public class ResourceProviderInfo implements 
Comparable<ResourceProviderInfo> {
         return true;
     }
 
-    public ServiceReference getServiceReference() {
+    @SuppressWarnings("rawtypes")
+    public ServiceReference<ResourceProvider> getServiceReference() {
         return this.ref;
     }