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 2a66b7ca7 Report transport properties once per transfer and close the
discarded 412 response (#2295)
2a66b7ca7 is described below
commit 2a66b7ca710e8113d32035198c9d968a02faa789
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Wed Nov 18 16:03:56 2026 +0100
Report transport properties once per transfer and close the discarded 412
response (#2295)
When a resume request is answered with 412 Precondition Failed, the HTTP
transports retry with a plain GET. The Jetty transport left the 412 response's
`InputStreamResponseListener` open on that path, while its two retry branches
close it (the JDK transport closes the body and the Apache transport consumes
the entity), and all three transports reported the discarded response's
transport properties before the served response's.
Now the Jetty listener is closed, and `transportPropertiesAvailable` fires
once per transfer, for the response that serves it; in the Apache transport
`execute` takes a predicate for the status the caller retries.
`RecordingTransportListener` counts the calls, so the shared
`testGet_ResumeLocalContentsOutdated` asserts one event for every transport;
without the change it sees two for each of them.
---
.../test/util/http/HttpTransporterTest.java | 2 ++
.../test/util/http/RecordingTransportListener.java | 11 ++++++++
.../aether/transport/apache/ApacheTransporter.java | 29 ++++++++++++++++++----
.../aether/transport/jdk/JdkTransporter.java | 11 ++++----
.../aether/transport/jetty/JettyTransporter.java | 10 +++++---
5 files changed, 49 insertions(+), 14 deletions(-)
diff --git
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
index 2199ab030..72f7e9453 100644
---
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
+++
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java
@@ -1189,6 +1189,8 @@ public abstract class HttpTransporterTest {
assertEquals(9, listener.getDataLength());
assertTrue(listener.getProgressedCount() > 0, "Count: " +
listener.getProgressedCount());
assertEquals("resumable",
listener.getBaos().toString(StandardCharsets.UTF_8));
+ // the 412 answer to the resume request was discarded; only the served
response reports its properties
+ assertEquals(1, listener.getTransportPropertiesCount());
}
@Test
diff --git
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/RecordingTransportListener.java
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/RecordingTransportListener.java
index f7e050cd0..ff4f0e733 100644
---
a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/RecordingTransportListener.java
+++
b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/RecordingTransportListener.java
@@ -46,6 +46,8 @@ public class RecordingTransportListener extends
TransportListener {
private Map<TransferEvent.TransportPropertyKey, Object>
transportProperties;
+ private int transportPropertiesCount;
+
@Override
public void transportStarted(long dataOffset, long dataLength) throws
TransferCancelledException {
startedCount++;
@@ -77,6 +79,7 @@ public class RecordingTransportListener extends
TransportListener {
@Override
public void transportPropertiesAvailable(Map<TransportPropertyKey, Object>
transportProperties)
throws TransferCancelledException {
+ transportPropertiesCount++;
this.transportProperties = transportProperties;
}
@@ -119,4 +122,12 @@ public class RecordingTransportListener extends
TransportListener {
public Map<TransferEvent.TransportPropertyKey, Object>
getTransportProperties() {
return transportProperties;
}
+
+ /**
+ * The number of {@link #transportPropertiesAvailable(Map)} calls: one per
transfer, since the properties of a
+ * response the transporter discarded (for example a 412 to a resume
request) are not reported.
+ */
+ public int getTransportPropertiesCount() {
+ return transportPropertiesCount;
+ }
}
diff --git
a/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
b/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
index c3f9c033f..de1acca20 100644
---
a/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
+++
b/maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java
@@ -37,6 +37,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
+import java.util.function.IntPredicate;
import java.util.regex.Matcher;
import org.apache.http.Header;
@@ -426,11 +427,17 @@ final class ApacheTransporter extends AbstractTransporter
implements HttpTranspo
ApacheRFC9457Reporter.INSTANCE.prepareRequest(request);
}
while (true) {
+ final boolean resumeRequested = resume;
try {
- if (resume) {
+ if (resumeRequested) {
resume(request, task);
}
- execute(request, getter, task.getListener());
+ // a 412 to a resume request is retried below as a plain GET,
so that response is not reported
+ execute(
+ request,
+ getter,
+ task.getListener(),
+ status -> resumeRequested && status ==
HttpStatus.SC_PRECONDITION_FAILED);
break;
} catch (HttpResponseException e) {
if (resume
@@ -466,15 +473,27 @@ final class ApacheTransporter extends AbstractTransporter
implements HttpTranspo
}
private void execute(HttpUriRequest request, EntityGetter getter,
TransportListener listener) throws Exception {
+ execute(request, getter, listener, status -> false);
+ }
+
+ /**
+ * @param discardedStatus the response statuses the caller retries with
another request; such a response does
+ * not serve the transfer, so its transport
properties are not reported
+ */
+ private void execute(
+ HttpUriRequest request, EntityGetter getter, TransportListener
listener, IntPredicate discardedStatus)
+ throws Exception {
try {
SharingHttpContext context = new SharingHttpContext(state);
context.setAuthCache(authCache);
prepare(request, context);
try (CloseableHttpResponse response = client.execute(server,
request, context)) {
try {
- Map<TransferEvent.TransportPropertyKey, Object>
transportProperties =
- createTransportProperties(response, context);
- listener.transportPropertiesAvailable(transportProperties);
+ if
(!discardedStatus.test(response.getStatusLine().getStatusCode())) {
+ Map<TransferEvent.TransportPropertyKey, Object>
transportProperties =
+ createTransportProperties(response, context);
+
listener.transportPropertiesAvailable(transportProperties);
+ }
handleStatus(response);
if (getter != null) {
getter.handle(response);
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
index 13311a3df..3320e406b 100644
---
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
@@ -338,13 +338,14 @@ final class JdkTransporter extends AbstractTransporter
implements HttpTransporte
prepare(request);
try {
response = send(request.build(),
HttpResponse.BodyHandlers.ofInputStream());
+ if (resume && response.statusCode() ==
PRECONDITION_FAILED) {
+ // the local contents are outdated: discard this
response and fetch the whole file
+ closeBody(response);
+ resume = false;
+ continue;
+ }
task.getListener().transportPropertiesAvailable(createTransportProperties(response));
if (response.statusCode() >= MULTIPLE_CHOICES) {
- if (resume && response.statusCode() ==
PRECONDITION_FAILED) {
- closeBody(response);
- resume = false;
- continue;
- }
JdkRFC9457Reporter.INSTANCE.generateException(response, (statusCode,
reasonPhrase) -> {
throw new HttpTransporterException(statusCode);
});
diff --git
a/maven-resolver-transport-jetty/src/main/java/org/eclipse/aether/transport/jetty/JettyTransporter.java
b/maven-resolver-transport-jetty/src/main/java/org/eclipse/aether/transport/jetty/JettyTransporter.java
index b51e85a2d..3d0f03f7a 100644
---
a/maven-resolver-transport-jetty/src/main/java/org/eclipse/aether/transport/jetty/JettyTransporter.java
+++
b/maven-resolver-transport-jetty/src/main/java/org/eclipse/aether/transport/jetty/JettyTransporter.java
@@ -326,14 +326,16 @@ final class JettyTransporter extends AbstractTransporter
implements HttpTranspor
attempt++;
continue;
}
+ if (resume && response.getStatus() == PRECONDITION_FAILED) {
+ // the local contents are outdated: discard this response and
fetch the whole file
+ listener.close();
+ resume = false;
+ continue;
+ }
Map<TransferEvent.TransportPropertyKey, Object>
transportProperties =
createTransportProperties(request, rawResponseHeaders);
task.getListener().transportPropertiesAvailable(transportProperties);
if (response.getStatus() >= MULTIPLE_CHOICES) {
- if (resume && response.getStatus() == PRECONDITION_FAILED) {
- resume = false;
- continue;
- }
JettyRFC9457Reporter.INSTANCE.generateException(listener,
(statusCode, reasonPhrase) -> {
throw new HttpTransporterException(statusCode);
});