chore: tidying and no-prefix value source overload

Author: zml2008

src/main/java/net/kyori/option/Option.java

@@ -38,7 +38,6 @@
  */
 @ApiStatus.NonExtendable
 public interface Option<V> {
-
   /**
    * Create an option with a boolean value type.
    *

src/main/java/net/kyori/option/value/ValueSource.java

@@ -34,6 +34,18 @@
  */
 @FunctionalInterface
 public interface ValueSource {
+  /**
+   * A value source that will extract option values from environment variables.
+   *
+   * <p>Any of the characters {@code :}, {@code /}, and {@code -} will be replaced with {@code _}.</p>
+   *
+   * @return an environment variable-backed value source with no prefix
+   * @since 1.1.0
+   */
+  static @NotNull ValueSource environmentVariable() {
+    return environmentVariable("");
+  }
+
   /**
    * A value source that will extract option values from environment variables.
    *
@@ -45,7 +57,19 @@ public interface ValueSource {
    * @since 1.1.0
    */
   static @NotNull ValueSource environmentVariable(final @NotNull String prefix) {
-    return new ValueSources.EnvironmentVariables(prefix);
+    return new ValueSources.EnvironmentVariable(prefix);
+  }
+
+  /**
+   * A value source that will extract option values from system properties.
+   *
+   * <p>Any of the characters {@code :} and {@code /} will be replaced with {@code .}.</p>
+   *
+   * @return a system property-backed value source with no prefix
+   * @since 1.1.0
+   */
+  static @NotNull ValueSource systemProperty() {
+    return systemProperty("");
   }
 
   /**
@@ -59,7 +83,7 @@ public interface ValueSource {
    * @since 1.1.0
    */
   static @NotNull ValueSource systemProperty(final @NotNull String prefix) {
-    return new ValueSources.SystemProperties(prefix);
+    return new ValueSources.SystemProperty(prefix);
   }
 
   /**

src/main/java/net/kyori/option/value/ValueSources.java

@@ -31,19 +31,19 @@
 import org.jetbrains.annotations.Nullable;
 
 final class ValueSources {
-  static final ValueSource ENVIRONMENT = new EnvironmentVariables("");
-  static final ValueSource SYSTEM_PROPERTIES = new SystemProperties("");
+  static final ValueSource ENVIRONMENT = new EnvironmentVariable("");
+  static final ValueSource SYSTEM_PROPERTIES = new SystemProperty("");
 
   private ValueSources() {
   }
 
-  static final class EnvironmentVariables implements ValueSource {
+  static final class EnvironmentVariable implements ValueSource {
     private static final Pattern ENVIRONMENT_SUBST_PATTERN = Pattern.compile("[:\\-/]");
     private static final String ENVIRONMENT_VAR_SEPARATOR = "_";
 
     private final String prefix;
 
-    EnvironmentVariables(final String prefix) {
+    EnvironmentVariable(final String prefix) {
       this.prefix = prefix.isEmpty() ? "" : prefix.toUpperCase(Locale.ROOT) + ENVIRONMENT_VAR_SEPARATOR;
     }
 
@@ -66,13 +66,13 @@ static final class EnvironmentVariables implements ValueSource {
     }
   }
 
-  static final class SystemProperties implements ValueSource {
+  static final class SystemProperty implements ValueSource {
     private static final Pattern SYSTEM_PROP_SUBST_PATTERN = Pattern.compile("[:/]");
     private static final String SYSTEM_PROPERTY_SEPARATOR = ".";
 
     private final String prefix;
 
-    SystemProperties(final String prefix) {
+    SystemProperty(final String prefix) {
       this.prefix = prefix.isEmpty() ? "" : prefix + SYSTEM_PROPERTY_SEPARATOR;
     }
 

src/test/java/net/kyori/option/value/ValueSourceTest.java

@@ -59,7 +59,7 @@ void testReadSystemProperties() {
 
   @Test
   void testReadSystemPropertiesNoPrefix() {
-    final ValueSource systemProperties = ValueSource.systemProperty("");
+    final ValueSource systemProperties = ValueSource.systemProperty();
     assertNull(systemProperties.value(C));
     assertNull(systemProperties.value(C_D));