diff options
Diffstat (limited to 'src/main/java/moe/nea/prickly/config')
4 files changed, 13 insertions, 21 deletions
diff --git a/src/main/java/moe/nea/prickly/config/Config.java b/src/main/java/moe/nea/prickly/config/Config.java index 4c6e533..8905134 100644 --- a/src/main/java/moe/nea/prickly/config/Config.java +++ b/src/main/java/moe/nea/prickly/config/Config.java @@ -1,11 +1,8 @@ +/* (C) 2025 Linnea Gräf - Licensed to everyone under the BSD 3 Clause License */ package moe.nea.prickly.config; -import java.util.function.Supplier; - public class Config { - private static ConfigPath - ROOT = new ConfigPath("PRICKLY"), - NET = ROOT.join("NET"); + private static ConfigPath ROOT = new ConfigPath("PRICKLY"), NET = ROOT.join("NET"); public static int PORT = NET.join("PORT").requireInt(); public static String HOST = NET.join("HOST").getString().orElse("0"); } diff --git a/src/main/java/moe/nea/prickly/config/ConfigCompat.java b/src/main/java/moe/nea/prickly/config/ConfigCompat.java index 38291c5..d574759 100644 --- a/src/main/java/moe/nea/prickly/config/ConfigCompat.java +++ b/src/main/java/moe/nea/prickly/config/ConfigCompat.java @@ -1,14 +1,14 @@ +/* (C) 2025 Linnea Gräf - Licensed to everyone under the BSD 3 Clause License */ package moe.nea.prickly.config; -import lombok.extern.slf4j.Slf4j; -import org.jspecify.annotations.Nullable; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; import java.util.Properties; +import lombok.extern.slf4j.Slf4j; +import org.jspecify.annotations.Nullable; @Slf4j public class ConfigCompat { @@ -34,8 +34,7 @@ public class ConfigCompat { public static @Nullable String getEnv(String key) { var value = System.getenv(key); - if (value != null) - return value; + if (value != null) return value; return DOTENV_FALLBACK.get(key); } } diff --git a/src/main/java/moe/nea/prickly/config/ConfigPath.java b/src/main/java/moe/nea/prickly/config/ConfigPath.java index 3311910..e5c8077 100644 --- a/src/main/java/moe/nea/prickly/config/ConfigPath.java +++ b/src/main/java/moe/nea/prickly/config/ConfigPath.java @@ -1,9 +1,9 @@ +/* (C) 2025 Linnea Gräf - Licensed to everyone under the BSD 3 Clause License */ package moe.nea.prickly.config; -import lombok.extern.slf4j.Slf4j; - import java.util.Optional; import java.util.function.Supplier; +import lombok.extern.slf4j.Slf4j; @Slf4j public record ConfigPath(String path) { @@ -30,18 +30,14 @@ public record ConfigPath(String path) { var str = getString(); if (str.isPresent()) { var sstr = str.get(); - if (sstr.equalsIgnoreCase("true") || sstr.equals("1")) - return OPT_TRUE; - else if (sstr.equalsIgnoreCase("false") || sstr.equals("0")) - return OPT_FALSE; - else - log.warn("could not parse boolean value at {}", path); + if (sstr.equalsIgnoreCase("true") || sstr.equals("1")) return OPT_TRUE; + else if (sstr.equalsIgnoreCase("false") || sstr.equals("0")) return OPT_FALSE; + else log.warn("could not parse boolean value at {}", path); } return Optional.empty(); } - private static final Optional<Boolean> OPT_TRUE = Optional.of(true), - OPT_FALSE = Optional.of(false); + private static final Optional<Boolean> OPT_TRUE = Optional.of(true), OPT_FALSE = Optional.of(false); public Supplier<RuntimeException> requireMessage() { return () -> new RuntimeException("missing required value at path " + path()); diff --git a/src/main/java/moe/nea/prickly/config/package-info.java b/src/main/java/moe/nea/prickly/config/package-info.java index 06b9251..344aec9 100644 --- a/src/main/java/moe/nea/prickly/config/package-info.java +++ b/src/main/java/moe/nea/prickly/config/package-info.java @@ -1,4 +1,4 @@ @NullMarked package moe.nea.prickly.config; -import org.jspecify.annotations.NullMarked;
\ No newline at end of file +import org.jspecify.annotations.NullMarked; |