Minor logging changes + minor FileConfiguration clean up

Author: devgianlu

api/pom.xml

@@ -73,16 +73,20 @@
         </dependency>
 
         <!-- Logging -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j-core.version}</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j-slf4j-impl.version}</version>
-            <scope>runtime</scope>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>

player/pom.xml

@@ -113,28 +113,32 @@
         </dependency>
 
         <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j-core.version}</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j-slf4j-impl.version}</version>
-            <scope>runtime</scope>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
             <version>${lmax-disruptor.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
 
         <!-- TOML configuration -->
         <dependency>

player/src/main/java/xyz/gianlu/librespot/player/FileConfiguration.java

@@ -209,14 +209,21 @@ private void updateConfigFile(@NotNull CommentedConfig defaultConfig) {
         }
     }
 
+    @Nullable
+    private File getFile(@NotNull String key) {
+        String path = config.get(key);
+        return path == null ? null : new File(path);
+    }
+
     @NotNull
     private String[] getStringArray(@NotNull String key, char separator) {
         String str = config.get(key);
         if ((str = str.trim()).isEmpty()) return new String[0];
         else return Utils.split(str, separator);
     }
 
-    private @NotNull AudioQuality preferredQuality() {
+    @NotNull
+    private AudioQuality preferredQuality() {
         try {
             return config.getEnum("player.preferredAudioQuality", AudioQuality.class);
         } catch (IllegalArgumentException ex) { // Retro-compatibility
@@ -236,13 +243,15 @@ private String[] getStringArray(@NotNull String key, char separator) {
         }
     }
 
-    private @Nullable File outputPipe() {
+    @Nullable
+    private File outputPipe() {
         String path = config.get("player.pipe");
         if (path == null || path.isEmpty()) return null;
         return new File(path);
     }
 
-    private @Nullable File metadataPipe() {
+    @Nullable
+    private File metadataPipe() {
         String path = config.get("player.metadataPipe");
         if (path == null || path.isEmpty()) return null;
         return new File(path);
@@ -261,42 +270,51 @@ private float normalisationPregain() {
         }
     }
 
-    private @Nullable String deviceId() {
+    @Nullable
+    private String deviceId() {
         String val = config.get("deviceId");
         return val == null || val.isEmpty() ? null : val;
     }
 
-    private @NotNull String deviceName() {
+    @NotNull
+    private String deviceName() {
         return config.get("deviceName");
     }
 
-    private @NotNull Connect.DeviceType deviceType() {
+    @NotNull
+    private Connect.DeviceType deviceType() {
         return config.getEnum("deviceType", Connect.DeviceType.class);
     }
 
-    private @NotNull String preferredLocale() {
+    @NotNull
+    private String preferredLocale() {
         return config.get("preferredLocale");
     }
 
-    private @NotNull String authUsername() {
+    @NotNull
+    private String authUsername() {
         return config.get("auth.username");
     }
 
-    private @NotNull String authPassword() {
+    @NotNull
+    private String authPassword() {
         return config.get("auth.password");
     }
 
-    private @NotNull String authBlob() {
+    @NotNull
+    private String authBlob() {
         return config.get("auth.blob");
     }
 
-    private @Nullable File credentialsFile() {
+    @Nullable
+    private File credentialsFile() {
         String path = config.get("auth.credentialsFile");
         if (path == null || path.isEmpty()) return null;
         return new File(path);
     }
 
-    public @NotNull Level loggingLevel() {
+    @NotNull
+    public Level loggingLevel() {
         return Level.toLevel(config.get("logLevel"));
     }
 
@@ -309,11 +327,13 @@ public int apiPort() {
         return config.get("api.port");
     }
 
-    public @NotNull String apiHost() {
+    @NotNull
+    public String apiHost() {
         return config.get("api.host");
     }
 
-    public @NotNull ShellEvents.Configuration toEventsShell() {
+    @NotNull
+    public ShellEvents.Configuration toEventsShell() {
         return new ShellEvents.Configuration.Builder()
                 .setEnabled(config.get("shell.enabled"))
                 .setOnContextChanged(config.get("shell.onContextChanged"))
@@ -379,7 +399,7 @@ public Session.Builder initSessionBuilder() throws IOException, GeneralSecurityE
     public Session.Configuration toSession() {
         return new Session.Configuration.Builder()
                 .setCacheEnabled(config.get("cache.enabled"))
-                .setCacheDir(new File((String) config.get("cache.dir")))
+                .setCacheDir(getFile("cache.dir"))
                 .setDoCacheCleanUp(config.get("cache.doCleanUp"))
                 .setStoreCredentials(config.get("auth.storeCredentials"))
                 .setStoredCredentialsFile(credentialsFile())

pom.xml

@@ -56,8 +56,7 @@
         <gson.version>2.8.6</gson.version>
         <protobuf.version>3.15.8</protobuf.version>
         <slf4j-api.version>1.7.30</slf4j-api.version>
-        <log4j-core.version>2.13.3</log4j-core.version>
-        <log4j-slf4j-impl.version>2.14.1</log4j-slf4j-impl.version>
+        <log4j.version>2.14.1</log4j.version>
         <lmax-disruptor.version>3.4.3</lmax-disruptor.version>
     </properties>