Renamed services and refactored packages

This commit is contained in:
extio-de
2025-12-24 13:33:20 +01:00
parent ea5a28b6da
commit 1a54e09b65
16 changed files with 37 additions and 37 deletions

View File

@@ -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)) {

View File

@@ -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);

View File

@@ -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();

View File

@@ -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.";

View File

@@ -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;
}

View File

@@ -2,7 +2,7 @@ package de.extio.game_engine.module;
import java.util.List;
public interface ModuleManager {
public interface ModuleService {
void loadModule(Class<? extends AbstractModule> clazz);

View File

@@ -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<AbstractModule> initialModules, final RendererWorkingSet rendererWorkingSet) {
return new ModuleManagerImpl(initialModules, rendererWorkingSet);
ModuleService moduleManager(final List<AbstractModule> 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);
}

View File

@@ -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<AbstractModule> modulesInitial;
@@ -42,7 +42,7 @@ public class ModuleManagerImpl implements InitializingBean, ModuleManager {
private final Map<ModuleExecutorCallbacks, List<AbstractModule>> executorCallbackMap = Collections.synchronizedMap(new EnumMap<>(ModuleExecutorCallbacks.class));
public ModuleManagerImpl(final List<AbstractModule> initialModules, final RendererWorkingSet rendererWorkingSet) {
public ModuleServiceImpl(final List<AbstractModule> initialModules, final RendererWorkingSet rendererWorkingSet) {
this.modulesInitial = initialModules;
this.rendererWorkingSet = rendererWorkingSet;
}

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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
*/

View File

@@ -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

View File

@@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
public class ModuleExecutorImplTest {
@Mock
private ModuleManager moduleManager;
private ModuleService moduleManager;
private ModuleExecutorImpl moduleExecutor;

View File

@@ -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());

View File

@@ -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