You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/08/15 07:47:44 UTC
[maven-wagon] 02/02: Fix checkstyle issues
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit d4f23f1523d9f63bf5682159b33537ce50366154
Author: Tim te Beek <ti...@moderne.io>
AuthorDate: Sun May 14 12:25:12 2023 +0100
Fix checkstyle issues
---
.../java/org/apache/maven/wagon/http/HttpWagonTestCase.java | 13 ++++++++-----
.../maven/wagon/shared/http/AbstractHttpClientWagon.java | 2 +-
.../apache/maven/wagon/providers/webdav/WebDavWagon.java | 2 +-
.../java/org/apache/maven/wagon/tck/http/Assertions.java | 13 +++++++++----
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
index 58940d7e..47cdfcab 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
@@ -2317,7 +2317,8 @@ public abstract class HttpWagonTestCase
// TODO: add test for 410: Gone?
assertTrue( "404 not found response should throw ResourceDoesNotExistException",
e instanceof ResourceDoesNotExistException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Not Found" : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Not Found" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "resource missing at " + forUrl + ", status: 404"
+ reasonPhrase, e.getMessage() );
break;
@@ -2328,7 +2329,8 @@ public abstract class HttpWagonTestCase
+ " AuthenticationException is not explicitly declared as thrown from wagon "
+ "methods",
e instanceof AuthorizationException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Unauthorized" : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Unauthorized" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "authentication failed for " + forUrl + ", status: 401"
+ reasonPhrase, e.getMessage() );
break;
@@ -2336,8 +2338,8 @@ public abstract class HttpWagonTestCase
case HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED:
assertTrue( "407 Proxy authentication required should throw AuthorizationException",
e instanceof AuthorizationException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Proxy Authentication Required"
- : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Proxy Authentication Required" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "proxy authentication failed for "
+ forUrl + ", status: 407" + reasonPhrase, e.getMessage() );
break;
@@ -2345,7 +2347,8 @@ public abstract class HttpWagonTestCase
case HttpServletResponse.SC_FORBIDDEN:
assertTrue( "403 Forbidden should throw AuthorizationException",
e instanceof AuthorizationException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Forbidden" : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Forbidden" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "authorization failed for " + forUrl + ", status: 403"
+ reasonPhrase, e.getMessage() );
break;
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 38a9aa81..9cf7f090 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
@@ -605,7 +605,7 @@ public abstract class AbstractHttpClientWagon
String username = authenticationInfo.getUserName();
String password = authenticationInfo.getPassword();
- if ( (username != null && !username.isEmpty()) && (password != null && !password.isEmpty()) )
+ if ( ( username != null && !username.isEmpty() ) && ( password != null && !password.isEmpty() ) )
{
Credentials creds = new UsernamePasswordCredentials( username, password );
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
index 59a9969c..70fe28a2 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
@@ -280,7 +280,7 @@ public class WebDavWagon
fileName = PathUtils.filename( PathUtils.dirname( URLDecoder.decode( entryUrl ) ) ) + "/";
}
- if ( !(fileName == null || fileName.isEmpty()) )
+ if ( !( fileName == null || fileName.isEmpty() ) )
{
dirs.add( fileName );
}
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/Assertions.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/Assertions.java
index ecf9b74b..d0eb7190 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/Assertions.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/Assertions.java
@@ -117,7 +117,8 @@ public final class Assertions
// TODO: add test for 410: Gone?
assertTrue( "404 not found response should throw ResourceDoesNotExistException",
e instanceof ResourceDoesNotExistException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Not Found" : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Not Found" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "resource missing at " + forUrl + ", status: 404"
+ reasonPhrase, e.getMessage() );
break;
@@ -128,7 +129,8 @@ public final class Assertions
+ " AuthenticationException is not explicitly declared as thrown from wagon "
+ "methods",
e instanceof AuthorizationException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Unauthorized" : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Unauthorized" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "authentication failed for " + forUrl + ", status: 401"
+ reasonPhrase, e.getMessage() );
break;
@@ -136,7 +138,9 @@ public final class Assertions
case HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED:
assertTrue( "407 Proxy authentication required should throw AuthorizationException",
e instanceof AuthorizationException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Proxy Authentication Required"
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+
+ ? " Proxy Authentication Required"
: ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "proxy authentication failed for "
+ forUrl + ", status: 407" + reasonPhrase, e.getMessage() );
@@ -145,7 +149,8 @@ public final class Assertions
case HttpServletResponse.SC_FORBIDDEN:
assertTrue( "403 Forbidden should throw AuthorizationException",
e instanceof AuthorizationException );
- reasonPhrase = (forReasonPhrase == null || forReasonPhrase.isEmpty()) ? " Forbidden" : ( " " + forReasonPhrase );
+ reasonPhrase = ( forReasonPhrase == null || forReasonPhrase.isEmpty() )
+ ? " Forbidden" : ( " " + forReasonPhrase );
assertEquals( assertMessageForBadMessage, "authorization failed for " + forUrl + ", status: 403"
+ reasonPhrase, e.getMessage() );
break;