Repository: commons-compress Updated Branches: refs/heads/master b03521d07 -> 066ee4cd3
suppress warnings on "impossible" exceptions and exceptions mandated by the public API Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/066ee4cd Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/066ee4cd Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/066ee4cd Branch: refs/heads/master Commit: 066ee4cd338aa7a168fe372efc33ee7070b9c962 Parents: b03521d Author: Stefan Bodewig <[email protected]> Authored: Mon Dec 19 19:00:26 2016 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Mon Dec 19 19:00:26 2016 +0100 ---------------------------------------------------------------------- .../commons/compress/archivers/tar/TarArchiveEntry.java | 4 ++-- .../compress/archivers/tar/TarArchiveOutputStream.java | 4 ++-- .../apache/commons/compress/archivers/tar/TarUtils.java | 4 ++-- .../archivers/zip/AbstractUnicodeExtraField.java | 2 +- .../commons/compress/archivers/zip/AsiExtraField.java | 2 +- .../commons/compress/archivers/zip/ExtraFieldUtils.java | 6 +++--- .../compress/archivers/zip/GeneralPurposeBit.java | 2 +- .../archivers/zip/ParallelScatterZipCreator.java | 2 +- .../commons/compress/archivers/zip/ZipArchiveEntry.java | 4 ++-- .../apache/commons/compress/archivers/zip/ZipLong.java | 2 +- .../apache/commons/compress/archivers/zip/ZipShort.java | 2 +- .../pack200/Pack200CompressorInputStream.java | 2 +- .../org/apache/commons/compress/utils/ArchiveUtils.java | 12 ++++++++---- 13 files changed, 26 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java index e7116ec..8fed4a1 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java @@ -984,7 +984,7 @@ public class TarArchiveEntry implements TarConstants, ArchiveEntry { writeEntryHeader(outbuf, TarUtils.FALLBACK_ENCODING, false); } catch (final IOException ex2) { // impossible - throw new RuntimeException(ex2); + throw new RuntimeException(ex2); //NOSONAR } } } @@ -1071,7 +1071,7 @@ public class TarArchiveEntry implements TarConstants, ArchiveEntry { parseTarHeader(header, TarUtils.DEFAULT_ENCODING, true); } catch (final IOException ex2) { // not really possible - throw new RuntimeException(ex2); + throw new RuntimeException(ex2); //NOSONAR } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java index cf51dfd..8c44a07 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java @@ -635,7 +635,7 @@ public class TarArchiveOutputStream extends ArchiveOutputStream { if (value < 0 || value > maxValue) { throw new RuntimeException(field + " '" + value + "' is too big ( > " - + maxValue + " )." + additionalMsg); + + maxValue + " )." + additionalMsg); //NOSONAR } } @@ -686,7 +686,7 @@ public class TarArchiveOutputStream extends ArchiveOutputStream { } else if (longFileMode != LONGFILE_TRUNCATE) { throw new RuntimeException(fieldName + " '" + name + "' is too long ( > " - + TarConstants.NAMELEN + " bytes)"); + + TarConstants.NAMELEN + " bytes)"); //NOSONAR } } return false; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java index 85f7844..9749a2d 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java @@ -267,7 +267,7 @@ public class TarUtils { return parseName(buffer, offset, length, FALLBACK_ENCODING); } catch (final IOException ex2) { // impossible - throw new RuntimeException(ex2); + throw new RuntimeException(ex2); //NOSONAR } } } @@ -328,7 +328,7 @@ public class TarUtils { FALLBACK_ENCODING); } catch (final IOException ex2) { // impossible - throw new RuntimeException(ex2); + throw new RuntimeException(ex2); //NOSONAR } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java index 3510cc4..aa05a99 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java @@ -56,7 +56,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField { try { unicodeName = text.getBytes(CharsetNames.UTF_8); } catch (final UnsupportedEncodingException e) { - throw new RuntimeException("FATAL: UTF-8 encoding not supported.", e); + throw new RuntimeException("FATAL: UTF-8 encoding not supported.", e); //NOSONAR } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java index faf84cd..e4afa95 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java @@ -331,7 +331,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable { return cloned; } catch (final CloneNotSupportedException cnfe) { // impossible - throw new RuntimeException(cnfe); + throw new RuntimeException(cnfe); //NOSONAR } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java index b59aa39..a21c858 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java @@ -66,11 +66,11 @@ public class ExtraFieldUtils { final ZipExtraField ze = (ZipExtraField) c.newInstance(); implementations.put(ze.getHeaderId(), c); } catch (final ClassCastException cc) { - throw new RuntimeException(c + " doesn\'t implement ZipExtraField"); + throw new RuntimeException(c + " doesn\'t implement ZipExtraField"); //NOSONAR } catch (final InstantiationException ie) { - throw new RuntimeException(c + " is not a concrete class"); + throw new RuntimeException(c + " is not a concrete class"); //NOSONAR } catch (final IllegalAccessException ie) { - throw new RuntimeException(c + "\'s no-arg constructor is not public"); + throw new RuntimeException(c + "\'s no-arg constructor is not public"); //NOSONAR } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java b/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java index 6bca5bf..63ba415 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java @@ -239,7 +239,7 @@ public final class GeneralPurposeBit implements Cloneable { return super.clone(); } catch (final CloneNotSupportedException ex) { // impossible - throw new RuntimeException("GeneralPurposeBit is not Cloneable?", ex); + throw new RuntimeException("GeneralPurposeBit is not Cloneable?", ex); //NOSONAR } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java index 7d6c675..61a241e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java @@ -86,7 +86,7 @@ public class ParallelScatterZipCreator { streams.add(scatterStream); return scatterStream; } catch (final IOException e) { - throw new RuntimeException(e); + throw new RuntimeException(e); //NOSONAR } } }; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java index 7a21ef5..bc5926e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java @@ -541,7 +541,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry } catch (final ZipException e) { // actually this is not possible as of Commons Compress 1.1 throw new RuntimeException("Error parsing extra fields for entry: " - + getName() + " - " + e.getMessage(), e); + + getName() + " - " + e.getMessage(), e); //NOSONAR } } @@ -566,7 +566,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry ExtraFieldUtils.UnparseableExtraField.READ); mergeExtraFields(central, false); } catch (final ZipException e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e.getMessage(), e); //NOSONAR } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java index e3e3f86..e8e002a 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java @@ -209,7 +209,7 @@ public final class ZipLong implements Cloneable, Serializable { return super.clone(); } catch (final CloneNotSupportedException cnfe) { // impossible - throw new RuntimeException(cnfe); + throw new RuntimeException(cnfe); //NOSONAR } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java index f3c2e06..8baabb5 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java @@ -151,7 +151,7 @@ public final class ZipShort implements Cloneable, Serializable { return super.clone(); } catch (final CloneNotSupportedException cnfe) { // impossible - throw new RuntimeException(cnfe); + throw new RuntimeException(cnfe); //NOSONAR } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java index e8630a7..7946e10 100644 --- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java @@ -224,7 +224,7 @@ public class Pack200CompressorInputStream extends CompressorInputStream { try { streamBridge.getInput().mark(limit); } catch (final IOException ex) { - throw new RuntimeException(ex); + throw new RuntimeException(ex); //NOSONAR } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/066ee4cd/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java index 25e5301..7865dee 100644 --- a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java +++ b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java @@ -75,7 +75,8 @@ public class ArchiveUtils { try { buffer1 = expected.getBytes(CharsetNames.US_ASCII); } catch (final UnsupportedEncodingException e) { - throw new RuntimeException(e); // Should not happen + // Should not happen + throw new RuntimeException(e); //NOSONAR } return isEqual(buffer1, 0, buffer1.length, buffer, offset, length, false); } @@ -102,7 +103,8 @@ public class ArchiveUtils { try { return inputString.getBytes(CharsetNames.US_ASCII); } catch (final UnsupportedEncodingException e) { - throw new RuntimeException(e); // Should never happen + // Should never happen + throw new RuntimeException(e); //NOSONAR } } @@ -116,7 +118,8 @@ public class ArchiveUtils { try { return new String(inputBytes, CharsetNames.US_ASCII); } catch (final UnsupportedEncodingException e) { - throw new RuntimeException(e); // Should never happen + // Should never happen + throw new RuntimeException(e); //NOSONAR } } @@ -132,7 +135,8 @@ public class ArchiveUtils { try { return new String(inputBytes, offset, length, CharsetNames.US_ASCII); } catch (final UnsupportedEncodingException e) { - throw new RuntimeException(e); // Should never happen + // Should never happen + throw new RuntimeException(e); //NOSONAR } }
