Skip to content

Refactor config #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NonSwag wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Refactor config #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86c1ee5
Make config API more reusable
NonSwag Oct 25, 2026
7056e53
Migrate SimpleConfig to CustomConfig
NonSwag Oct 25, 2026
dd9d8b4
Move test assignment to build logic
NonSwag Oct 25, 2026
8b56f61
Introduce lenient properties file reader
NonSwag Nov 1, 2026
4955365
Add proper test suite for config
NonSwag Nov 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build-logic/src/main/kotlin/faststats.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ plugins {

group = "dev.faststats.metrics"

val libs = rootProject.the<VersionCatalogsExtension>().named("libs")

repositories {
mavenCentral()
}
Expand All @@ -31,6 +33,12 @@ sourceSets.main {
resources.srcDir(generateFastStatsProperties)
}

dependencies {
testImplementation(platform(libs.findLibrary("junit-bom").get()))
testImplementation("org.junit.jupiter:junit-jupiter")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks.test {
dependsOn(tasks.javadoc)
useJUnitPlatform()
Expand Down
6 changes: 3 additions & 3 deletions bukkit/src/main/java/dev/faststats/bukkit/BukkitContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import dev.faststats.SimpleContext;
import dev.faststats.Token;
import dev.faststats.config.SimpleConfig;
import dev.faststats.config.CustomConfig;
import dev.faststats.internal.LoggerFactory;
import dev.faststats.internal.PlatformLoggerFactory;
import org.bukkit.plugin.Plugin;
Expand All @@ -23,7 +23,7 @@ public final class BukkitContext extends SimpleContext {
private final Plugin plugin;

private BukkitContext(final Factory factory, final LoggerFactory loggerFactory, final Plugin plugin, @Token final String token) {
super(factory, loggerFactory, SimpleConfig.read(getConfigPath(plugin), loggerFactory), "bukkit", token);
super(factory, loggerFactory, CustomConfig.builder(getConfigPath(plugin), loggerFactory).build(), "bukkit", token);
this.plugin = plugin;
initializeServices(factory);
}
Expand Down Expand Up @@ -60,7 +60,7 @@ private static Path getPluginsFolder(final Plugin plugin) {

@Override
protected boolean preSubmissionStart() {
return ((SimpleConfig) getConfig()).preSubmissionStart(this);
return ((CustomConfig) getConfig()).preSubmissionStart(this);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions bungeecord/src/main/java/dev/faststats/bungee/BungeeContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import dev.faststats.SimpleContext;
import dev.faststats.SimpleMetrics;
import dev.faststats.Token;
import dev.faststats.config.SimpleConfig;
import dev.faststats.config.CustomConfig;
import dev.faststats.internal.LoggerFactory;
import dev.faststats.internal.PlatformLoggerFactory;
import net.md_5.bungee.api.plugin.Plugin;
Expand All @@ -25,9 +25,9 @@ public final class BungeeContext extends SimpleContext {
private final Plugin plugin;

private BungeeContext(final Factory factory, final LoggerFactory loggerFactory, final Plugin plugin, @Token final String token) {
super(factory, loggerFactory, SimpleConfig.read(plugin.getProxy().getPluginsFolder().toPath()
super(factory, loggerFactory, CustomConfig.builder(plugin.getProxy().getPluginsFolder().toPath()
.resolve("faststats").resolve("config.properties"), loggerFactory
), "bungeecord", token);
).build(), "bungeecord", token);
this.plugin = plugin;
initializeServices(factory);
}
Expand All @@ -45,7 +45,7 @@ public Metrics create() throws IllegalStateException {

@Override
protected boolean preSubmissionStart() {
return ((SimpleConfig) getConfig()).preSubmissionStart(this);
return ((CustomConfig) getConfig()).preSubmissionStart(this);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions config/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ tasks.compileJava {

dependencies {
compileOnly(project(":core"))

testImplementation(project(":core"))
}
Loading