SLING-12646: MapEntries: give doInit() a meaningful name
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 80556f0..5434a43 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
@@ -186,7 +186,7 @@
this.detectedConflictingAliases = new AtomicLong(0);
this.detectedInvalidAliases = new AtomicLong(0);
- this.useOptimizeAliasResolution = doInit();
+ this.useOptimizeAliasResolution = initializeAliases();
this.registration = registerResourceChangeListener(bundleContext);
@@ -234,7 +234,7 @@
* null-ed.
* @return true if the optimizedAliasResolution is enabled, false otherwise
*/
- protected boolean doInit() {
+ protected boolean initializeAliases() {
this.initializing.lock();
try {
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java
index f0fb4ec..912649b 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java
@@ -64,7 +64,7 @@
public void root_node_to_content_mapping() throws Exception {
setupEtcMapResource("localhost.8080", http,PROP_REDIRECT_EXTERNAL, "/content/simple-node");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping("^http/localhost.8080/", "/content/simple-node/");
expectedEtcMapping.assertEtcMap("Etc Mapping for simple node", mapEntries.getResolveMaps());
}
@@ -76,7 +76,7 @@
PROP_REDIRECT_EXTERNAL, "/content/simple-match/"
);
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping("^http/localhost.8080/", "/content/simple-match/");
expectedEtcMapping.assertEtcMap("Etc Mapping for simple match", mapEntries.getResolveMaps());
}
@@ -87,7 +87,7 @@
public void internal_to_external_node_mapping() throws Exception {
setupEtcMapResource("example.com.80", http,PROP_REDIRECT_EXTERNAL, "http://www.example.com/");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping("^http/example.com.80/", "http://www.example.com/");
expectedEtcMapping.assertEtcMap("Etc Mapping for internal to external based on node", mapEntries.getResolveMaps());
}
@@ -96,7 +96,7 @@
public void internal_root_to_content_node_mapping() throws Exception {
setupEtcMapResource("www.example.com.80", http,PROP_REDIRECT_INTERNAL, "/example");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping().addEtcMapEntry("^http/www.example.com.80/", true, "/example/");
expectedEtcMapping.assertEtcMap("Etc Mapping for internal root to content", mapEntries.getResolveMaps());
}
@@ -108,7 +108,7 @@
PROP_REDIRECT_EXTERNAL, "http://www.example.com/"
);
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping().addEtcMapEntry("^http/.+\\.example\\.com\\.80", false, "http://www.example.com/");
expectedEtcMapping.assertEtcMap("Etc Mapping for host redirect match mapping", mapEntries.getResolveMaps());
}
@@ -123,7 +123,7 @@
setupEtcMapResource("gateway", localhost, PROP_REDIRECT_INTERNAL, "http://gbiv.com");
setupEtcMapResource("(stories)", localhost, PROP_REDIRECT_INTERNAL, "/anecdotes/$1");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping()
.addEtcMapEntry("^http/localhost\\.\\d*", true, "/content")
.addEtcMapEntry("^http/localhost\\.\\d*/cgi-bin/", true, "/scripts/")
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
index 4ab7aae..ffc5c27 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
@@ -136,7 +136,7 @@
private void internal_test_simple_alias_support(boolean onJcrContent) {
prepareMapEntriesForAlias(onJcrContent, false, "alias");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
Map<String, Collection<String>> aliasMap = mapEntries.getAliasMap("/parent");
assertNotNull(aliasMap);
assertTrue(aliasMap.containsKey("child"));
@@ -155,7 +155,7 @@
private void internal_test_simple_multi_alias_support(boolean onJcrContent) {
prepareMapEntriesForAlias(onJcrContent, false, "foo", "bar");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
Map<String, Collection<String>> aliasMap = mapEntries.getAliasMap("/parent");
assertNotNull(aliasMap);
assertTrue(aliasMap.containsKey("child"));
@@ -176,7 +176,7 @@
public void test_simple_multi_alias_support_with_null_parent() {
// see SLING-12383
prepareMapEntriesForAlias(true, true, "foo", "bar");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
Map<String, Collection<String>> aliasMap = mapEntries.getAliasMap("/parent");
assertNotNull(aliasMap);
assertFalse(aliasMap.containsKey("child"));
@@ -186,7 +186,7 @@
public void test_simple_multi_alias_support_with_blank_and_invalid() {
// invalid aliases filtered out
prepareMapEntriesForAlias(false, false, "", "foo", ".", "bar", "x/y", "qux", " ");
- mapEntries.doInit();
+ mapEntries.initializeAliases();
Map<String, Collection<String>> aliasMap = mapEntries.getAliasMap("/parent");
assertNotNull(aliasMap);
assertTrue(aliasMap.containsKey("child"));
@@ -199,7 +199,7 @@
List<String> invalidAliases = List.of(".", "..", "foo/bar", "# foo", "");
for (String invalidAlias : invalidAliases) {
prepareMapEntriesForAlias(false, false, invalidAlias);
- mapEntries.doInit();
+ mapEntries.initializeAliases();
Map<String, Collection<String>> aliasMap = mapEntries.getAliasMap("/parent");
assertEquals(Collections.emptyMap(), aliasMap);
}
@@ -258,7 +258,7 @@
}
});
- mapEntries.doInit();
+ mapEntries.initializeAliases();
Map<String, Collection<String>> aliasMap = mapEntries.getAliasMap("/parent");
assertNotNull(aliasMap);
@@ -1275,6 +1275,6 @@
return Collections.emptyIterator();
});
- mapEntries.doInit();
+ mapEntries.initializeAliases();
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationMapEntriesTest.java
index 9f04b6f..eaf5175 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationMapEntriesTest.java
@@ -35,7 +35,7 @@
Resource sivOne = setupEtcMapResource("$[config:siv.one]", http,PROP_REDIRECT_EXTERNAL, "/content/simple-node");
setupStringInterpolationProvider(stringInterpolationProvider, stringInterpolationProviderConfiguration, new String[] {"siv.one=test-simple-node"});
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping("^http/test-simple-node/", "/content/simple-node/");
expectedEtcMapping.assertEtcMap("String Interpolation for simple match", mapEntries.getResolveMaps());
}
@@ -49,7 +49,7 @@
);
setupStringInterpolationProvider(stringInterpolationProvider, stringInterpolationProviderConfiguration, new String[] {"siv.one=test-simple-match"});
- mapEntries.doInit();
+ mapEntries.initializeAliases();
ExpectedEtcMapping expectedEtcMapping = new ExpectedEtcMapping("^http/test-simple-match/", "/content/simple-match/");
expectedEtcMapping.assertEtcMap("String Interpolation for simple match", mapEntries.getResolveMaps());
}
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/VanityPathMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/VanityPathMapEntriesTest.java
index 80ce93f..0b3891f 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/VanityPathMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/VanityPathMapEntriesTest.java
@@ -1253,7 +1253,7 @@
mapEntries = new MapEntries(resourceResolverFactory, bundleContext, eventAdmin, stringInterpolationProvider, metrics);
- mapEntries.doInit();
+ mapEntries.initializeAliases();
}
// utilities for testing vanity path queries
