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 303560c Some code cleanup
303560c is described below
commit 303560c13b3806b621ac13d229185fc312578ab7
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Jun 14 18:29:38 2022 +0200
Some code cleanup
---
.../impl/CommonResourceResolverFactoryImpl.java | 4 ++--
.../impl/ResourceResolverFactoryActivator.java | 6 +++---
.../impl/helper/ResourceDecoratorTracker.java | 3 ++-
.../impl/mapping/MapConfigurationProvider.java | 4 ++--
.../sling/resourceresolver/impl/mapping/MapEntries.java | 16 ++++++++--------
.../impl/helper/ResourceResolverControlTest.java | 1 -
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
b/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
index c677104..43d2683 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
* implementing the shared/common functionality of all resource
* resolver factories.
*/
-public class CommonResourceResolverFactoryImpl implements
ResourceResolverFactory, MapConfigurationProvider {
+public class CommonResourceResolverFactoryImpl implements
MapConfigurationProvider {
private static final Logger LOG =
LoggerFactory.getLogger(CommonResourceResolverFactoryImpl.class);
@@ -382,7 +382,7 @@ public class CommonResourceResolverFactoryImpl implements
ResourceResolverFactor
}
@Override
- public BidiMap getVirtualURLMap() {
+ public BidiMap<String, String> getVirtualURLMap() {
return this.activator.getVirtualURLMap();
}
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
index 021c15a..9e727c7 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
@@ -90,7 +90,7 @@ public class ResourceResolverFactoryActivator {
private volatile Mapping[] mappings;
/** The fake URLs */
- private volatile BidiMap virtualURLMap;
+ private volatile BidiMap<String, String> virtualURLMap;
/** the search path for ResourceResolver.getResource(String) */
private volatile List<String> searchPath = Collections.emptyList();
@@ -171,7 +171,7 @@ public class ResourceResolverFactoryActivator {
/**
* This method is called from {@link MapEntries}
*/
- public BidiMap getVirtualURLMap() {
+ public BidiMap<String, String> getVirtualURLMap() {
return virtualURLMap;
}
@@ -266,7 +266,7 @@ public class ResourceResolverFactoryActivator {
this.bundleContext = bundleContext;
this.config = config;
- final BidiMap virtuals = new TreeBidiMap();
+ final BidiMap<String, String> virtuals = new TreeBidiMap<>();
for (int i = 0; config.resource_resolver_virtual() != null && i <
config.resource_resolver_virtual().length; i++) {
final String[] parts =
Mapping.split(config.resource_resolver_virtual()[i]);
virtuals.put(parts[0], parts[2]);
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceDecoratorTracker.java
b/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceDecoratorTracker.java
index 6a1e881..727a3bd 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceDecoratorTracker.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceDecoratorTracker.java
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceDecorator;
+import org.apache.sling.commons.osgi.Order;
import org.apache.sling.commons.osgi.ServiceUtil;
/**
@@ -84,7 +85,7 @@ public class ResourceDecoratorTracker {
final Map<String, Object> props) {
synchronized (this.resourceDecorators) {
this.resourceDecorators.add(new ResourceDecoratorEntry(decorator,
- ServiceUtil.getComparableForServiceRanking(props)));
+ ServiceUtil.getComparableForServiceRanking(props,
Order.ASCENDING)));
Collections.sort(this.resourceDecorators);
updateResourceDecoratorsArray();
}
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
index d549cf6..d5ab6bd 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
@@ -39,7 +39,7 @@ public interface MapConfigurationProvider extends
ResourceResolverFactory {
Path[] getObservationPaths();
- Map<?, ?> getVirtualURLMap();
+ Map<String, String> getVirtualURLMap();
Mapping[] getMappings();
@@ -72,7 +72,7 @@ public interface MapConfigurationProvider extends
ResourceResolverFactory {
@Override
public int compareTo(VanityPathConfig o2) {
- return new
Integer(o2.prefix.length()).compareTo(this.prefix.length());
+ return
Integer.valueOf(o2.prefix.length()).compareTo(this.prefix.length());
}
}
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 7f9ffc7..05d0598 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -1408,11 +1408,11 @@ public class MapEntries implements
private void loadConfiguration(final MapConfigurationProvider factory,
final List<MapEntry> entries) {
// virtual uris
- final Map<?, ?> virtuals = factory.getVirtualURLMap();
+ final Map<String, String> virtuals = factory.getVirtualURLMap();
if (virtuals != null) {
- for (final Entry<?, ?> virtualEntry : virtuals.entrySet()) {
- final String extPath = (String) virtualEntry.getKey();
- final String intPath = (String) virtualEntry.getValue();
+ for (final Entry<String, String> virtualEntry :
virtuals.entrySet()) {
+ final String extPath = virtualEntry.getKey();
+ final String intPath = virtualEntry.getValue();
if (!extPath.equals(intPath)) {
// this regular expression must match the whole URL !!
final String url = "^" + ANY_SCHEME_HOST + extPath + "$";
@@ -1470,11 +1470,11 @@ public class MapEntries implements
}
// virtual uris
- final Map<?, ?> virtuals = factory.getVirtualURLMap();
+ final Map<String, String> virtuals = factory.getVirtualURLMap();
if (virtuals != null) {
- for (final Entry<?, ?> virtualEntry : virtuals.entrySet()) {
- final String extPath = (String) virtualEntry.getKey();
- final String intPath = (String) virtualEntry.getValue();
+ for (final Entry<String, String> virtualEntry :
virtuals.entrySet()) {
+ final String extPath = virtualEntry.getKey();
+ final String intPath = virtualEntry.getValue();
if (!extPath.equals(intPath)) {
// this regular expression must match the whole URL !!
final String path = "^" + intPath + "$";
diff --git
a/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
b/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
index 8d7e362..c99aa54 100644
---
a/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
+++
b/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.sling.resourceresolver.impl.helper;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
