Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

[core] rename setup phase 'ready' to 'initialized'

Browse Source
This commit is contained in:
Siphalor
2025-06-13 00:56:00 +02:00
parent 2096ae540c
commit 694f993b8c
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tweed5-core/src/main/java/de/siphalor/tweed5/core/api/container/ConfigContainer.java
View File

@@ -20,6 +20,8 @@ public interface ConfigContainer<T> {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
TweedConstructFactory<ConfigContainer> FACTORY = TweedConstructFactory.builder(ConfigContainer.class).build(); TweedConstructFactory<ConfigContainer> FACTORY = TweedConstructFactory.builder(ConfigContainer.class).build();
ConfigContainerSetupPhase setupPhase();
default void registerExtensions(Class<? extends TweedExtension>... extensionClasses) { default void registerExtensions(Class<? extends TweedExtension>... extensionClasses) {
for (Class<? extends TweedExtension> extensionClass : extensionClasses) { for (Class<? extends TweedExtension> extensionClass : extensionClasses) {
registerExtension(extensionClass); registerExtension(extensionClass);

2
tweed5-core/src/main/java/de/siphalor/tweed5/core/api/container/ConfigContainerSetupPhase.java
View File

@@ -4,5 +4,5 @@ public enum ConfigContainerSetupPhase {
EXTENSIONS_SETUP, EXTENSIONS_SETUP,
TREE_SETUP, TREE_SETUP,
TREE_ATTACHED, TREE_ATTACHED,
READY, INITIALIZED,
} }

10
tweed5-core/src/main/java/de/siphalor/tweed5/core/impl/DefaultConfigContainer.java
View File

@@ -201,7 +201,7 @@ public class DefaultConfigContainer<T> implements ConfigContainer<T> {
requireSetupPhase( requireSetupPhase(
ConfigContainerSetupPhase.TREE_SETUP, ConfigContainerSetupPhase.TREE_SETUP,
ConfigContainerSetupPhase.TREE_ATTACHED, ConfigContainerSetupPhase.TREE_ATTACHED,
ConfigContainerSetupPhase.READY ConfigContainerSetupPhase.INITIALIZED
); );
try { try {
return Optional.ofNullable(extensions.getSingleInstance(extensionClass)); return Optional.ofNullable(extensions.getSingleInstance(extensionClass));
@@ -215,7 +215,7 @@ public class DefaultConfigContainer<T> implements ConfigContainer<T> {
requireSetupPhase( requireSetupPhase(
ConfigContainerSetupPhase.TREE_SETUP, ConfigContainerSetupPhase.TREE_SETUP,
ConfigContainerSetupPhase.TREE_ATTACHED, ConfigContainerSetupPhase.TREE_ATTACHED,
ConfigContainerSetupPhase.READY ConfigContainerSetupPhase.INITIALIZED
); );
return Collections.unmodifiableCollection(extensions.values()); return Collections.unmodifiableCollection(extensions.values());
} }
@@ -246,7 +246,7 @@ public class DefaultConfigContainer<T> implements ConfigContainer<T> {
requireSetupPhase( requireSetupPhase(
ConfigContainerSetupPhase.TREE_SETUP, ConfigContainerSetupPhase.TREE_SETUP,
ConfigContainerSetupPhase.TREE_ATTACHED, ConfigContainerSetupPhase.TREE_ATTACHED,
ConfigContainerSetupPhase.READY ConfigContainerSetupPhase.INITIALIZED
); );
return registeredEntryDataExtensions; return registeredEntryDataExtensions;
} }
@@ -262,12 +262,12 @@ public class DefaultConfigContainer<T> implements ConfigContainer<T> {
} }
}); });
setupPhase = ConfigContainerSetupPhase.READY; setupPhase = ConfigContainerSetupPhase.INITIALIZED;
} }
@Override @Override
public ConfigEntry<T> rootEntry() { public ConfigEntry<T> rootEntry() {
requireSetupPhase(ConfigContainerSetupPhase.TREE_ATTACHED, ConfigContainerSetupPhase.READY); requireSetupPhase(ConfigContainerSetupPhase.TREE_ATTACHED, ConfigContainerSetupPhase.INITIALIZED);
assert rootEntry != null; assert rootEntry != null;
return rootEntry; return rootEntry;

2
tweed5-core/src/test/java/de/siphalor/tweed5/core/impl/DefaultConfigContainerTest.java
View File

@@ -173,7 +173,7 @@ class DefaultConfigContainerTest {
assertThat(configContainer.setupPhase()).isEqualTo(ConfigContainerSetupPhase.TREE_ATTACHED); assertThat(configContainer.setupPhase()).isEqualTo(ConfigContainerSetupPhase.TREE_ATTACHED);
configContainer.initialize(); configContainer.initialize();
assertThat(configContainer.setupPhase()).isEqualTo(ConfigContainerSetupPhase.READY); assertThat(configContainer.setupPhase()).isEqualTo(ConfigContainerSetupPhase.INITIALIZED);
var initTracker = configContainer.extension(ExtensionInitTracker.class).orElseThrow(); var initTracker = configContainer.extension(ExtensionInitTracker.class).orElseThrow();
assertThat(initTracker.initializedEntries()).containsExactlyInAnyOrder(compoundEntry, subEntry); assertThat(initTracker.initializedEntries()).containsExactlyInAnyOrder(compoundEntry, subEntry);