From 1a54e09b65943571d3535588fa90a83533d84a9d Mon Sep 17 00:00:00 2001 From: extio-de Date: Wed, 24 Dec 2025 13:33:20 +0100 Subject: [PATCH] Renamed services and refactored packages --- .../game_engine/i18n/LocalizationAutoConfiguration.java | 6 +++--- .../de/extio/game_engine/i18n/LocalizationEditor.java | 4 ++-- ...{LocalizationManager.java => LocalizationService.java} | 2 +- ...ationManagerImpl.java => LocalizationServiceImpl.java} | 4 ++-- .../de/extio/game_engine/module/ModuleExecutorImpl.java | 4 ++-- .../module/{ModuleManager.java => ModuleService.java} | 2 +- ...iguration.java => ModuleServiceAutoConfiguration.java} | 8 ++++---- .../{ModuleManagerImpl.java => ModuleServiceImpl.java} | 6 +++--- .../game_engine/renderer/RendererAutoConfiguration.java | 4 ++-- .../java/de/extio/game_engine/renderer/RendererData.java | 8 ++++---- .../de/extio/game_engine/storage/StorageServiceImpl.java | 2 +- .../extio/game_engine/util/{ => rng}/FastRandomUUID.java | 4 +--- .../extio/game_engine/i18n/LocalizationManagerTest.java | 8 ++++---- .../extio/game_engine/module/ModuleExecutorImplTest.java | 2 +- .../de/extio/game_engine/module/ModuleManagerTest.java | 8 ++++---- .../de/extio/game_engine/util/FastRandomUUIDTest.java | 2 ++ 16 files changed, 37 insertions(+), 37 deletions(-) rename src/main/java/de/extio/game_engine/i18n/{LocalizationManager.java => LocalizationService.java} (93%) rename src/main/java/de/extio/game_engine/i18n/{LocalizationManagerImpl.java => LocalizationServiceImpl.java} (98%) rename src/main/java/de/extio/game_engine/module/{ModuleManager.java => ModuleService.java} (96%) rename src/main/java/de/extio/game_engine/module/{ModuleManagerAutoConfiguration.java => ModuleServiceAutoConfiguration.java} (75%) rename src/main/java/de/extio/game_engine/module/{ModuleManagerImpl.java => ModuleServiceImpl.java} (98%) rename src/main/java/de/extio/game_engine/util/{ => rng}/FastRandomUUID.java (82%) diff --git a/src/main/java/de/extio/game_engine/i18n/LocalizationAutoConfiguration.java b/src/main/java/de/extio/game_engine/i18n/LocalizationAutoConfiguration.java index 2a4ca54..93f3d0b 100644 --- a/src/main/java/de/extio/game_engine/i18n/LocalizationAutoConfiguration.java +++ b/src/main/java/de/extio/game_engine/i18n/LocalizationAutoConfiguration.java @@ -12,12 +12,12 @@ import org.springframework.context.annotation.Bean; @ConditionalOnProperty(name = "game-engine.i18n.enabled", havingValue = "true", matchIfMissing = true) public class LocalizationAutoConfiguration { - private static final Logger LOGGER = LoggerFactory.getLogger(LocalizationManagerImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LocalizationServiceImpl.class); @Bean @ConditionalOnMissingBean - LocalizationManager localizationManager(@Value("${game-engine.i18n.load-on-start:true}") final boolean loadOnStart, @Value("${game-engine.i18n.resource:i18n.yaml}") final String resource) { - final var localizationManager = new LocalizationManagerImpl(); + LocalizationService localizationManager(@Value("${game-engine.i18n.load-on-start:true}") final boolean loadOnStart, @Value("${game-engine.i18n.resource:i18n.yaml}") final String resource) { + final var localizationManager = new LocalizationServiceImpl(); if (loadOnStart) { try (var resourceStream = LocalizationAutoConfiguration.class.getClassLoader().getResourceAsStream(resource)) { diff --git a/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java b/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java index 860dedc..f38e098 100644 --- a/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java +++ b/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java @@ -49,7 +49,7 @@ import de.extio.game_engine.util.ObjectSerialization; @SuppressWarnings("serial") public class LocalizationEditor extends JFrame { - private LocalizationManagerImpl localizationManagerImpl; + private LocalizationServiceImpl localizationManagerImpl; private String lastFileName; @@ -140,7 +140,7 @@ public class LocalizationEditor extends JFrame { * Create the frame. */ public LocalizationEditor() { - this.localizationManagerImpl = new LocalizationManagerImpl(); + this.localizationManagerImpl = new LocalizationServiceImpl(); this.setTitle("i18n Editor"); this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); diff --git a/src/main/java/de/extio/game_engine/i18n/LocalizationManager.java b/src/main/java/de/extio/game_engine/i18n/LocalizationService.java similarity index 93% rename from src/main/java/de/extio/game_engine/i18n/LocalizationManager.java rename to src/main/java/de/extio/game_engine/i18n/LocalizationService.java index b7ac972..94e58d0 100644 --- a/src/main/java/de/extio/game_engine/i18n/LocalizationManager.java +++ b/src/main/java/de/extio/game_engine/i18n/LocalizationService.java @@ -3,7 +3,7 @@ package de.extio.game_engine.i18n; import java.io.InputStream; import java.util.List; -public interface LocalizationManager { +public interface LocalizationService { void resetEntries(); diff --git a/src/main/java/de/extio/game_engine/i18n/LocalizationManagerImpl.java b/src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java similarity index 98% rename from src/main/java/de/extio/game_engine/i18n/LocalizationManagerImpl.java rename to src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java index 95a8098..e19b8a3 100644 --- a/src/main/java/de/extio/game_engine/i18n/LocalizationManagerImpl.java +++ b/src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java @@ -12,9 +12,9 @@ import org.slf4j.LoggerFactory; import de.extio.game_engine.util.ObjectSerialization; -public class LocalizationManagerImpl implements LocalizationManager { +public class LocalizationServiceImpl implements LocalizationService { - private static final Logger LOGGER = LoggerFactory.getLogger(LocalizationManagerImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LocalizationServiceImpl.class); public final static String NOT_FOUND_PREFIX = "{i18n."; diff --git a/src/main/java/de/extio/game_engine/module/ModuleExecutorImpl.java b/src/main/java/de/extio/game_engine/module/ModuleExecutorImpl.java index 00473eb..66f074d 100644 --- a/src/main/java/de/extio/game_engine/module/ModuleExecutorImpl.java +++ b/src/main/java/de/extio/game_engine/module/ModuleExecutorImpl.java @@ -12,9 +12,9 @@ public class ModuleExecutorImpl implements ModuleExecutor { private static final Logger LOGGER = LoggerFactory.getLogger(ModuleExecutorImpl.class); - private final ModuleManager moduleManager; + private final ModuleService moduleManager; - public ModuleExecutorImpl(final ModuleManager moduleManager) { + public ModuleExecutorImpl(final ModuleService moduleManager) { this.moduleManager = moduleManager; } diff --git a/src/main/java/de/extio/game_engine/module/ModuleManager.java b/src/main/java/de/extio/game_engine/module/ModuleService.java similarity index 96% rename from src/main/java/de/extio/game_engine/module/ModuleManager.java rename to src/main/java/de/extio/game_engine/module/ModuleService.java index 2918a9a..4d51a2a 100644 --- a/src/main/java/de/extio/game_engine/module/ModuleManager.java +++ b/src/main/java/de/extio/game_engine/module/ModuleService.java @@ -2,7 +2,7 @@ package de.extio.game_engine.module; import java.util.List; -public interface ModuleManager { +public interface ModuleService { void loadModule(Class clazz); diff --git a/src/main/java/de/extio/game_engine/module/ModuleManagerAutoConfiguration.java b/src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java similarity index 75% rename from src/main/java/de/extio/game_engine/module/ModuleManagerAutoConfiguration.java rename to src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java index c130d93..a1c7288 100644 --- a/src/main/java/de/extio/game_engine/module/ModuleManagerAutoConfiguration.java +++ b/src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java @@ -11,17 +11,17 @@ import de.extio.game_engine.renderer.work.RendererWorkingSet; @AutoConfiguration @ConditionalOnProperty(name = "game-engine.module.enabled", havingValue = "true", matchIfMissing = true) -public class ModuleManagerAutoConfiguration { +public class ModuleServiceAutoConfiguration { @Bean @ConditionalOnMissingBean - ModuleManager moduleManager(final List initialModules, final RendererWorkingSet rendererWorkingSet) { - return new ModuleManagerImpl(initialModules, rendererWorkingSet); + ModuleService moduleManager(final List initialModules, final RendererWorkingSet rendererWorkingSet) { + return new ModuleServiceImpl(initialModules, rendererWorkingSet); } @Bean @ConditionalOnMissingBean - ModuleExecutor moduleExecutor(final ModuleManager moduleManager) { + ModuleExecutor moduleExecutor(final ModuleService moduleManager) { return new ModuleExecutorImpl(moduleManager); } diff --git a/src/main/java/de/extio/game_engine/module/ModuleManagerImpl.java b/src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java similarity index 98% rename from src/main/java/de/extio/game_engine/module/ModuleManagerImpl.java rename to src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java index 2375fc8..3b5160f 100644 --- a/src/main/java/de/extio/game_engine/module/ModuleManagerImpl.java +++ b/src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java @@ -16,9 +16,9 @@ import org.springframework.beans.factory.InitializingBean; import de.extio.game_engine.renderer.work.RendererWorkingSet; -public class ModuleManagerImpl implements InitializingBean, ModuleManager { +public class ModuleServiceImpl implements InitializingBean, ModuleService { - private static final Logger LOGGER = LoggerFactory.getLogger(ModuleManagerImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ModuleServiceImpl.class); private final List modulesInitial; @@ -42,7 +42,7 @@ public class ModuleManagerImpl implements InitializingBean, ModuleManager { private final Map> executorCallbackMap = Collections.synchronizedMap(new EnumMap<>(ModuleExecutorCallbacks.class)); - public ModuleManagerImpl(final List initialModules, final RendererWorkingSet rendererWorkingSet) { + public ModuleServiceImpl(final List initialModules, final RendererWorkingSet rendererWorkingSet) { this.modulesInitial = initialModules; this.rendererWorkingSet = rendererWorkingSet; } diff --git a/src/main/java/de/extio/game_engine/renderer/RendererAutoConfiguration.java b/src/main/java/de/extio/game_engine/renderer/RendererAutoConfiguration.java index 06f4251..8534f7d 100644 --- a/src/main/java/de/extio/game_engine/renderer/RendererAutoConfiguration.java +++ b/src/main/java/de/extio/game_engine/renderer/RendererAutoConfiguration.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Bean; import de.extio.game_engine.event.EventService; import de.extio.game_engine.keyboard.KeycodeRegistry; import de.extio.game_engine.module.ModuleExecutor; -import de.extio.game_engine.module.ModuleManager; +import de.extio.game_engine.module.ModuleService; import de.extio.game_engine.renderer.model.RenderingBo; import de.extio.game_engine.renderer.work.RendererWorkingSet; import de.extio.game_engine.renderer.work.RendererWorkingSetImpl; @@ -58,7 +58,7 @@ public class RendererAutoConfiguration { final EventService eventService, final StorageService storageService, final RendererWorkingSet rendererWorkingSet, - final ModuleManager moduleManager, + final ModuleService moduleManager, final ModuleExecutor moduleExecutor) { final var rendererData = new RendererData(applicationContext, renderer, rendererControl, renderingBoPool, keycodeRegistry, eventService, storageService, rendererWorkingSet, moduleManager, moduleExecutor); diff --git a/src/main/java/de/extio/game_engine/renderer/RendererData.java b/src/main/java/de/extio/game_engine/renderer/RendererData.java index d7c7a2b..2e3e074 100644 --- a/src/main/java/de/extio/game_engine/renderer/RendererData.java +++ b/src/main/java/de/extio/game_engine/renderer/RendererData.java @@ -8,7 +8,7 @@ import org.springframework.context.ApplicationContext; import de.extio.game_engine.event.EventService; import de.extio.game_engine.keyboard.KeycodeRegistry; import de.extio.game_engine.module.ModuleExecutor; -import de.extio.game_engine.module.ModuleManager; +import de.extio.game_engine.module.ModuleService; import de.extio.game_engine.renderer.model.options.UiOptions; import de.extio.game_engine.renderer.model.options.VideoOptions; import de.extio.game_engine.renderer.work.RendererWorkingSet; @@ -39,13 +39,13 @@ public class RendererData { private final RendererWorkingSet rendererWorkingSet; - private final ModuleManager moduleManager; + private final ModuleService moduleManager; private final ModuleExecutor moduleExecutor; private RendererLoop rendererLoop; - public RendererData(final ApplicationContext applicationContext, final Renderer renderer, final RendererControl rendererControl, final RenderingBoPool renderingBoPool, final KeycodeRegistry keycodeRegistry, final EventService eventService, final StorageService storageService, final RendererWorkingSet rendererWorkingSet, final ModuleManager moduleManager, final ModuleExecutor moduleExecutor) { + public RendererData(final ApplicationContext applicationContext, final Renderer renderer, final RendererControl rendererControl, final RenderingBoPool renderingBoPool, final KeycodeRegistry keycodeRegistry, final EventService eventService, final StorageService storageService, final RendererWorkingSet rendererWorkingSet, final ModuleService moduleManager, final ModuleExecutor moduleExecutor) { this.applicationContext = applicationContext; this.renderer = renderer; this.rendererControl = rendererControl; @@ -114,7 +114,7 @@ public class RendererData { return rendererWorkingSet; } - public ModuleManager getModuleManager() { + public ModuleService getModuleManager() { return moduleManager; } diff --git a/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java b/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java index 54fb2e9..884d44e 100644 --- a/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java +++ b/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java @@ -13,8 +13,8 @@ import java.util.Objects; import java.util.Optional; import java.util.UUID; -import de.extio.game_engine.util.FastRandomUUID; import de.extio.game_engine.util.ObjectSerialization; +import de.extio.game_engine.util.rng.FastRandomUUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/extio/game_engine/util/FastRandomUUID.java b/src/main/java/de/extio/game_engine/util/rng/FastRandomUUID.java similarity index 82% rename from src/main/java/de/extio/game_engine/util/FastRandomUUID.java rename to src/main/java/de/extio/game_engine/util/rng/FastRandomUUID.java index 1958e21..b0f4218 100644 --- a/src/main/java/de/extio/game_engine/util/FastRandomUUID.java +++ b/src/main/java/de/extio/game_engine/util/rng/FastRandomUUID.java @@ -1,9 +1,7 @@ -package de.extio.game_engine.util; +package de.extio.game_engine.util.rng; import java.util.UUID; -import de.extio.game_engine.util.rng.ThreadLocalXorShift128Random; - /** * Optimized factory to create a random UUID */ diff --git a/src/test/java/de/extio/game_engine/i18n/LocalizationManagerTest.java b/src/test/java/de/extio/game_engine/i18n/LocalizationManagerTest.java index 6a97611..614181b 100644 --- a/src/test/java/de/extio/game_engine/i18n/LocalizationManagerTest.java +++ b/src/test/java/de/extio/game_engine/i18n/LocalizationManagerTest.java @@ -16,11 +16,11 @@ import org.junit.jupiter.api.Test; class LocalizationManagerTest { - private LocalizationManager localizationManager; + private LocalizationService localizationManager; @BeforeEach void setUp() { - this.localizationManager = new LocalizationManagerImpl(); + this.localizationManager = new LocalizationServiceImpl(); } @Test @@ -153,7 +153,7 @@ class LocalizationManagerTest { String result = this.localizationManager.translate(999); - assertTrue(result.startsWith(LocalizationManagerImpl.NOT_FOUND_PREFIX)); + assertTrue(result.startsWith(LocalizationServiceImpl.NOT_FOUND_PREFIX)); } @Test @@ -192,7 +192,7 @@ class LocalizationManagerTest { String result = this.localizationManager.translate("unknown"); - assertTrue(result.startsWith(LocalizationManagerImpl.NOT_FOUND_PREFIX)); + assertTrue(result.startsWith(LocalizationServiceImpl.NOT_FOUND_PREFIX)); } @Test diff --git a/src/test/java/de/extio/game_engine/module/ModuleExecutorImplTest.java b/src/test/java/de/extio/game_engine/module/ModuleExecutorImplTest.java index 8d12bc6..2811557 100644 --- a/src/test/java/de/extio/game_engine/module/ModuleExecutorImplTest.java +++ b/src/test/java/de/extio/game_engine/module/ModuleExecutorImplTest.java @@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension; public class ModuleExecutorImplTest { @Mock - private ModuleManager moduleManager; + private ModuleService moduleManager; private ModuleExecutorImpl moduleExecutor; diff --git a/src/test/java/de/extio/game_engine/module/ModuleManagerTest.java b/src/test/java/de/extio/game_engine/module/ModuleManagerTest.java index b6d4ca8..7e92efd 100644 --- a/src/test/java/de/extio/game_engine/module/ModuleManagerTest.java +++ b/src/test/java/de/extio/game_engine/module/ModuleManagerTest.java @@ -13,7 +13,7 @@ import de.extio.game_engine.renderer.work.RendererWorkingSet; public class ModuleManagerTest { - private ModuleManagerImpl moduleManager; + private ModuleServiceImpl moduleManager; private TestModule testModule; @@ -28,7 +28,7 @@ public class ModuleManagerTest { initialModules.add(this.testModule); initialModules.add(this.testClientModule); - this.moduleManager = new ModuleManagerImpl(initialModules, mock(RendererWorkingSet.class)); + this.moduleManager = new ModuleServiceImpl(initialModules, mock(RendererWorkingSet.class)); this.moduleManager.afterPropertiesSet(); } @@ -41,7 +41,7 @@ public class ModuleManagerTest { @Test public void testAfterPropertiesSet_EmptyModules() throws Exception { - final ModuleManagerImpl emptyManager = new ModuleManagerImpl(List.of(), mock(RendererWorkingSet.class)); + final ModuleServiceImpl emptyManager = new ModuleServiceImpl(List.of(), mock(RendererWorkingSet.class)); emptyManager.afterPropertiesSet(); assertTrue(emptyManager.getModulesAll().isEmpty()); @@ -49,7 +49,7 @@ public class ModuleManagerTest { @Test public void testAfterPropertiesSet_NullModules() throws Exception { - final ModuleManagerImpl nullManager = new ModuleManagerImpl(null, mock(RendererWorkingSet.class)); + final ModuleServiceImpl nullManager = new ModuleServiceImpl(null, mock(RendererWorkingSet.class)); nullManager.afterPropertiesSet(); assertTrue(nullManager.getModulesAll().isEmpty()); diff --git a/src/test/java/de/extio/game_engine/util/FastRandomUUIDTest.java b/src/test/java/de/extio/game_engine/util/FastRandomUUIDTest.java index dea687b..eb1a4f0 100644 --- a/src/test/java/de/extio/game_engine/util/FastRandomUUIDTest.java +++ b/src/test/java/de/extio/game_engine/util/FastRandomUUIDTest.java @@ -4,6 +4,8 @@ import java.util.UUID; import org.junit.jupiter.api.Test; +import de.extio.game_engine.util.rng.FastRandomUUID; + public class FastRandomUUIDTest { @Test