This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit a491fe05a4bebe4540fa7f58b6dc6a6cbe60ea08 Author: Emmanuel Bourg <ebo...@apache.org> AuthorDate: Mon Jul 19 14:30:28 2021 +0200 Remove unnecessary toString() calls --- src/main/java/org/apache/commons/compress/archivers/Lister.java | 6 +++--- .../apache/commons/compress/archivers/ar/ArArchiveOutputStream.java | 3 +-- .../commons/compress/archivers/cpio/CpioArchiveOutputStream.java | 2 +- .../java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java | 2 +- .../commons/compress/harmony/pack200/Pack200PackerAdapter.java | 4 ++-- .../commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java | 2 +- .../java/org/apache/commons/compress/archivers/tar/TarLister.java | 2 +- .../apache/commons/compress/harmony/pack200/tests/RunCodecTest.java | 3 +-- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/Lister.java b/src/main/java/org/apache/commons/compress/archivers/Lister.java index e50020f..78627cf 100644 --- a/src/main/java/org/apache/commons/compress/archivers/Lister.java +++ b/src/main/java/org/apache/commons/compress/archivers/Lister.java @@ -91,7 +91,7 @@ public final class Lister { private static void list7z(final File f) throws ArchiveException, IOException { try (SevenZFile z = new SevenZFile(f)) { - System.out.println("Created " + z.toString()); + System.out.println("Created " + z); ArchiveEntry ae; while ((ae = z.getNextEntry()) != null) { final String name = ae.getName() == null ? z.getDefaultName() + " (entry name was null)" @@ -103,7 +103,7 @@ public final class Lister { private static void listZipUsingZipFile(final File f) throws ArchiveException, IOException { try (ZipFile z = new ZipFile(f)) { - System.out.println("Created " + z.toString()); + System.out.println("Created " + z); for (final Enumeration<ZipArchiveEntry> en = z.getEntries(); en.hasMoreElements(); ) { System.out.println(en.nextElement().getName()); } @@ -112,7 +112,7 @@ public final class Lister { private static void listZipUsingTarFile(final File f) throws ArchiveException, IOException { try (TarFile t = new TarFile(f)) { - System.out.println("Created " + t.toString()); + System.out.println("Created " + t); for (TarArchiveEntry en : t.getEntries()) { System.out.println(en.getName()); } diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java index 7eb4071..96160b7 100644 --- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java @@ -143,8 +143,7 @@ public class ArArchiveOutputStream extends ArchiveOutputStream { if (LONGFILE_BSD == longFileMode && (nLength > 16 || n.contains(" "))) { mustAppendName = true; - offset += write(ArArchiveInputStream.BSD_LONGNAME_PREFIX - + String.valueOf(nLength)); + offset += write(ArArchiveInputStream.BSD_LONGNAME_PREFIX + nLength); } else { offset += write(n); } diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java index 0aa6065..538c709 100644 --- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java @@ -525,7 +525,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements } else if (radix == 8) { tmp.append(Long.toOctalString(number)); } else { - tmp.append(Long.toString(number)); + tmp.append(number); } if (tmp.length() <= length) { diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java index 32f59ee..0e5dd11 100644 --- a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java +++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java @@ -286,7 +286,7 @@ public final class BHSDCodec extends Codec { @Override public byte[] encode(final int value, final int last) throws Pack200Exception { if (!encodes(value)) { - throw new Pack200Exception("The codec " + toString() + " does not encode the value " + value); + throw new Pack200Exception("The codec " + this + " does not encode the value " + value); } long z = value; diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java index d078399..4311474 100644 --- a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java +++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java @@ -41,7 +41,7 @@ public class Pack200PackerAdapter extends Pack200Adapter implements Packer { try { new org.apache.commons.compress.harmony.pack200.Archive(file, out, options).pack(); } catch (final Pack200Exception e) { - throw new IOException("Failed to pack Jar:" + String.valueOf(e)); + throw new IOException("Failed to pack Jar:" + e); } completed(1); } @@ -57,7 +57,7 @@ public class Pack200PackerAdapter extends Pack200Adapter implements Packer { try { new org.apache.commons.compress.harmony.pack200.Archive(in, out, options).pack(); } catch (final Pack200Exception e) { - throw new IOException("Failed to pack Jar:" + String.valueOf(e)); + throw new IOException("Failed to pack Jar:" + e); } completed(1); in.close(); diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java index c100176..876f75a 100644 --- a/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java +++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java @@ -48,7 +48,7 @@ public class Pack200UnpackerAdapter extends Pack200Adapter implements Unpacker { try { new Archive(in, out).unpack(); } catch (final Pack200Exception e) { - throw new IOException("Failed to unpack Jar:" + String.valueOf(e)); + throw new IOException("Failed to unpack Jar:" + e); } completed(1); in.close(); diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java index 388cde2..3bfb5c2 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java @@ -50,7 +50,7 @@ public final class TarLister { } else { ais = new TarArchiveInputStream(fis); } - System.out.println("Created " + ais.toString()); + System.out.println("Created " + ais); TarArchiveEntry ae; while((ae=ais.getNextTarEntry()) != null){ log(ae); diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java index f727257..baa2df2 100644 --- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java +++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java @@ -144,8 +144,7 @@ public class RunCodecTest extends TestCase { public void testToString() throws Pack200Exception { RunCodec runCodec = new RunCodec(3, Codec.UNSIGNED5, Codec.BYTE1); assertEquals( - "RunCodec[k=" + 3 + ";aCodec=" + Codec.UNSIGNED5.toString() - + "bCodec=" + Codec.BYTE1.toString() + "]", + "RunCodec[k=" + 3 + ";aCodec=" + Codec.UNSIGNED5 + "bCodec=" + Codec.BYTE1 + "]", runCodec.toString()); }