You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/04/19 19:24:36 UTC
[maven-wagon] 03/03: [WAGON-588] Handle 404 and 410 consistently in
HTTP-based Wagon providers
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit 9600102303d646b0e3fe3b5caf2dcf80f6c34286
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 19 21:09:29 2020 +0200
[WAGON-588] Handle 404 and 410 consistently in HTTP-based Wagon providers
---
.../org/apache/maven/wagon/providers/http/LightweightHttpWagon.java | 2 ++
.../org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 3 +++
.../src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java | 1 +
3 files changed, 6 insertions(+)
diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
index fe06e15..34240c4 100644
--- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
+++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
@@ -286,6 +286,7 @@ public class LightweightHttpWagon
reasonPhrase, getProxyInfo() ) );
case HttpURLConnection.HTTP_NOT_FOUND:
+ case HttpURLConnection.HTTP_GONE:
throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( buildUrl( resource ),
statusCode, reasonPhrase, getProxyInfo() ) );
@@ -453,6 +454,7 @@ public class LightweightHttpWagon
throw new AuthorizationException( "Access denied to: " + url );
case HttpURLConnection.HTTP_NOT_FOUND:
+ case HttpURLConnection.HTTP_GONE:
return false;
// TODO Move 401/407 to AuthenticationException after WAGON-587
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index e0bb164..bebadd8 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -805,6 +805,7 @@ public abstract class AbstractHttpClientWagon
response.getStatusLine().getReasonPhrase(), getProxyInfo() ) );
case HttpStatus.SC_NOT_FOUND:
+ case HttpStatus.SC_GONE:
EntityUtils.consumeQuietly( response.getEntity() );
throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( url,
response.getStatusLine().getStatusCode(),
@@ -885,6 +886,7 @@ public abstract class AbstractHttpClientWagon
response.getStatusLine().getReasonPhrase(), getProxyInfo() ) );
case HttpStatus.SC_NOT_FOUND:
+ case HttpStatus.SC_GONE:
result = false;
break;
@@ -1171,6 +1173,7 @@ public abstract class AbstractHttpClientWagon
getProxyInfo() ) );
case HttpStatus.SC_NOT_FOUND:
+ case HttpStatus.SC_GONE:
EntityUtils.consumeQuietly( response.getEntity() );
throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( url,
response.getStatusLine().getStatusCode(),
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
index 08dc803..0f3107a 100644
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
@@ -89,6 +89,7 @@ public class HttpWagon
reasonPhrase, getProxyInfo() ) );
case HttpStatus.SC_NOT_FOUND:
+ case HttpStatus.SC_GONE:
EntityUtils.consumeQuietly( response.getEntity() );
throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( url, statusCode,
reasonPhrase, getProxyInfo() ) );