move mlib config to mserver-package

Author: pidoubleyou

src/main/java/de/mediathekview/mlib/config/ConfigDTO.java renamed to src/main/java/de/mediathekview/mserver/base/config/ConfigDTO.java

@@ -1,4 +1,4 @@
-package de.mediathekview.mlib.config;
+package de.mediathekview.mserver.base.config;
 
 /**
  * A Data-Transfer-Object which holds the actual configuration.

src/main/java/de/mediathekview/mlib/config/ConfigManager.java renamed to src/main/java/de/mediathekview/mserver/base/config/ConfigManager.java

@@ -1,13 +1,17 @@
-package de.mediathekview.mlib.config;
+package de.mediathekview.mserver.base.config;
 
 import com.yacl4j.core.ConfigurationBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 /** A manager to load configurations. */
 public abstract class ConfigManager<T extends ConfigDTO> {
   private T config;
+  private static final Logger LOG = LogManager.getLogger(ConfigManager.class);
 
   protected abstract String getConfigFileName();
 
@@ -36,7 +40,7 @@ public T getConfig() {
   protected void initializeConfigAfterRead(final T config) {
     // Do something after the configuration is read
   }
-  
+
   /*
    * check if the given file exists in FS or
    * try to read a resource from filesystem
@@ -45,15 +49,17 @@ public String getResourcePath(String resourceName) {
     try {
       if (new java.io.File(resourceName).exists()) {
         return resourceName;
-      } else {       
+      } else {
         ClassLoader classLoader = getClass().getClassLoader();
         URL resourceUrl = classLoader.getResource(resourceName);
         if (resourceUrl != null) {
           Path resourcePath = Paths.get(resourceUrl.toURI());
           return resourcePath.toString();
         }
       }
-    } catch(Exception e) {}
+    } catch(Exception e) {
+      LOG.debug(e);
+    }
     return null;
   }
 }

src/main/java/de/mediathekview/mserver/base/config/CrawlerApiParam.java

@@ -2,7 +2,4 @@
 
 
 public enum CrawlerApiParam {
-  FUNK_REQUEST_TOKEN;
-
-
 }

src/main/java/de/mediathekview/mserver/base/config/CrawlerUrlType.java

@@ -16,9 +16,7 @@
 import java.util.Optional;
 
 public enum CrawlerUrlType {
-  FUNK_WEBSITE("https://www.funk.net"),
-  FUNK_API_URL("https://www.funk.net/api/v4.0/"),
-  NEXX_CLOUD_API_URL("https://api.nexx.cloud/v3/741");
+  ;
 
   private URL defaultUrl;
 

src/main/java/de/mediathekview/mserver/base/config/MServerConfigDTO.java

@@ -1,6 +1,5 @@
 package de.mediathekview.mserver.base.config;
 
-import de.mediathekview.mlib.config.ConfigDTO;
 import de.mediathekview.mlib.daten.Sender;
 import de.mediathekview.mlib.filmlisten.FilmlistFormats;
 

src/main/java/de/mediathekview/mserver/base/config/MServerConfigManager.java

@@ -1,6 +1,5 @@
 package de.mediathekview.mserver.base.config;
 
-import de.mediathekview.mlib.config.ConfigManager;
 import de.mediathekview.mlib.daten.Sender;
 import org.apache.commons.lang3.StringUtils;
 

src/test/java/de/mediathekview/mlib/config/ConfigManagerTest.java renamed to src/test/java/de/mediathekview/mserver/base/config/ConfigManagerTest.java

@@ -1,4 +1,4 @@
-package de.mediathekview.mlib.config;
+package de.mediathekview.mserver.base.config;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
@@ -8,6 +8,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -23,7 +24,7 @@
 class ConfigManagerTest {
   private static final String TEST_CONFIG_FILE_NAME = "MlibTestConfig.yaml";
 
-  class TestConfigManager extends ConfigManager<TestConfigDTO> {
+  static class TestConfigManager extends ConfigManager<TestConfigDTO> {
 
     private TestConfigManager() {
       super();

src/test/java/de/mediathekview/mlib/config/TestConfigDTO.java renamed to src/test/java/de/mediathekview/mserver/base/config/TestConfigDTO.java

@@ -1,4 +1,5 @@
-package de.mediathekview.mlib.config;
+package de.mediathekview.mserver.base.config;
+
 
 public class TestConfigDTO implements ConfigDTO {