This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 8c30c4c1e Use try-with-resources in AbstractTransporter (#1947)
8c30c4c1e is described below
commit 8c30c4c1e15ceed9cf38a750d077aa6eca8116d6
Author: Aayush Tiwari <[email protected]>
AuthorDate: Thu Jul 16 22:37:10 2026 +0530
Use try-with-resources in AbstractTransporter (#1947)
## Summary
- Refactor `AbstractTransporter` stream handling to use try-with-resources
for the close-on-completion paths.
- Preserve the existing `close=false` behavior by leaving download input
streams open and flushing upload output streams.
- Add focused tests for the `utilGet` and `utilPut` close/flush contracts.
Closes apache/maven-resolver#1521.
Generated-by: Codex
---
.../connector/transport/AbstractTransporter.java | 34 +++--
.../transport/AbstractTransporterTest.java | 143 +++++++++++++++++++++
2 files changed, 164 insertions(+), 13 deletions(-)
diff --git
a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
index 7c4f680d6..a532cd4d0 100644
---
a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
+++
b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
@@ -90,12 +90,16 @@ public abstract class AbstractTransporter implements
Transporter {
*/
protected void utilGet(GetTask task, InputStream is, boolean close, long
length, boolean resume)
throws IOException, TransferCancelledException {
- try (OutputStream os = task.newOutputStream(resume)) {
- task.getListener().transportStarted(resume ?
task.getResumeOffset() : 0L, length);
- copy(os, is, task.getListener());
- } finally {
- if (close) {
- is.close();
+ if (close) {
+ try (InputStream input = is;
+ OutputStream os = task.newOutputStream(resume)) {
+ task.getListener().transportStarted(resume ?
task.getResumeOffset() : 0L, length);
+ copy(os, input, task.getListener());
+ }
+ } else {
+ try (OutputStream os = task.newOutputStream(resume)) {
+ task.getListener().transportStarted(resume ?
task.getResumeOffset() : 0L, length);
+ copy(os, is, task.getListener());
}
}
}
@@ -129,13 +133,17 @@ public abstract class AbstractTransporter implements
Transporter {
*/
protected void utilPut(PutTask task, OutputStream os, boolean close)
throws IOException, TransferCancelledException {
- try (InputStream is = task.newInputStream()) {
- task.getListener().transportStarted(0, task.getDataLength());
- copy(os, is, task.getListener());
- } finally {
- if (close) {
- os.close();
- } else {
+ if (close) {
+ try (OutputStream output = os;
+ InputStream is = task.newInputStream()) {
+ task.getListener().transportStarted(0, task.getDataLength());
+ copy(output, is, task.getListener());
+ }
+ } else {
+ try (InputStream is = task.newInputStream()) {
+ task.getListener().transportStarted(0, task.getDataLength());
+ copy(os, is, task.getListener());
+ } finally {
os.flush();
}
}
diff --git
a/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/transport/AbstractTransporterTest.java
b/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/transport/AbstractTransporterTest.java
new file mode 100644
index 000000000..9eaedc35d
--- /dev/null
+++
b/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/transport/AbstractTransporterTest.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.eclipse.aether.spi.connector.transport;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AbstractTransporterTest {
+
+ private static final byte[] DATA = "data".getBytes(StandardCharsets.UTF_8);
+ private static final TestTransporter TRANSPORTER = new TestTransporter();
+
+ @Test
+ void testUtilGetClosesInputStreamWhenRequested() throws Exception {
+ CloseAwareInputStream input = new CloseAwareInputStream(DATA);
+ GetTask task = new GetTask(URI.create("file.txt"));
+
+ TRANSPORTER.utilGet(task, input, true, DATA.length, false);
+
+ assertArrayEquals(DATA, task.getDataBytes());
+ assertTrue(input.isClosed());
+ }
+
+ @Test
+ void testUtilGetLeavesInputStreamOpenWhenRequested() throws Exception {
+ CloseAwareInputStream input = new CloseAwareInputStream(DATA);
+ GetTask task = new GetTask(URI.create("file.txt"));
+
+ TRANSPORTER.utilGet(task, input, false, DATA.length, false);
+
+ assertArrayEquals(DATA, task.getDataBytes());
+ assertFalse(input.isClosed());
+ }
+
+ @Test
+ void testUtilPutClosesOutputStreamWhenRequested() throws Exception {
+ CloseAwareOutputStream output = new CloseAwareOutputStream();
+ PutTask task = new PutTask(URI.create("file.txt")).setDataBytes(DATA);
+
+ TRANSPORTER.utilPut(task, output, true);
+
+ assertArrayEquals(DATA, output.toByteArray());
+ assertTrue(output.isClosed());
+ assertFalse(output.isFlushed());
+ }
+
+ @Test
+ void testUtilPutFlushesOutputStreamWhenLeftOpen() throws Exception {
+ CloseAwareOutputStream output = new CloseAwareOutputStream();
+ PutTask task = new PutTask(URI.create("file.txt")).setDataBytes(DATA);
+
+ TRANSPORTER.utilPut(task, output, false);
+
+ assertArrayEquals(DATA, output.toByteArray());
+ assertFalse(output.isClosed());
+ assertTrue(output.isFlushed());
+ }
+
+ private static final class TestTransporter extends AbstractTransporter {
+ @Override
+ public int classify(Throwable error) {
+ return ERROR_OTHER;
+ }
+
+ @Override
+ protected void implPeek(PeekTask task) {}
+
+ @Override
+ protected void implGet(GetTask task) {}
+
+ @Override
+ protected void implPut(PutTask task) {}
+
+ @Override
+ protected void implClose() {}
+ }
+
+ private static final class CloseAwareInputStream extends
ByteArrayInputStream {
+ private boolean closed;
+
+ CloseAwareInputStream(byte[] buf) {
+ super(buf);
+ }
+
+ @Override
+ public void close() throws IOException {
+ closed = true;
+ super.close();
+ }
+
+ boolean isClosed() {
+ return closed;
+ }
+ }
+
+ private static final class CloseAwareOutputStream extends
ByteArrayOutputStream {
+ private boolean closed;
+ private boolean flushed;
+
+ @Override
+ public void close() throws IOException {
+ closed = true;
+ super.close();
+ }
+
+ @Override
+ public void flush() throws IOException {
+ flushed = true;
+ super.flush();
+ }
+
+ boolean isClosed() {
+ return closed;
+ }
+
+ boolean isFlushed() {
+ return flushed;
+ }
+ }
+}
