[sling-org-apache-sling-resourceresolver] branch master updated: SLING-11388 : Sort all resource providers by service reference

[cziegeler]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 60c1a65  SLING-11388 : Sort all resource providers by service reference
60c1a65 is described below

commit 60c1a65a7cb46a859b3dff0c2727a6f63893e584
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Jun 11 14:11:44 2022 +0200

    SLING-11388 : Sort all resource providers by service reference
---
 .../resourceresolver/impl/providers/ResourceProviderStorage.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java
index 4d59966..0ec0c9b 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java
@@ -68,7 +68,8 @@ public class ResourceProviderStorage {
                 this.languageQueryableHandlers.add(h);
             }
         }
-        Collections.sort(this.adaptableHandlers, new 
Comparator<ResourceProviderHandler>() {
+        // sort all lists for consistency
+        final Comparator<ResourceProviderHandler> comp = new 
Comparator<ResourceProviderHandler>() {
 
             @Override
             public int compare(final ResourceProviderHandler o1, final 
ResourceProviderHandler o2) {
@@ -82,7 +83,11 @@ public class ResourceProviderStorage {
                 }
                 return 
i2.getServiceReference().compareTo(i1.getServiceReference());
             }
-        });
+        };
+        Collections.sort(this.authRequiredHandlers, comp);
+        Collections.sort(this.adaptableHandlers, comp);
+        Collections.sort(this.attributableHandlers, comp);
+        Collections.sort(this.languageQueryableHandlers, comp);
         this.handlersTree = new PathTree<>(handlers);
     }