refactor(ModuleManager): remove interface [2/2]

MovingBlocks · Feb 22, 2021 · d7a9aaf · d7a9aaf
1 parent 8b2944f
commit d7a9aaf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/engine-tests/src/main/java/org/terasology/testUtil/ModuleManagerFactory.java b/engine-tests/src/main/java/org/terasology/testUtil/ModuleManagerFactory.java
@@ -3,12 +3,11 @@
 package org.terasology.testUtil;
 
 import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.module.ModuleManagerImpl;
 
 public final class ModuleManagerFactory {
     private ModuleManagerFactory() { }
 
     public static ModuleManager create() throws Exception {
-        return new ModuleManagerImpl("");
+        return new ModuleManager("");
     }
 }
diff --git a/engine/src/main/java/org/terasology/engine/TerasologyEngine.java b/engine/src/main/java/org/terasology/engine/TerasologyEngine.java
@@ -1,4 +1,4 @@
-// Copyright 2020 The Terasology Foundation
+// Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine;
 
@@ -19,7 +19,6 @@
 import org.terasology.engine.modes.GameState;
 import org.terasology.engine.module.ExternalApiWhitelist;
 import org.terasology.engine.module.ModuleManager;
-import org.terasology.engine.module.ModuleManagerImpl;
 import org.terasology.engine.paths.PathManager;
 import org.terasology.engine.subsystem.DisplayDevice;
 import org.terasology.engine.subsystem.EngineSubsystem;
@@ -317,7 +316,7 @@ private void initManagers() {
         TypeRegistry.WHITELISTED_PACKAGES = ExternalApiWhitelist.PACKAGES;
         rootContext.put(TypeRegistry.class, typeRegistry);
 
-        ModuleManager moduleManager = new ModuleManagerImpl(rootContext.get(Config.class), classesOnClasspathsToAddToEngine);
+        ModuleManager moduleManager = new ModuleManager(rootContext.get(Config.class), classesOnClasspathsToAddToEngine);
         rootContext.put(ModuleManager.class, moduleManager);
 
         changeStatus(TerasologyEngineStatus.INITIALIZING_LOWLEVEL_OBJECT_MANIPULATION);

diff --git a/...logy/engine/module/ModuleManagerImpl.java → ...rasology/engine/module/ModuleManager.java b/...logy/engine/module/ModuleManagerImpl.java → ...rasology/engine/module/ModuleManager.java
@@ -51,8 +51,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class ModuleManagerImpl {
-    private static final Logger logger = LoggerFactory.getLogger(ModuleManagerImpl.class);
+public class ModuleManager {
+    private static final Logger logger = LoggerFactory.getLogger(ModuleManager.class);
     private final StandardPermissionProviderFactory permissionProviderFactory = new StandardPermissionProviderFactory();
     private final PermissionProviderFactory wrappingPermissionProviderFactory = new WarnOnlyProviderFactory(permissionProviderFactory);
 
@@ -61,11 +61,11 @@ public class ModuleManagerImpl {
     private final ModuleMetadataJsonAdapter metadataReader;
     private final ModuleInstallManager installManager;
 
-    public ModuleManagerImpl(String masterServerAddress) {
+    public ModuleManager(String masterServerAddress) {
         this(masterServerAddress, Collections.emptyList());
     }
 
-    public ModuleManagerImpl(String masterServerAddress, List<Class<?>> classesOnClasspathsToAddToEngine) {
+    public ModuleManager(String masterServerAddress, List<Class<?>> classesOnClasspathsToAddToEngine) {
         PathManager pathManager = PathManager.getInstance();  // get early so if it needs to initialize, it does it now
 
         metadataReader = new ModuleMetadataJsonAdapter();
@@ -117,11 +117,11 @@ public ModuleManagerImpl(String masterServerAddress, List<Class<?>> classesOnCla
         installManager = new ModuleInstallManager(this, masterServerAddress);
     }
 
-    public ModuleManagerImpl(Config config) {
+    public ModuleManager(Config config) {
         this(config, Collections.emptyList());
     }
 
-    public ModuleManagerImpl(Config config, List<Class<?>> classesOnClasspathsToAddToEngine) {
+    public ModuleManager(Config config, List<Class<?>> classesOnClasspathsToAddToEngine) {
         this(config.getNetwork().getMasterServer(), classesOnClasspathsToAddToEngine);
     }
 
@@ -184,22 +184,18 @@ private void setupSandbox() {
         System.setSecurityManager(new ModuleSecurityManager());
     }
 
-    @Override
     public ModuleRegistry getRegistry() {
         return registry;
     }
 
-    @Override
     public ModuleInstallManager getInstallManager() {
         return installManager;
     }
 
-    @Override
     public ModuleEnvironment getEnvironment() {
         return environment;
     }
 
-    @Override
     public ModuleEnvironment loadEnvironment(Set<Module> modules, boolean asPrimary) {
         Set<Module> finalModules = Sets.newLinkedHashSet(modules);
         finalModules.addAll(registry.stream().filter(Module::isOnClasspath).collect(Collectors.toList()));
@@ -216,15 +212,14 @@ public ModuleEnvironment loadEnvironment(Set<Module> modules, boolean asPrimary)
         return newEnvironment;
     }
 
-    @Override
     public ModuleMetadataJsonAdapter getModuleMetadataReader() {
         return metadataReader;
     }
 
     private void enrichReflectionsWithSubsystems(Module engineModule) {
         Serializer serializer = new XmlSerializer();
         try {
-            Enumeration<URL> urls = ModuleManagerImpl.class.getClassLoader().getResources("reflections.cache");
+            Enumeration<URL> urls = ModuleManager.class.getClassLoader().getResources("reflections.cache");
             while (urls.hasMoreElements()) {
                 URL url = urls.nextElement();
                 if (url.getPath().contains("subsystem")) {