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-i18n.git
The following commit(s) were added to refs/heads/master by this push:
new b57c947 Remove unused constructor
b57c947 is described below
commit b57c947e842955356ce4c3a5c981ceae2476da5a
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Dec 28 13:31:57 2022 +0100
Remove unused constructor
---
.../apache/sling/i18n/impl/JcrResourceBundle.java | 5 ----
.../sling/i18n/impl/JcrResourceBundleTest.java | 30 +++++++++++-----------
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
index e884e31..ee0fcd2 100644
--- a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
+++ b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
@@ -74,11 +74,6 @@ public class JcrResourceBundle extends ResourceBundle {
private final Set<String> languageRoots = new HashSet<>();
- JcrResourceBundle(final Locale locale, final String baseName,
- final ResourceResolver resourceResolver) {
- this(locale, baseName, resourceResolver,
Collections.<LocatorPaths>emptyList());
- }
-
JcrResourceBundle(final Locale locale, final String baseName,
final ResourceResolver resourceResolver, List<LocatorPaths>
locatorPaths) {
this.locale = locale;
diff --git
a/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
b/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
index c23d539..a737f86 100644
--- a/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
+++ b/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
@@ -470,29 +470,29 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
// ---------------------------------------------------------------< tests >
public void test_getString() {
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
for (Message msg : MESSAGES_DE.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
- bundle = new JcrResourceBundle(new Locale("en", "us"), null, resolver);
+ bundle = new JcrResourceBundle(new Locale("en", "us"), null, resolver,
null);
for (Message msg : MESSAGES_EN_DASH_US.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
- bundle = new JcrResourceBundle(new Locale("en", "uk"), null, resolver);
+ bundle = new JcrResourceBundle(new Locale("en", "uk"), null, resolver,
null);
for (Message msg : MESSAGES_EN_UNDERSCORE_UK.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
- bundle = new JcrResourceBundle(new Locale("en", "au"), null, resolver);
+ bundle = new JcrResourceBundle(new Locale("en", "au"), null, resolver,
null);
for (Message msg : MESSAGES_EN_UNDERSCORE_AU.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
}
public void test_getObject() {
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
for (Message msg : MESSAGES_DE.values()) {
assertEquals(msg.message, (String) bundle.getObject(msg.key));
}
@@ -500,13 +500,13 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
public void test_handle_missing_key() {
// test if key is returned if no entry found in repo
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
bundle.setParent(new RootResourceBundle());
assertEquals("missing", bundle.getString("missing"));
}
public void test_getKeys() {
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
Enumeration<String> keys = bundle.getKeys();
int counter = 0;
while (keys.hasMoreElements()) {
@@ -519,8 +519,8 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
public void test_bundle_parenting() {
// set parent of resource bundle, test if passed through
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
- JcrResourceBundle parentBundle = new JcrResourceBundle(new
Locale("en"), null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
+ JcrResourceBundle parentBundle = new JcrResourceBundle(new
Locale("en"), null, resolver, null);
bundle.setParent(parentBundle);
parentBundle.setParent(new RootResourceBundle());
@@ -540,7 +540,7 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
getSession().save();
// test getString
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
for (Message msg : MESSAGES_DE_APPS.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
@@ -571,7 +571,7 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
getSession().save();
// test if /content dictionary is read at all
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
for (Message msg : MESSAGES_DE.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
@@ -587,7 +587,7 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
getSession().save();
// test if /libs (something in the search path) overlays /content
(outside the search path)
- bundle = new JcrResourceBundle(new Locale("de"), null, resolver);
+ bundle = new JcrResourceBundle(new Locale("de"), null, resolver, null);
for (Message msg : MESSAGES_DE_APPS.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
@@ -616,13 +616,13 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
getSession().save();
// test getString
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
"FOO", resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
"FOO", resolver, null);
for (Message msg : MESSAGES_DE_BASENAME.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
// test getString
- bundle = new JcrResourceBundle(new Locale("de"), "BAR", resolver);
+ bundle = new JcrResourceBundle(new Locale("de"), "BAR", resolver,
null);
for (Message msg : MESSAGES_DE_BASENAME.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
@@ -661,7 +661,7 @@ public class JcrResourceBundleTest extends
RepositoryTestBase {
getSession().save();
// test getString
- JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver);
+ JcrResourceBundle bundle = new JcrResourceBundle(new Locale("de"),
null, resolver, null);
for (Message msg : MESSAGES_DE_APPS.values()) {
assertEquals(msg.message, bundle.getString(msg.key));
}
