From d1629e9f5c2e2ce86f67c66df81795555df6c77d Mon Sep 17 00:00:00 2001
From: carbotaniuman <41451839+carbotaniuman@users.noreply.github.com>
Date: Tue, 9 Jun 2020 11:18:18 -0500
Subject: [PATCH] Update logs and stuff

---
 src/main/java/mdnet/cache/DiskLruCache.java |  3 +-
 src/main/java/mdnet/cache/Util.java         | 45 ---------------------
 src/main/kotlin/mdnet/base/Application.kt   |  8 ++--
 3 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 src/main/java/mdnet/cache/Util.java

diff --git a/src/main/java/mdnet/cache/DiskLruCache.java b/src/main/java/mdnet/cache/DiskLruCache.java
index 4c4d061..04e9837 100644
--- a/src/main/java/mdnet/cache/DiskLruCache.java
+++ b/src/main/java/mdnet/cache/DiskLruCache.java
@@ -16,6 +16,7 @@
 
 package mdnet.cache;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -654,7 +655,7 @@ public final class DiskLruCache implements Closeable {
 	 */
 	public void delete() throws IOException {
 		close();
-		Util.deleteContents(directory);
+		FileUtils.deleteDirectory(directory);
 	}
 
 	private void validateKey(String key) {
diff --git a/src/main/java/mdnet/cache/Util.java b/src/main/java/mdnet/cache/Util.java
deleted file mode 100644
index 3afa058..0000000
--- a/src/main/java/mdnet/cache/Util.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mdnet.cache;
-
-import java.io.File;
-import java.io.IOException;
-
-/** Junk drawer of utility methods. */
-final class Util {
-	private Util() {
-	}
-
-	/**
-	 * Deletes the contents of {@code dir}. Throws an IOException if any file could
-	 * not be deleted, or if {@code dir} is not a readable directory.
-	 */
-	static void deleteContents(File dir) throws IOException {
-		File[] files = dir.listFiles();
-		if (files == null) {
-			throw new IOException("not a readable directory: " + dir);
-		}
-		for (File file : files) {
-			if (file.isDirectory()) {
-				deleteContents(file);
-			}
-			if (!file.delete()) {
-				throw new IOException("failed to delete file: " + file);
-			}
-		}
-	}
-}
diff --git a/src/main/kotlin/mdnet/base/Application.kt b/src/main/kotlin/mdnet/base/Application.kt
index da9bf78..0020f21 100644
--- a/src/main/kotlin/mdnet/base/Application.kt
+++ b/src/main/kotlin/mdnet/base/Application.kt
@@ -166,14 +166,14 @@ fun getServer(cache: DiskLruCache, serverSettings: ServerSettings, clientSetting
                             // Note: if neither of the options get called/are in the log
                             // check that tee gets closed and for exceptions in this lambda
                             if (editor.getLength(0) == contentLength.toLong()) {
-                                if (LOGGER.isTraceEnabled) {
-                                    LOGGER.trace("Cache download $sanitizedUri committed")
+                                if (LOGGER.isInfoEnabled) {
+                                    LOGGER.info("Cache download $sanitizedUri committed")
                                 }
 
                                 editor.commit()
                             } else {
-                                if (LOGGER.isTraceEnabled) {
-                                    LOGGER.trace("Cache download $sanitizedUri aborted")
+                                if (LOGGER.isInfoEnabled) {
+                                    LOGGER.info("Cache download $sanitizedUri aborted")
                                 }
 
                                 editor.abort()