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/filetransfer/Uploader.java | 1 - .../java/org/openslx/libvirt/xml/LibvirtXmlDocument.java | 15 ++++++++++----- .../java/org/openslx/thrifthelper/ImagePublishDataEx.java | 6 +++++- .../org/openslx/thrifthelper/TBinaryProtocolSafe.java | 6 +++++- src/main/java/org/openslx/thrifthelper/ThriftManager.java | 5 ++--- src/main/java/org/openslx/vm/DockerMetaDataDummy.java | 8 +++++--- .../openslx/vm/UnsupportedVirtualizerFormatException.java | 6 +++++- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java index e82955b..39bfea2 100644 --- a/src/main/java/org/openslx/filetransfer/Uploader.java +++ b/src/main/java/org/openslx/filetransfer/Uploader.java @@ -121,7 +121,6 @@ public class Uploader extends Transfer } - @SuppressWarnings( "resource" ) public boolean upload( String filename, UploadStatusCallback callback ) { if ( shouldGetToken() ) { diff --git a/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java b/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java index 8fe642b..9382ced 100644 --- a/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java +++ b/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java @@ -17,7 +17,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.io.IOUtils; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -311,7 +310,6 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv } @Override - @SuppressWarnings( "deprecation" ) public String toXml() throws LibvirtXmlSerializationException { StringWriter xmlWriter = null; @@ -327,14 +325,17 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv } catch ( TransformerException | IOException e ) { throw new LibvirtXmlSerializationException( e.getLocalizedMessage() ); } finally { - IOUtils.closeQuietly( xmlWriter ); + try { + xmlWriter.close(); + } catch ( IOException e ) { + throw new LibvirtXmlSerializationException( e.getLocalizedMessage() ); + } } return xml; } @Override - @SuppressWarnings( "deprecation" ) public void toXml( File xml ) throws LibvirtXmlSerializationException { FileWriter xmlWriter = null; @@ -349,7 +350,11 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv } catch ( TransformerException | IOException e ) { throw new LibvirtXmlSerializationException( e.getLocalizedMessage() ); } finally { - IOUtils.closeQuietly( xmlWriter ); + try { + xmlWriter.close(); + } catch ( IOException e ) { + throw new LibvirtXmlSerializationException( e.getLocalizedMessage() ); + } } } diff --git a/src/main/java/org/openslx/thrifthelper/ImagePublishDataEx.java b/src/main/java/org/openslx/thrifthelper/ImagePublishDataEx.java index 5cf0a10..5c5ef01 100644 --- a/src/main/java/org/openslx/thrifthelper/ImagePublishDataEx.java +++ b/src/main/java/org/openslx/thrifthelper/ImagePublishDataEx.java @@ -2,9 +2,13 @@ package org.openslx.thrifthelper; import org.openslx.bwlp.thrift.iface.ImagePublishData; -@SuppressWarnings( "serial" ) public class ImagePublishDataEx extends ImagePublishData { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 314945044011262005L; + public String exImagePath; public boolean exIsValid; } diff --git a/src/main/java/org/openslx/thrifthelper/TBinaryProtocolSafe.java b/src/main/java/org/openslx/thrifthelper/TBinaryProtocolSafe.java index 86a2306..b0b7486 100644 --- a/src/main/java/org/openslx/thrifthelper/TBinaryProtocolSafe.java +++ b/src/main/java/org/openslx/thrifthelper/TBinaryProtocolSafe.java @@ -21,10 +21,14 @@ public class TBinaryProtocolSafe extends TBinaryProtocol /** * Factory */ - @SuppressWarnings( "serial" ) public static class Factory implements TProtocolFactory { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 6896537370338823740L; + protected boolean strictRead_ = false; protected boolean strictWrite_ = true; diff --git a/src/main/java/org/openslx/thrifthelper/ThriftManager.java b/src/main/java/org/openslx/thrifthelper/ThriftManager.java index 2fe706d..099caaa 100644 --- a/src/main/java/org/openslx/thrifthelper/ThriftManager.java +++ b/src/main/java/org/openslx/thrifthelper/ThriftManager.java @@ -40,14 +40,13 @@ public class ThriftManager private final T client; - @SuppressWarnings( "unchecked" ) private ThriftManager( Class ifClazz, Class clientClazz, WantClientCallback internalCallback, ErrorCallback errorCb ) { - this.client = (T)Proxy.newProxyInstance( + this.client = ifClazz.cast( Proxy.newProxyInstance( ifClazz.getClassLoader(), new Class[] { ifClazz }, new ThriftHandler( - clientClazz, internalCallback, errorCb ) ); + clientClazz, internalCallback, errorCb ) ) ); } private static ThriftManager masterManager = null; 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 osList, File file) throws UnsupportedVirtualizerFormatException { super(osList); @@ -75,7 +73,11 @@ public class DockerMetaDataDummy extends VmMetaData