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
The following commit(s) were added to refs/heads/master by this push:
new 2f224e28 Better internal class name
2f224e28 is described below
commit 2f224e283da4339259876a6543d58c647d48de2b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Aug 18 10:55:55 2023 -0400
Better internal class name
---
...StreamBridge.java => AbstractStreamBridge.java} | 6 +++---
.../pack200/InMemoryCachingStreamBridge.java | 2 +-
.../pack200/Pack200CompressorInputStream.java | 24 +++++++++++-----------
.../pack200/Pack200CompressorOutputStream.java | 14 ++++++-------
.../compressors/pack200/Pack200Strategy.java | 6 +++---
.../pack200/TempFileCachingStreamBridge.java | 2 +-
.../harmony/unpack200/bytecode/NewAttribute.java | 12 +++++------
7 files changed, 33 insertions(+), 33 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/StreamBridge.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/AbstractStreamBridge.java
similarity index 92%
rename from
src/main/java/org/apache/commons/compress/compressors/pack200/StreamBridge.java
rename to
src/main/java/org/apache/commons/compress/compressors/pack200/AbstractStreamBridge.java
index 9a5b6e69..8a1caab7 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/StreamBridge.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/AbstractStreamBridge.java
@@ -31,15 +31,15 @@ import java.io.OutputStream;
* @ThreadSafe
* @since 1.3
*/
-abstract class StreamBridge extends FilterOutputStream {
+abstract class AbstractStreamBridge extends FilterOutputStream {
private InputStream input;
private final Object inputLock = new Object();
- protected StreamBridge() {
+ protected AbstractStreamBridge() {
this(null);
}
- protected StreamBridge(final OutputStream out) {
+ protected AbstractStreamBridge(final OutputStream out) {
super(out);
}
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java
index 6fa0fad7..a4900e19 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
*
* @since 1.3
*/
-class InMemoryCachingStreamBridge extends StreamBridge {
+class InMemoryCachingStreamBridge extends AbstractStreamBridge {
InMemoryCachingStreamBridge() {
super(new ByteArrayOutputStream());
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 02b40806..6beb1356 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
@@ -75,7 +75,7 @@ public class Pack200CompressorInputStream extends
CompressorInputStream {
private final InputStream originalInput;
- private final StreamBridge streamBridge;
+ private final AbstractStreamBridge abstractStreamBridge;
/**
* Decompresses the given file, caching the decompressed data in
@@ -150,8 +150,8 @@ public class Pack200CompressorInputStream extends
CompressorInputStream {
final Map<String, String> props)
throws IOException {
originalInput = in;
- streamBridge = mode.newStreamBridge();
- try (final JarOutputStream jarOut = new JarOutputStream(streamBridge))
{
+ abstractStreamBridge = mode.newStreamBridge();
+ try (final JarOutputStream jarOut = new
JarOutputStream(abstractStreamBridge)) {
final Pack200.Unpacker u = Pack200.newUnpacker();
if (props != null) {
u.properties().putAll(props);
@@ -223,13 +223,13 @@ public class Pack200CompressorInputStream extends
CompressorInputStream {
@Override
public int available() throws IOException {
- return streamBridge.getInput().available();
+ return abstractStreamBridge.getInput().available();
}
@Override
public void close() throws IOException {
try {
- streamBridge.stop();
+ abstractStreamBridge.stop();
} finally {
if (originalInput != null) {
originalInput.close();
@@ -240,7 +240,7 @@ public class Pack200CompressorInputStream extends
CompressorInputStream {
@Override
public synchronized void mark(final int limit) {
try {
- streamBridge.getInput().mark(limit);
+ abstractStreamBridge.getInput().mark(limit);
} catch (final IOException ex) {
throw new UncheckedIOException(ex); //NOSONAR
}
@@ -249,7 +249,7 @@ public class Pack200CompressorInputStream extends
CompressorInputStream {
@Override
public boolean markSupported() {
try {
- return streamBridge.getInput().markSupported();
+ return abstractStreamBridge.getInput().markSupported();
} catch (final IOException ex) { // NOSONAR
return false;
}
@@ -257,25 +257,25 @@ public class Pack200CompressorInputStream extends
CompressorInputStream {
@Override
public int read() throws IOException {
- return streamBridge.getInput().read();
+ return abstractStreamBridge.getInput().read();
}
@Override
public int read(final byte[] b) throws IOException {
- return streamBridge.getInput().read(b);
+ return abstractStreamBridge.getInput().read(b);
}
@Override
public int read(final byte[] b, final int off, final int count) throws
IOException {
- return streamBridge.getInput().read(b, off, count);
+ return abstractStreamBridge.getInput().read(b, off, count);
}
@Override
public synchronized void reset() throws IOException {
- streamBridge.getInput().reset();
+ abstractStreamBridge.getInput().reset();
}
@Override
public long skip(final long count) throws IOException {
- return IOUtils.skip(streamBridge.getInput(), count);
+ return IOUtils.skip(abstractStreamBridge.getInput(), count);
}
}
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
index d3e403d5..c3043eb1 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
@@ -36,7 +36,7 @@ import org.apache.commons.compress.java.util.jar.Pack200;
public class Pack200CompressorOutputStream extends CompressorOutputStream {
private boolean finished;
private final OutputStream originalOutput;
- private final StreamBridge streamBridge;
+ private final AbstractStreamBridge abstractStreamBridge;
private final Map<String, String> properties;
/**
@@ -93,7 +93,7 @@ public class Pack200CompressorOutputStream extends
CompressorOutputStream {
final Map<String, String> props)
throws IOException {
originalOutput = out;
- streamBridge = mode.newStreamBridge();
+ abstractStreamBridge = mode.newStreamBridge();
properties = props;
}
@@ -103,7 +103,7 @@ public class Pack200CompressorOutputStream extends
CompressorOutputStream {
finish();
} finally {
try {
- streamBridge.stop();
+ abstractStreamBridge.stop();
} finally {
originalOutput.close();
}
@@ -117,7 +117,7 @@ public class Pack200CompressorOutputStream extends
CompressorOutputStream {
if (properties != null) {
p.properties().putAll(properties);
}
- try (JarInputStream ji = new
JarInputStream(streamBridge.getInput())) {
+ try (JarInputStream ji = new
JarInputStream(abstractStreamBridge.getInput())) {
p.pack(ji, originalOutput);
}
}
@@ -125,16 +125,16 @@ public class Pack200CompressorOutputStream extends
CompressorOutputStream {
@Override
public void write(final byte[] b) throws IOException {
- streamBridge.write(b);
+ abstractStreamBridge.write(b);
}
@Override
public void write(final byte[] b, final int from, final int length) throws
IOException {
- streamBridge.write(b, from, length);
+ abstractStreamBridge.write(b, from, length);
}
@Override
public void write(final int b) throws IOException {
- streamBridge.write(b);
+ abstractStreamBridge.write(b);
}
}
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Strategy.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Strategy.java
index dba19929..957742f2 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Strategy.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Strategy.java
@@ -30,17 +30,17 @@ public enum Pack200Strategy {
/** Cache output in memory */
IN_MEMORY() {
@Override
- StreamBridge newStreamBridge() {
+ AbstractStreamBridge newStreamBridge() {
return new InMemoryCachingStreamBridge();
}
},
/** Cache output in a temporary file */
TEMP_FILE() {
@Override
- StreamBridge newStreamBridge() throws IOException {
+ AbstractStreamBridge newStreamBridge() throws IOException {
return new TempFileCachingStreamBridge();
}
};
- abstract StreamBridge newStreamBridge() throws IOException;
+ abstract AbstractStreamBridge newStreamBridge() throws IOException;
}
\ No newline at end of file
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
index 3ab05cb0..c394c0ba 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
@@ -31,7 +31,7 @@ import java.nio.file.Path;
*
* @since 1.3
*/
-class TempFileCachingStreamBridge extends StreamBridge {
+class TempFileCachingStreamBridge extends AbstractStreamBridge {
private final Path f;
TempFileCachingStreamBridge() throws IOException {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
index 48fc706e..10c07791 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
@@ -26,7 +26,7 @@ import java.util.List;
*/
public class NewAttribute extends BCIRenumberedAttribute {
- private static class BCIndex extends BCValue {
+ private static class BCIndex extends AbstractBcValue {
private final int index;
@@ -34,7 +34,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
this.index = index;
}
}
- private static class BCLength extends BCValue {
+ private static class BCLength extends AbstractBcValue {
private final int length;
@@ -42,7 +42,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
this.length = length;
}
}
- private static class BCOffset extends BCValue {
+ private static class BCOffset extends AbstractBcValue {
private final int offset;
private int index;
@@ -57,7 +57,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
}
// Bytecode-related value (either a bytecode index or a length)
- private static abstract class BCValue {
+ private static abstract class AbstractBcValue {
int actualValue;
@@ -221,8 +221,8 @@ public class NewAttribute extends BCIRenumberedAttribute {
value = ((Long) obj).longValue();
} else if (obj instanceof ClassFileEntry) {
value = pool.indexOf(((ClassFileEntry) obj));
- } else if (obj instanceof BCValue) {
- value = ((BCValue) obj).actualValue;
+ } else if (obj instanceof AbstractBcValue) {
+ value = ((AbstractBcValue) obj).actualValue;
}
// Write
switch (length) {
