This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit e183ab5cd6079549a5180066c4132b0680673293
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jan 15 11:10:21 2024 -0500
Remove "At" in new method names
---
.../archivers/zip/FileRandomAccessOutputStream.java | 2 +-
.../compress/archivers/zip/RandomAccessOutputStream.java | 6 +++---
.../zip/SeekableChannelRandomAccessOutputStream.java | 2 +-
.../compress/archivers/zip/ZipArchiveOutputStream.java | 16 ++++++++--------
.../compress/archivers/zip/ZipSplitOutputStream.java | 2 +-
.../archivers/zip/FileRandomAccessOutputStreamTest.java | 10 +++++-----
.../archivers/zip/RandomAccessOutputStreamTest.java | 4 ++--
.../zip/SeekableChannelRandomAccessOutputStreamTest.java | 10 +++++-----
8 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
index 2adc0a127..6024520f3 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
@@ -66,7 +66,7 @@ class FileRandomAccessOutputStream extends
RandomAccessOutputStream {
}
@Override
- public void writeFullyAt(final byte[] b, final int off, final int len,
final long atPosition) throws IOException {
+ public void writeFully(final byte[] b, final int off, final int len, final
long atPosition) throws IOException {
final ByteBuffer buf = ByteBuffer.wrap(b, off, len);
for (long currentPos = atPosition; buf.hasRemaining(); ) {
final int written = this.channel.write(buf, currentPos);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStream.java
index ae16caf9a..6faa522d5 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStream.java
@@ -52,7 +52,7 @@ abstract class RandomAccessOutputStream extends OutputStream {
* @throws IOException
* when write fails.
*/
- abstract void writeFullyAt(byte[] b, int off, int len, long position)
throws IOException;
+ abstract void writeFully(byte[] b, int off, int len, long position) throws
IOException;
/**
* Writes given data to specific position.
@@ -64,7 +64,7 @@ abstract class RandomAccessOutputStream extends OutputStream {
* @throws IOException
* when write fails.
*/
- public void writeFullyAt(final byte[] b, final long position) throws
IOException {
- writeFullyAt(b, 0, b.length, position);
+ public void writeFully(final byte[] b, final long position) throws
IOException {
+ writeFully(b, 0, b.length, position);
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
index c58df3618..29a1ec4c6 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
@@ -50,7 +50,7 @@ class SeekableChannelRandomAccessOutputStream extends
RandomAccessOutputStream {
}
@Override
- public synchronized void writeFullyAt(final byte[] b, final int off, final
int len, final long position) throws IOException {
+ public synchronized void writeFully(final byte[] b, final int off, final
int len, final long position) throws IOException {
final long saved = channel.position();
try {
channel.position(position);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index 0def496be..1e984e0d3 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -1245,13 +1245,13 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream<ZipArchiveEntry>
}
long position = dataStart;
- randomStream.writeFullyAt(ZipLong.getBytes(entry.entry.getCrc()),
position); position += ZipConstants.WORD;
+ randomStream.writeFully(ZipLong.getBytes(entry.entry.getCrc()),
position); position += ZipConstants.WORD;
if (!hasZip64Extra(entry.entry) || !actuallyNeedsZip64) {
-
randomStream.writeFullyAt(ZipLong.getBytes(entry.entry.getCompressedSize()),
position); position += ZipConstants.WORD;
- randomStream.writeFullyAt(ZipLong.getBytes(entry.entry.getSize()),
position); position += ZipConstants.WORD;
+
randomStream.writeFully(ZipLong.getBytes(entry.entry.getCompressedSize()),
position); position += ZipConstants.WORD;
+ randomStream.writeFully(ZipLong.getBytes(entry.entry.getSize()),
position); position += ZipConstants.WORD;
} else {
- randomStream.writeFullyAt(ZipLong.ZIP64_MAGIC.getBytes(),
position); position += ZipConstants.WORD;
- randomStream.writeFullyAt(ZipLong.ZIP64_MAGIC.getBytes(),
position); position += ZipConstants.WORD;
+ randomStream.writeFully(ZipLong.ZIP64_MAGIC.getBytes(), position);
position += ZipConstants.WORD;
+ randomStream.writeFully(ZipLong.ZIP64_MAGIC.getBytes(), position);
position += ZipConstants.WORD;
}
if (hasZip64Extra(entry.entry)) {
@@ -1261,14 +1261,14 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream<ZipArchiveEntry>
position = dataStart + 3 * ZipConstants.WORD + 2 *
ZipConstants.SHORT + nameLen + 2 * ZipConstants.SHORT;
// inside the ZIP64 extra uncompressed size comes
// first, unlike the LFH, CD or data descriptor
-
randomStream.writeFullyAt(ZipEightByteInteger.getBytes(entry.entry.getSize()),
position); position += ZipConstants.DWORD;
-
randomStream.writeFullyAt(ZipEightByteInteger.getBytes(entry.entry.getCompressedSize()),
position); position += ZipConstants.DWORD;
+
randomStream.writeFully(ZipEightByteInteger.getBytes(entry.entry.getSize()),
position); position += ZipConstants.DWORD;
+
randomStream.writeFully(ZipEightByteInteger.getBytes(entry.entry.getCompressedSize()),
position); position += ZipConstants.DWORD;
if (!actuallyNeedsZip64) {
// do some cleanup:
// * rewrite version needed to extract
position = dataStart - 5 * ZipConstants.SHORT;
-
randomStream.writeFullyAt(ZipShort.getBytes(versionNeededToExtract(entry.entry.getMethod(),
false, false)), position);
+
randomStream.writeFully(ZipShort.getBytes(versionNeededToExtract(entry.entry.getMethod(),
false, false)), position);
position += ZipConstants.SHORT;
// * remove ZIP64 extra, so it doesn't get written
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
index f6760db90..19af76f06 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
@@ -272,7 +272,7 @@ final class ZipSplitOutputStream extends
RandomAccessOutputStream {
}
@Override
- public void writeFullyAt(final byte[] b, final int off, final int len,
final long atPosition) throws IOException {
+ public void writeFully(final byte[] b, final int off, final int len, final
long atPosition) throws IOException {
long remainingPosition = atPosition;
for (int remainingOff = off, remainingLen = len; remainingLen > 0; ) {
final Map.Entry<Long, Path> segment =
positionToFiles.floorEntry(remainingPosition);
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStreamTest.java
index f00efb927..bc6cd240f 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStreamTest.java
@@ -80,8 +80,8 @@ public class FileRandomAccessOutputStreamTest extends
AbstractTempDirTest {
((ByteBuffer) answer.getArgument(0)).position(6);
return 6;
});
- stream.writeFullyAt("hello".getBytes(StandardCharsets.UTF_8), 20);
- stream.writeFullyAt("world\n".getBytes(StandardCharsets.UTF_8), 30);
+ stream.writeFully("hello".getBytes(StandardCharsets.UTF_8), 20);
+ stream.writeFully("world\n".getBytes(StandardCharsets.UTF_8), 30);
verify(channel, times(1))
.write((ByteBuffer) any(), eq(20L));
@@ -110,8 +110,8 @@ public class FileRandomAccessOutputStreamTest extends
AbstractTempDirTest {
((ByteBuffer) answer.getArgument(0)).position(6);
return 6;
});
- stream.writeFullyAt("hello".getBytes(StandardCharsets.UTF_8), 20);
- stream.writeFullyAt("world\n".getBytes(StandardCharsets.UTF_8), 30);
+ stream.writeFully("hello".getBytes(StandardCharsets.UTF_8), 20);
+ stream.writeFully("world\n".getBytes(StandardCharsets.UTF_8), 30);
verify(channel, times(1))
.write((ByteBuffer) any(), eq(20L));
@@ -134,7 +134,7 @@ public class FileRandomAccessOutputStreamTest extends
AbstractTempDirTest {
});
when(channel.write((ByteBuffer) any(), eq(23L)))
.thenAnswer(answer -> 0);
- assertThrows(IOException.class, () ->
stream.writeFullyAt("hello".getBytes(StandardCharsets.UTF_8), 20));
+ assertThrows(IOException.class, () ->
stream.writeFully("hello".getBytes(StandardCharsets.UTF_8), 20));
verify(channel, times(1))
.write((ByteBuffer) any(), eq(20L));
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStreamTest.java
index 59d048249..3a31d1f8d 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/RandomAccessOutputStreamTest.java
@@ -46,8 +46,8 @@ public class RandomAccessOutputStreamTest extends
AbstractTempDirTest {
}
@Override
- void writeFullyAt(final byte[] b, final int off, final int len,
final long position) throws IOException {
- delegate.writeFullyAt(b, off, len, position);
+ void writeFully(final byte[] b, final int off, final int len,
final long position) throws IOException {
+ delegate.writeFully(b, off, len, position);
}
};
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStreamTest.java
index cd95d1c1d..b6ed26eb3 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStreamTest.java
@@ -94,8 +94,8 @@ public class SeekableChannelRandomAccessOutputStreamTest
extends AbstractTempDir
return 6;
});
- stream.writeFullyAt("hello".getBytes(StandardCharsets.UTF_8), 20);
- stream.writeFullyAt("world\n".getBytes(StandardCharsets.UTF_8), 30);
+ stream.writeFully("hello".getBytes(StandardCharsets.UTF_8), 20);
+ stream.writeFully("world\n".getBytes(StandardCharsets.UTF_8), 30);
verify(channel, times(2))
.write((ByteBuffer) any());
@@ -129,8 +129,8 @@ public class SeekableChannelRandomAccessOutputStreamTest
extends AbstractTempDir
return 6;
});
- stream.writeFullyAt("hello".getBytes(StandardCharsets.UTF_8), 20);
- stream.writeFullyAt("world\n".getBytes(StandardCharsets.UTF_8), 30);
+ stream.writeFully("hello".getBytes(StandardCharsets.UTF_8), 20);
+ stream.writeFully("world\n".getBytes(StandardCharsets.UTF_8), 30);
verify(channel, times(3))
.write((ByteBuffer) any());
@@ -156,7 +156,7 @@ public class SeekableChannelRandomAccessOutputStreamTest
extends AbstractTempDir
})
.thenAnswer(answer -> 0);
- assertThrows(IOException.class, () ->
stream.writeFullyAt("hello".getBytes(StandardCharsets.UTF_8), 20));
+ assertThrows(IOException.class, () ->
stream.writeFully("hello".getBytes(StandardCharsets.UTF_8), 20));
verify(channel, times(2))
.write((ByteBuffer) any());
