From 3ebb39147eb615f1d83b822d9e5ee55b9763336a Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 23 Feb 2021 09:16:07 +0100
Subject: Remove suppressions and fix Java 8 warnings

---
 src/main/java/org/openslx/vm/DockerMetaDataDummy.java             | 8 +++++---
 .../org/openslx/vm/UnsupportedVirtualizerFormatException.java     | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/openslx/vm')

diff --git a/src/main/java/org/openslx/vm/DockerMetaDataDummy.java b/src/main/java/org/openslx/vm/DockerMetaDataDummy.java
index 73cd92e..7381361 100644
--- a/src/main/java/org/openslx/vm/DockerMetaDataDummy.java
+++ b/src/main/java/org/openslx/vm/DockerMetaDataDummy.java
@@ -1,6 +1,5 @@
 package org.openslx.vm;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
@@ -60,7 +59,6 @@ public class DockerMetaDataDummy extends VmMetaData<DockerSoundCardMeta, DockerD
 	 */
 	private byte[] containerDefinition;
 
-	@SuppressWarnings( "deprecation" )
 	public DockerMetaDataDummy(List<OperatingSystem> osList, File file) throws UnsupportedVirtualizerFormatException {
 		super(osList);
 
@@ -75,7 +73,11 @@ public class DockerMetaDataDummy extends VmMetaData<DockerSoundCardMeta, DockerD
 		} catch (IOException | UnsupportedVirtualizerFormatException e) {
 			LOGGER.error("Couldn't read dockerfile", e);
 		} finally {
-			IOUtils.closeQuietly( bis );
+			try {
+				bis.close();
+			} catch ( IOException e ) {
+				LOGGER.warn( "Could not close the input stream!" );
+			}
 		}
 	}
 
diff --git a/src/main/java/org/openslx/vm/UnsupportedVirtualizerFormatException.java b/src/main/java/org/openslx/vm/UnsupportedVirtualizerFormatException.java
index f19b1ff..a6f3197 100644
--- a/src/main/java/org/openslx/vm/UnsupportedVirtualizerFormatException.java
+++ b/src/main/java/org/openslx/vm/UnsupportedVirtualizerFormatException.java
@@ -1,8 +1,12 @@
 package org.openslx.vm;
 
-@SuppressWarnings( "serial" )
 public class UnsupportedVirtualizerFormatException extends Exception
 {
+	/**
+	 * Version for serialization.
+	 */
+	private static final long serialVersionUID = 5794121065945636839L;
+
 	public UnsupportedVirtualizerFormatException(String message) {
 		super(message);
 	}
-- 
cgit v1.2.3-55-g7522