This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
The following commit(s) were added to refs/heads/master by this push:
new beb583ff Better package-private class name
new 486d6505 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-text.git
beb583ff is described below
commit beb583fff676cfb271d4aeadaadacaf777674180
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Sep 19 10:29:59 2024 -0400
Better package-private class name
---
...lHostStringLookup.java => InetAddressStringLookup.java} | 11 +++++++----
.../apache/commons/text/lookup/StringLookupFactory.java | 2 +-
.../commons/text/lookup/LocalHostStringLookupTest.java | 14 +++++++-------
.../commons/text/lookup/StringLookupFactoryTest.java | 2 +-
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git
a/src/main/java/org/apache/commons/text/lookup/LocalHostStringLookup.java
b/src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java
similarity index 87%
rename from
src/main/java/org/apache/commons/text/lookup/LocalHostStringLookup.java
rename to
src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java
index 20271adb..797caa20 100644
--- a/src/main/java/org/apache/commons/text/lookup/LocalHostStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java
@@ -20,7 +20,10 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
/**
- * Looks up keys related to the local host: host name, canonical host name,
host address.
+ * Looks up keys related to an {@link InetAddresse}.
+ * <ul>
+ * <li>local host: host name, canonical host name, host address.</li>
+ * </ul>
* <p>
* The lookup keys are:
* </p>
@@ -32,17 +35,17 @@ import java.net.UnknownHostException;
*
* @since 1.3
*/
-final class LocalHostStringLookup extends AbstractStringLookup {
+final class InetAddressStringLookup extends AbstractStringLookup {
/**
* Defines the singleton for this class.
*/
- static final LocalHostStringLookup INSTANCE = new LocalHostStringLookup();
+ static final InetAddressStringLookup INSTANCE = new
InetAddressStringLookup();
/**
* No need to build instances for now.
*/
- private LocalHostStringLookup() {
+ private InetAddressStringLookup() {
// empty
}
diff --git
a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
index 893a9e8a..995be76b 100644
--- a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
+++ b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java
@@ -1112,7 +1112,7 @@ public final class StringLookupFactory {
* @return The DateStringLookup singleton instance.
*/
public StringLookup localHostStringLookup() {
- return LocalHostStringLookup.INSTANCE;
+ return InetAddressStringLookup.INSTANCE;
}
/**
diff --git
a/src/test/java/org/apache/commons/text/lookup/LocalHostStringLookupTest.java
b/src/test/java/org/apache/commons/text/lookup/LocalHostStringLookupTest.java
index df65a6ca..ddb64e32 100644
---
a/src/test/java/org/apache/commons/text/lookup/LocalHostStringLookupTest.java
+++
b/src/test/java/org/apache/commons/text/lookup/LocalHostStringLookupTest.java
@@ -24,42 +24,42 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
- * Tests {@link LocalHostStringLookup}.
+ * Tests {@link InetAddressStringLookup}.
*/
public class LocalHostStringLookupTest {
@Test
public void testAddress() throws UnknownHostException {
Assertions.assertEquals(InetAddress.getLocalHost().getHostAddress(),
- LocalHostStringLookup.INSTANCE.lookup("address"));
+ InetAddressStringLookup.INSTANCE.lookup("address"));
}
@Test
public void testBadKey() {
- Assertions.assertThrows(IllegalArgumentException.class, () ->
LocalHostStringLookup.INSTANCE.lookup("FOO"));
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
InetAddressStringLookup.INSTANCE.lookup("FOO"));
}
@Test
public void testCanonicalName() throws UnknownHostException {
Assertions.assertEquals(InetAddress.getLocalHost().getCanonicalHostName(),
- LocalHostStringLookup.INSTANCE.lookup("canonical-name"));
+ InetAddressStringLookup.INSTANCE.lookup("canonical-name"));
}
@Test
public void testName() throws UnknownHostException {
Assertions.assertEquals(InetAddress.getLocalHost().getHostName(),
- LocalHostStringLookup.INSTANCE.lookup("name"));
+ InetAddressStringLookup.INSTANCE.lookup("name"));
}
@Test
public void testNull() {
- Assertions.assertNull(LocalHostStringLookup.INSTANCE.lookup(null));
+ Assertions.assertNull(InetAddressStringLookup.INSTANCE.lookup(null));
}
@Test
public void testToString() {
// does not blow up and gives some kind of string.
-
Assertions.assertFalse(LocalHostStringLookup.INSTANCE.toString().isEmpty());
+
Assertions.assertFalse(InetAddressStringLookup.INSTANCE.toString().isEmpty());
}
}
diff --git
a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java
b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java
index 1c00bf19..8f29fc7a 100644
--- a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java
+++ b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java
@@ -223,7 +223,7 @@ public class StringLookupFactoryTest {
stringLookupFactory.environmentVariableStringLookup());
Assertions.assertSame(InterpolatorStringLookup.INSTANCE,
stringLookupFactory.interpolatorStringLookup());
Assertions.assertSame(JavaPlatformStringLookup.INSTANCE,
stringLookupFactory.javaPlatformStringLookup());
- Assertions.assertSame(LocalHostStringLookup.INSTANCE,
stringLookupFactory.localHostStringLookup());
+ Assertions.assertSame(InetAddressStringLookup.INSTANCE,
stringLookupFactory.localHostStringLookup());
Assertions.assertSame(StringLookupFactory.INSTANCE_NULL,
stringLookupFactory.nullStringLookup());
Assertions.assertSame(ResourceBundleStringLookup.INSTANCE,
stringLookupFactory.resourceBundleStringLookup());
Assertions.assertSame(ScriptStringLookup.INSTANCE,
stringLookupFactory.scriptStringLookup());
