You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/03/22 17:24:42 UTC
[2/2] maven-wagon git commit: [WAGON-424] updated parent pom to
latest, fixing errors reported by rat and Checkstyle
[WAGON-424] updated parent pom to latest, fixing errors reported by rat
and Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/5fcf54b9
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/5fcf54b9
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/5fcf54b9
Branch: refs/heads/master
Commit: 5fcf54b96f91c02239e8ab5062dd058d316d7f99
Parents: 479f7be
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Mar 22 17:24:38 2015 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Mar 22 17:24:38 2015 +0100
----------------------------------------------------------------------
pom.xml | 15 +-
.../apache/maven/wagon/PermissionModeUtils.java | 2 +
.../org/apache/maven/wagon/StreamingWagon.java | 7 +-
.../java/org/apache/maven/wagon/Streams.java | 3 +
.../main/java/org/apache/maven/wagon/Wagon.java | 7 +-
.../maven/wagon/events/SessionEventSupport.java | 2 +-
.../maven/wagon/observers/ChecksumObserver.java | 2 +
.../maven/wagon/CommandExecutorTestCase.java | 28 +-
.../maven/wagon/StreamingWagonTestCase.java | 2 +
.../org/apache/maven/wagon/WagonTestCase.java | 8 +-
.../maven/wagon/http/HttpWagonTestCase.java | 101 ++--
.../maven/wagon/providers/ftp/FtpWagon.java | 7 +
.../maven/wagon/shared/http/EncodingUtil.java | 14 +-
.../wagon/shared/http/HtmlFileListParser.java | 4 +-
.../providers/http/AbstractHttpClientWagon.java | 40 +-
.../providers/http/ConfigurationUtils.java | 11 +-
.../wagon/providers/http/HttpConfiguration.java | 3 +
.../providers/http/HttpMethodConfiguration.java | 3 +
.../providers/http/RelaxedTrustStrategy.java | 4 +-
.../ssh/AbstractEmbeddedScpWagonTest.java | 21 +-
.../maven/wagon/providers/ssh/ScpCommand.java | 32 +-
.../wagon/providers/ssh/ScpCommandFactory.java | 63 ++-
.../maven/wagon/providers/ssh/ShellCommand.java | 1 +
.../wagon/providers/ssh/SshServerEmbedded.java | 13 +-
.../ssh/TestPasswordAuthenticator.java | 26 +-
.../ssh/TestPublickeyAuthenticator.java | 14 +-
.../knownhost/KnownHostsProviderTestCase.java | 3 +
.../maven/wagon/providers/ssh/ScpHelper.java | 3 +-
.../providers/ssh/knownhost/KnownHostEntry.java | 3 +
.../ssh/external/ScpExternalWagon.java | 3 +-
.../wagon/providers/ssh/jsch/ScpWagon.java | 3 +-
.../wagon/providers/ssh/jsch/SftpWagon.java | 4 +-
.../apache/jackrabbit/webdav/MultiStatus.java | 26 +-
.../webdav/client/methods/XmlRequestEntity.java | 26 +-
.../webdav/AbstractHttpClientWagon.java | 10 +-
.../providers/webdav/HttpConfiguration.java | 3 +
.../webdav/HttpMethodConfiguration.java | 20 +-
.../wagon/providers/webdav/PathNavigator.java | 4 +-
.../wagon/providers/webdav/WebDavWagon.java | 12 +-
.../main/plexus/META-INF/plexus/components.xml | 19 +
.../wagon-tck-http/Test Plan.html/Checked.png | Bin 277 -> 0 bytes
.../wagon-tck-http/Test Plan.html/Collapsed.png | Bin 193 -> 0 bytes
.../wagon-tck-http/Test Plan.html/Expanded.png | Bin 210 -> 0 bytes
.../Test Plan.html/LeafRowHandle.png | Bin 210 -> 0 bytes
.../wagon-tck-http/Test Plan.html/Mixed.png | Bin 213 -> 0 bytes
.../wagon-tck-http/Test Plan.html/Unchecked.png | Bin 205 -> 0 bytes
.../wagon-tck-http/Test Plan.html/blank.png | Bin 168 -> 0 bytes
.../wagon-tck-http/Test Plan.html/index.html | 547 -------------------
.../wagon-tck-http/Test Plan.html/outliner.js | 115 ----
.../wagon-tck-http/Test Plan.oo3/contents.xml | Bin 2048 -> 0 bytes
wagon-tcks/wagon-tck-http/pom.xml | 21 +-
.../wagon-tck-http/sample-tck-consumer/pom.xml | 21 +-
.../wagon/tck/http/consumer/TestSuite.java | 19 +
.../resources/META-INF/plexus/components.xml | 19 +
.../apache/maven/wagon/tck/http/Assertions.java | 3 +
.../maven/wagon/tck/http/GetWagonTests.java | 27 +-
.../maven/wagon/tck/http/HttpWagonTests.java | 15 +-
.../wagon/tck/http/HttpsGetWagonTests.java | 4 +-
.../tck/http/WagonTestCaseConfigurator.java | 3 +
.../wagon/tck/http/fixture/AuthSnoopFilter.java | 3 +
.../tck/http/fixture/ErrorCodeServlet.java | 3 +
.../wagon/tck/http/fixture/LatencyServlet.java | 4 +
.../http/fixture/ProxyAuthenticationFilter.java | 3 +
.../fixture/ProxyConnectionVerifierFilter.java | 3 +
.../tck/http/fixture/RedirectionServlet.java | 3 +
.../wagon/tck/http/fixture/ServerFixture.java | 5 +-
.../http/fixture/ServletExceptionServlet.java | 3 +
.../maven/wagon/tck/http/util/TestUtil.java | 14 +-
.../maven/wagon/tck/http/util/ValueHolder.java | 4 +
69 files changed, 529 insertions(+), 882 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cafad39..8df3bbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>24</version>
+ <version>26</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -356,6 +356,19 @@ under the License.
<topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/*.odg</exclude>
+ <exclude>src/test/resources/**</exclude>
+ <exclude>src/main/resources/default-server-root/**</exclude>
+ <exclude>src/main/resources/ssh-keys/**</exclude>
+ <exclude>src/test/ssh-keys/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java
index f5ff64a..bc4c86c 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java
@@ -48,7 +48,9 @@ public final class PermissionModeUtils
mode = mode % 8 + ( ( mode / 8 ) % 8 ) * 8 + ( ( mode / 64 ) % 8 ) * 64;
+ // CHECKSTYLE_OFF: MagicNumber
ret = Integer.toOctalString( 0777 - mode );
+ // CHECKSTYLE_ON: MagicNumber
}
catch ( final NumberFormatException e )
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java
index b712b33..a6208f2 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamingWagon.java
@@ -24,6 +24,9 @@ import java.io.OutputStream;
import org.apache.maven.wagon.authorization.AuthorizationException;
+/**
+ *
+ */
public interface StreamingWagon
extends Wagon
{
@@ -58,8 +61,8 @@ public interface StreamingWagon
throws ResourceDoesNotExistException, TransferFailedException, AuthorizationException;
/**
- * @deprecated due to unknown contentLength various http(s) implementation will use a chuncked transfer encoding mode
- * you must take care you http target server supports that (ngnix don't !).
+ * @deprecated due to unknown contentLength various http(s) implementation will use a chuncked transfer encoding
+ * mode you must take care you http target server supports that (ngnix don't !).
* <b>So in case of http(s) transport layer avoid using this. Will be remove in 3.0</b>
* Copy from a local input stream to remote.
*
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-api/src/main/java/org/apache/maven/wagon/Streams.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/Streams.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/Streams.java
index 0a1eeeb..a3d09d8 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/Streams.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/Streams.java
@@ -19,6 +19,9 @@ package org.apache.maven.wagon;
* under the License.
*/
+/**
+ *
+ */
public class Streams
{
private String out = "";
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
index de70f32..0b76728 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
@@ -31,6 +31,9 @@ import org.apache.maven.wagon.repository.Repository;
import java.io.File;
import java.util.List;
+/**
+ *
+ */
public interface Wagon
{
String ROLE = Wagon.class.getName();
@@ -38,14 +41,14 @@ public interface Wagon
/**
* default 60s approximately 1 minute
*/
- public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
+ int DEFAULT_CONNECTION_TIMEOUT = 60000;
/**
* default 1800s approximately 30 minutes
*
* @since 2.2
*/
- public static final int DEFAULT_READ_TIMEOUT = 1800000;
+ int DEFAULT_READ_TIMEOUT = 1800000;
// ----------------------------------------------------------------------
// File/File handling
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
index f44b4c3..4cf5876 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEventSupport.java
@@ -216,7 +216,7 @@ public final class SessionEventSupport
*/
public void fireSessionError( final SessionEvent sessionEvent )
{
- for ( SessionListener listener : listeners)
+ for ( SessionListener listener : listeners )
{
listener.sessionError( sessionEvent );
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java
index 9be05ac..07f62ab 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java
@@ -109,8 +109,10 @@ public class ChecksumObserver
* @param binaryData Array containing the digest
* @return Encoded hex string, or null if encoding failed
*/
+ @SuppressWarnings( "checkstyle:magicnumber" )
protected String encode( byte[] binaryData )
{
+
if ( binaryData.length != 16 && binaryData.length != 20 )
{
int bitLength = binaryData.length * 8;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-test/src/main/java/org/apache/maven/wagon/CommandExecutorTestCase.java
----------------------------------------------------------------------
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/CommandExecutorTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/CommandExecutorTestCase.java
index c2a8969..fd3b401 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/CommandExecutorTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/CommandExecutorTestCase.java
@@ -1,18 +1,22 @@
package org.apache.maven.wagon;
/*
- * 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.
+ * 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.
*/
import org.codehaus.plexus.PlexusTestCase;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
----------------------------------------------------------------------
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
index 187a30f..18314b0 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
@@ -104,8 +104,10 @@ public abstract class StreamingWagonTestCase
setupRepositories();
setupWagonTestingFixtures();
int expectedSize = putFile();
+ // CHECKSTYLE_OFF: MagicNumber
getIfNewerToStream( getExpectedLastModifiedOnGet( testRepository, new Resource( resource ) ) + 30000, false,
expectedSize );
+ // CHECKSTYLE_ON: MagicNumber
}
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
----------------------------------------------------------------------
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
index 4a1a006..d79c187 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
@@ -34,7 +34,9 @@ import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.easymock.IAnswer;
+// CHECKSTYLE_OFF: AvoidStarImport
import static org.easymock.EasyMock.*;
+//CHECKSTYLE_ON: AvoidStarImport
import java.io.File;
import java.io.IOException;
@@ -70,7 +72,7 @@ public abstract class WagonTestCase
}
}
- protected static String POM = "pom.xml";
+ protected static final String POM = "pom.xml";
protected Repository localRepository;
@@ -249,8 +251,10 @@ public abstract class WagonTestCase
setupRepositories();
setupWagonTestingFixtures();
int expectedSize = putFile();
+ // CHECKSTYLE_OFF: MagicNumber
getIfNewer( getExpectedLastModifiedOnGet( testRepository, new Resource( resource ) ) + 30000, false,
expectedSize );
+ // CHECKSTYLE_ON: MagicNumber
}
}
@@ -743,7 +747,7 @@ public abstract class WagonTestCase
for ( String filename : filenames )
{
- assertTrue( "Filename '" + filename + "' should be in list.", list.contains(filename) );
+ assertTrue( "Filename '" + filename + "' should be in list.", list.contains( filename ) );
}
// WAGON-250
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
----------------------------------------------------------------------
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 45bed80..8657020 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
@@ -77,6 +77,8 @@ import java.util.zip.GZIPOutputStream;
public abstract class HttpWagonTestCase
extends StreamingWagonTestCase
{
+ public static final int SC_TOO_MANY_REQUESTS = 429;
+
private Server server;
protected void setupWagonTestingFixtures()
@@ -262,13 +264,13 @@ public abstract class HttpWagonTestCase
{
if ( called.get() )
{
- response.setStatus( 200 );
+ response.setStatus( HttpServletResponse.SC_OK );
( (Request) request ).setHandled( true );
}
else
{
called.set( true );
- response.setStatus( 429 );
+ response.setStatus( SC_TOO_MANY_REQUESTS );
( (Request) request ).setHandled( true );
}
@@ -415,7 +417,7 @@ public abstract class HttpWagonTestCase
else
{
called.set( true );
- response.setStatus( 429 );
+ response.setStatus( SC_TOO_MANY_REQUESTS );
( (Request) request ).setHandled( true );
}
}
@@ -555,12 +557,13 @@ public abstract class HttpWagonTestCase
if ( supportProxyPreemptiveAuthentication() )
{
- assertEquals( 200, handler.handlerRequestResponses.get( 0 ).responseCode );
+ assertEquals( HttpServletResponse.SC_OK, handler.handlerRequestResponses.get( 0 ).responseCode );
}
else
{
- assertEquals( 407, handler.handlerRequestResponses.get( 0 ).responseCode );
- assertEquals( 200, handler.handlerRequestResponses.get( 1 ).responseCode );
+ assertEquals( HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED,
+ handler.handlerRequestResponses.get( 0 ).responseCode );
+ assertEquals( HttpServletResponse.SC_OK, handler.handlerRequestResponses.get( 1 ).responseCode );
}
}
@@ -586,12 +589,13 @@ public abstract class HttpWagonTestCase
if ( supportProxyPreemptiveAuthentication() )
{
- assertEquals( 200, handler.handlerRequestResponses.get( 0 ).responseCode );
+ assertEquals( HttpServletResponse.SC_OK, handler.handlerRequestResponses.get( 0 ).responseCode );
}
else
{
- assertEquals( 407, handler.handlerRequestResponses.get( 0 ).responseCode );
- assertEquals( 200, handler.handlerRequestResponses.get( 1 ).responseCode );
+ assertEquals( HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED,
+ handler.handlerRequestResponses.get( 0 ).responseCode );
+ assertEquals( HttpServletResponse.SC_OK, handler.handlerRequestResponses.get( 1 ).responseCode );
}
}
@@ -627,7 +631,8 @@ public abstract class HttpWagonTestCase
String redirectUrl = protocol + "://localhost:" + server.getConnectors()[0].getLocalPort();
- RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, null );
+ RedirectHandler redirectHandler =
+ new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, null );
redirectServer.setHandler( redirectHandler );
@@ -647,8 +652,8 @@ public abstract class HttpWagonTestCase
String found = FileUtils.fileRead( tmpResult );
assertEquals( "found:'" + found + "'", "Hello, World!", found );
- checkHandlerResult( handler.handlerRequestResponses, 200 );
- checkHandlerResult( redirectHandler.handlerRequestResponses, 302 );
+ checkHandlerResult( handler.handlerRequestResponses, HttpServletResponse.SC_OK );
+ checkHandlerResult( redirectHandler.handlerRequestResponses, HttpServletResponse.SC_FOUND );
}
finally
{
@@ -691,7 +696,8 @@ public abstract class HttpWagonTestCase
String redirectUrl = protocol + "://localhost:" + server.getConnectors()[0].getLocalPort();
- RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, null );
+ RedirectHandler redirectHandler =
+ new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, null );
redirectServer.setHandler( redirectHandler );
@@ -707,8 +713,8 @@ public abstract class HttpWagonTestCase
String found = FileUtils.fileRead( tmpResult );
assertEquals( "found:'" + found + "'", "Hello, World!", found );
- checkHandlerResult( handler.handlerRequestResponses, 200 );
- checkHandlerResult( redirectHandler.handlerRequestResponses, 302 );
+ checkHandlerResult( handler.handlerRequestResponses, HttpServletResponse.SC_OK );
+ checkHandlerResult( redirectHandler.handlerRequestResponses, HttpServletResponse.SC_FOUND );
}
finally
{
@@ -757,7 +763,8 @@ public abstract class HttpWagonTestCase
String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort();
- RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, repositoryDirectory );
+ RedirectHandler redirectHandler =
+ new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, repositoryDirectory );
redirectServer.setHandler( redirectHandler );
@@ -804,8 +811,8 @@ public abstract class HttpWagonTestCase
protected void checkRequestResponseForRedirectPutFromStreamWithFullUrl( PutHandler putHandler,
RedirectHandler redirectHandler )
{
- checkHandlerResult( putHandler.handlerRequestResponses, 201 );
- checkHandlerResult( redirectHandler.handlerRequestResponses, 302 );
+ checkHandlerResult( putHandler.handlerRequestResponses, HttpServletResponse.SC_CREATED );
+ checkHandlerResult( redirectHandler.handlerRequestResponses, HttpServletResponse.SC_FOUND );
}
public void testRedirectPutFromStreamRelativeUrl()
@@ -828,7 +835,8 @@ public abstract class HttpWagonTestCase
addConnectors( redirectServer );
RedirectHandler redirectHandler =
- new RedirectHandler( "Found", 303, "/redirectRequest/foo", repositoryDirectory );
+ new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, "/redirectRequest/foo",
+ repositoryDirectory );
redirectServer.setHandler( redirectHandler );
@@ -877,7 +885,8 @@ public abstract class HttpWagonTestCase
RedirectHandler redirectHandler )
{
checkHandlerResult( putHandler.handlerRequestResponses );
- checkHandlerResult( redirectHandler.handlerRequestResponses, 302, 201 );
+ checkHandlerResult( redirectHandler.handlerRequestResponses, HttpServletResponse.SC_FOUND,
+ HttpServletResponse.SC_CREATED );
}
protected void checkHandlerResult( List<HandlerRequestResponse> handlerRequestResponses,
@@ -934,7 +943,8 @@ public abstract class HttpWagonTestCase
String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort();
- RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, repositoryDirectory );
+ RedirectHandler redirectHandler =
+ new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, repositoryDirectory );
redirectServer.setHandler( redirectHandler );
@@ -995,7 +1005,8 @@ public abstract class HttpWagonTestCase
addConnectors( redirectServer );
RedirectHandler redirectHandler =
- new RedirectHandler( "Found", 303, "/redirectRequest/foo", repositoryDirectory );
+ new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, "/redirectRequest/foo",
+ repositoryDirectory );
redirectServer.setHandler( redirectHandler );
@@ -1036,6 +1047,10 @@ public abstract class HttpWagonTestCase
}
+ /**
+ *
+ */
+ @SuppressWarnings( "checkstyle:visibilitymodifier" )
public static class RedirectHandler
extends AbstractHandler
{
@@ -1083,7 +1098,9 @@ public abstract class HttpWagonTestCase
// what an UGLY hack!
// but apparently jetty needs some time to free up resources
// <5s: broken test :(
+ // CHECKSTYLE_OFF: MagicNumber
Thread.sleep( 5001L );
+ // CHECKSTYLE_ON: MagicNumber
Server proxyServer = new Server( 0 );
@@ -1139,7 +1156,9 @@ public abstract class HttpWagonTestCase
// what an UGLY hack!
// but apparently jetty needs some time to free up resources
// <5s: broken test :(
+ // CHECKSTYLE_OFF: MagicNumber
Thread.sleep( 5001L );
+ // CHECKSTYLE_ON: MagicNumber
Server proxyServer = new Server( 0 );
@@ -1529,7 +1548,7 @@ public abstract class HttpWagonTestCase
else
{
called.set( true );
- response.setStatus( 429 );
+ response.setStatus( SC_TOO_MANY_REQUESTS );
( (Request) request ).setHandled( true );
}
}
@@ -1817,14 +1836,14 @@ public abstract class HttpWagonTestCase
{
assertEquals( "not 1 security handler use " + sh.handlerRequestResponses, 1,
sh.handlerRequestResponses.size() );
- assertEquals( 200, sh.handlerRequestResponses.get( 0 ).responseCode );
+ assertEquals( HttpServletResponse.SC_OK, sh.handlerRequestResponses.get( 0 ).responseCode );
}
else
{
assertEquals( "not 2 security handler use " + sh.handlerRequestResponses, 2,
sh.handlerRequestResponses.size() );
- assertEquals( 401, sh.handlerRequestResponses.get( 0 ).responseCode );
- assertEquals( 200, sh.handlerRequestResponses.get( 1 ).responseCode );
+ assertEquals( HttpServletResponse.SC_UNAUTHORIZED, sh.handlerRequestResponses.get( 0 ).responseCode );
+ assertEquals( HttpServletResponse.SC_OK, sh.handlerRequestResponses.get( 1 ).responseCode );
}
}
@@ -1879,6 +1898,10 @@ public abstract class HttpWagonTestCase
}
}
+ /**
+ *
+ */
+ @SuppressWarnings( "checkstyle:visibilitymodifier" )
public static class PutHandler
extends AbstractHandler
{
@@ -1898,15 +1921,15 @@ public abstract class HttpWagonTestCase
public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch )
throws IOException, ServletException
{
- Request base_request =
+ Request baseRequest =
request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getRequest();
- if ( base_request.isHandled() || !"PUT".equals( base_request.getMethod() ) )
+ if ( baseRequest.isHandled() || !"PUT".equals( baseRequest.getMethod() ) )
{
return;
}
- base_request.setHandled( true );
+ baseRequest.setHandled( true );
File file = new File( resourceBase, URLDecoder.decode( request.getPathInfo() ) );
file.getParentFile().mkdirs();
@@ -1951,19 +1974,25 @@ public abstract class HttpWagonTestCase
if ( request.getHeader( "Proxy-Authorization" ) == null )
{
handlerRequestResponses.add(
- new HandlerRequestResponse( request.getMethod(), 407, request.getRequestURI() ) );
- response.setStatus( 407 );
+ new HandlerRequestResponse( request.getMethod(),
+ HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED,
+ request.getRequestURI() ) );
+ response.setStatus( HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED );
response.addHeader( "Proxy-Authenticate", "Basic realm=\"Squid proxy-caching web server\"" );
( (Request) request ).setHandled( true );
return;
}
handlerRequestResponses.add(
- new HandlerRequestResponse( request.getMethod(), 200, request.getRequestURI() ) );
+ new HandlerRequestResponse( request.getMethod(), HttpServletResponse.SC_OK, request.getRequestURI() ) );
super.handle( target, request, response, dispatch );
}
}
+ /**
+ *
+ */
+ @SuppressWarnings( "checkstyle:visibilitymodifier" )
private static class TestHeaderHandler
extends AbstractHandler
{
@@ -2018,6 +2047,10 @@ public abstract class HttpWagonTestCase
return sh;
}
+ /**
+ *
+ */
+ @SuppressWarnings( "checkstyle:visibilitymodifier" )
public static class TestSecurityHandler
extends SecurityHandler
{
@@ -2037,6 +2070,10 @@ public abstract class HttpWagonTestCase
}
+ /**
+ *
+ */
+ @SuppressWarnings( "checkstyle:visibilitymodifier" )
public static class HandlerRequestResponse
{
public String method;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index dba8531..65fb1da 100644
--- a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++ b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -403,6 +403,9 @@ public class FtpWagon
}
}
+ /**
+ *
+ */
public class PrintCommandListener
implements ProtocolCommandListener
{
@@ -634,6 +637,7 @@ public class FtpWagon
}
catch ( IOException e )
{
+ // ignore
}
}
String mode = permissions.getFileMode();
@@ -645,6 +649,7 @@ public class FtpWagon
}
catch ( IOException e )
{
+ // ignore
}
}
}
@@ -695,6 +700,7 @@ public class FtpWagon
}
catch ( IOException e )
{
+ // ignore
}
}
String mode = permissions.getDirectoryMode();
@@ -706,6 +712,7 @@ public class FtpWagon
}
catch ( IOException e )
{
+ // ignore
}
}
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
index e98b9a9..9136553 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
@@ -1,12 +1,5 @@
package org.apache.maven.wagon.shared.http;
-import org.apache.commons.lang.StringUtils;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,6 +19,13 @@ import java.net.URL;
* under the License.
*/
+import org.apache.commons.lang.StringUtils;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
/**
* Encoding utility.
*
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
index f35b476..5ff34d9 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
@@ -76,7 +76,7 @@ public class HtmlFileListParser
// assumption.
String content = IOUtils.toString( stream, "utf-8" );
Document doc = Jsoup.parse( content, baseurl );
- Elements links = doc.select("a[href]");
+ Elements links = doc.select( "a[href]" );
Set<String> results = new HashSet<String>();
for ( Element link : links )
{
@@ -134,9 +134,11 @@ public class HtmlFileListParser
}
catch ( URISyntaxException e )
{
+ // ignore
}
catch ( UnsupportedEncodingException e )
{
+ // ignore
}
return ret;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 983bac7..e270c20 100755
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -105,7 +105,7 @@ public abstract class AbstractHttpClientWagon
extends AbstractHttpEntity
{
- private final static int BUFFER_SIZE = 2048;
+ private static final int BUFFER_SIZE = 2048;
private final Resource resource;
@@ -232,21 +232,21 @@ public abstract class AbstractHttpClientWagon
* skip failure on certificate validity checks.
* <b>disabled by default</b>
*/
- private final static boolean SSL_INSECURE =
+ private static final boolean SSL_INSECURE =
Boolean.valueOf( System.getProperty( "maven.wagon.http.ssl.insecure", "false" ) );
/**
* if using sslInsecure, certificate date issues will be ignored
* <b>disabled by default</b>
*/
- private final static boolean IGNORE_SSL_VALIDITY_DATES =
+ private static final boolean IGNORE_SSL_VALIDITY_DATES =
Boolean.valueOf( System.getProperty( "maven.wagon.http.ssl.ignore.validity.dates", "false" ) );
/**
- * If enabled, ssl hostname verifier does not check hostname. Disable this will use a browser compat hostname verifier
- * <b>disabled by default</b>
+ * If enabled, ssl hostname verifier does not check hostname. Disable this will use a browser compat hostname
+ * verifier <b>disabled by default</b>
*/
- private final static boolean SSL_ALLOW_ALL =
+ private static final boolean SSL_ALLOW_ALL =
Boolean.valueOf( System.getProperty( "maven.wagon.http.ssl.allowall", "false" ) );
@@ -254,14 +254,14 @@ public abstract class AbstractHttpClientWagon
* Maximum concurrent connections per distinct route.
* <b>20 by default</b>
*/
- private final static int MAX_CONN_PER_ROUTE =
+ private static final int MAX_CONN_PER_ROUTE =
Integer.parseInt( System.getProperty( "maven.wagon.httpconnectionManager.maxPerRoute", "20" ) );
/**
* Maximum concurrent connections in total.
* <b>40 by default</b>
*/
- private final static int MAX_CONN_TOTAL =
+ private static final int MAX_CONN_TOTAL =
Integer.parseInt( System.getProperty( "maven.wagon.httpconnectionManager.maxTotal", "40" ) );
/**
@@ -295,7 +295,7 @@ public abstract class AbstractHttpClientWagon
*
* @since 2.7
*/
- private final static int maxBackoffWaitSeconds =
+ private static final int MAX_BACKOFF_WAIT_SECONDS =
Integer.parseInt( System.getProperty( "maven.wagon.httpconnectionManager.maxBackoffSeconds", "180" ) );
@@ -312,7 +312,7 @@ public abstract class AbstractHttpClientWagon
return nextWait;
}
-
+ @SuppressWarnings( "checkstyle:linelength" )
private static PoolingHttpClientConnectionManager createConnManager()
{
@@ -364,7 +364,7 @@ public abstract class AbstractHttpClientWagon
return connManager;
}
- private static CloseableHttpClient CLIENT = createClient();
+ private static final CloseableHttpClient CLIENT = createClient();
private static CloseableHttpClient createClient()
{
@@ -375,7 +375,7 @@ public abstract class AbstractHttpClientWagon
.build();
}
- private static String DEFAULT_USER_AGENT = getDefaultUserAgent();
+ private static final String DEFAULT_USER_AGENT = getDefaultUserAgent();
private static String getDefaultUserAgent()
{
@@ -391,6 +391,7 @@ public abstract class AbstractHttpClientWagon
}
catch ( IOException ignore )
{
+ // ignore
}
finally
{
@@ -605,6 +606,7 @@ public abstract class AbstractHttpClientWagon
}
catch ( MalformedChallengeException ignore )
{
+ // ignore
}
}
@@ -632,7 +634,8 @@ public abstract class AbstractHttpClientWagon
case HttpStatus.SC_ACCEPTED: // 202
case HttpStatus.SC_NO_CONTENT: // 204
break;
- // handle all redirect even if http specs says " the user agent MUST NOT automatically redirect the request unless it can be confirmed by the user"
+ // handle all redirect even if http specs says " the user agent MUST NOT automatically redirect
+ // the request unless it can be confirmed by the user"
case HttpStatus.SC_MOVED_PERMANENTLY: // 301
case HttpStatus.SC_MOVED_TEMPORARILY: // 302
case HttpStatus.SC_SEE_OTHER: // 303
@@ -650,12 +653,10 @@ public abstract class AbstractHttpClientWagon
break;
//add more entries here
default:
- {
TransferFailedException e = new TransferFailedException(
"Failed to transfer file: " + url + ". Return code is: " + statusCode + reasonPhrase );
fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
throw e;
- }
}
firePutCompleted( resource, source );
@@ -1046,13 +1047,11 @@ public abstract class AbstractHttpClientWagon
// add more entries here
default:
- {
cleanupGetTransfer( resource );
TransferFailedException e = new TransferFailedException(
"Failed to transfer file: " + url + ". Return code is: " + statusCode + " " + reasonPhrase );
fireTransferError( resource, e, TransferEvent.REQUEST_GET );
throw e;
- }
}
Header contentLengthHeader = response.getFirstHeader( "Content-Length" );
@@ -1079,8 +1078,8 @@ public abstract class AbstractHttpClientWagon
if ( lastModified != null )
{
resource.setLastModified( lastModified.getTime() );
- fireTransferDebug( "last-modified = " + lastModifiedHeader.getValue() +
- " (" + lastModified.getTime() + ")" );
+ fireTransferDebug( "last-modified = " + lastModifiedHeader.getValue() + " ("
+ + lastModified.getTime() + ")" );
}
}
@@ -1121,6 +1120,7 @@ public abstract class AbstractHttpClientWagon
}
catch ( IOException ignore )
{
+ // ignore
}
}
@@ -1171,6 +1171,6 @@ public abstract class AbstractHttpClientWagon
public static int getMaxBackoffWaitSeconds()
{
- return maxBackoffWaitSeconds;
+ return MAX_BACKOFF_WAIT_SECONDS;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java
index ca82d37..4078c8c 100755
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/ConfigurationUtils.java
@@ -73,7 +73,7 @@ class ConfigurationUtils
{
String key = (String) entry.getKey();
String value = (String) entry.getValue();
- Matcher matcher = coercePattern.matcher(value);
+ Matcher matcher = coercePattern.matcher( value );
if ( matcher.matches() )
{
value = matcher.group( 2 );
@@ -97,14 +97,17 @@ class ConfigurationUtils
}
else if ( key.equals( DEFAULT_PROXY ) )
{
- builder.setProxy( new HttpHost( value ));
+ builder.setProxy( new HttpHost( value ) );
}
else if ( key.equals( LOCAL_ADDRESS ) )
{
- try {
+ try
+ {
builder.setLocalAddress( InetAddress.getByName( value ) );
}
- catch (UnknownHostException ignore) {
+ catch ( UnknownHostException ignore )
+ {
+ // ignore
}
}
else if ( key.equals( PROXY_AUTH_PREF ) )
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
index 94c0141..a7e0b23 100644
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
@@ -25,6 +25,9 @@ import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.protocol.HTTP;
+/**
+ *
+ */
public class HttpConfiguration
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
index f530e46..aef7c9c 100755
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpMethodConfiguration.java
@@ -26,6 +26,9 @@ import org.apache.http.Header;
import org.apache.http.message.BasicHeader;
import org.apache.maven.wagon.Wagon;
+/**
+ *
+ */
public class HttpMethodConfiguration
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedTrustStrategy.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedTrustStrategy.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedTrustStrategy.java
index bea4817..94a0878 100644
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedTrustStrategy.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/RelaxedTrustStrategy.java
@@ -37,12 +37,12 @@ public class RelaxedTrustStrategy
{
private final boolean ignoreSSLValidityDates;
- public RelaxedTrustStrategy(boolean ignoreSSLValidityDates)
+ public RelaxedTrustStrategy( boolean ignoreSSLValidityDates )
{
this.ignoreSSLValidityDates = ignoreSSLValidityDates;
}
- public boolean isTrusted(X509Certificate[] certificates, String authType)
+ public boolean isTrusted( X509Certificate[] certificates, String authType )
throws CertificateException
{
if ( ( certificates != null ) && ( certificates.length == 1 ) )
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
index 815982b..0c01331 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
@@ -35,7 +35,7 @@ public abstract class AbstractEmbeddedScpWagonTest
extends StreamingWagonTestCase
{
- SshServerEmbedded sshServerEmbedded;
+ SshServerEmbedded sshServer;
@Override
protected void setUp()
@@ -45,23 +45,24 @@ public abstract class AbstractEmbeddedScpWagonTest
String sshKeyResource = "ssh-keys/id_rsa";
- sshServerEmbedded = new SshServerEmbedded( getProtocol(), Arrays.asList( sshKeyResource ), false );
+ sshServer = new SshServerEmbedded( getProtocol(), Arrays.asList( sshKeyResource ), false );
- sshServerEmbedded.start();
- System.out.println( "sshd on port " + sshServerEmbedded.getPort() );
+ sshServer.start();
+ System.out.println( "sshd on port " + sshServer.getPort() );
}
@Override
+ @SuppressWarnings( "checkstyle:linelength" )
protected void tearDownWagonTestingFixtures()
throws Exception
{
- for ( TestPasswordAuthenticator.PasswordAuthenticatorRequest passwordAuthenticatorRequest : sshServerEmbedded.passwordAuthenticator.passwordAuthenticatorRequests )
+ for ( TestPasswordAuthenticator.PasswordAuthenticatorRequest request : sshServer.passwordAuthenticator.requests )
{
- assertEquals( TestData.getUserName(), passwordAuthenticatorRequest.username );
- assertEquals( TestData.getUserPassword(), passwordAuthenticatorRequest.password );
+ assertEquals( TestData.getUserName(), request.getUsername() );
+ assertEquals( TestData.getUserPassword(), request.getPassword() );
}
- sshServerEmbedded.stop();
+ sshServer.stop();
}
protected abstract String getProtocol();
@@ -69,13 +70,13 @@ public abstract class AbstractEmbeddedScpWagonTest
@Override
protected int getTestRepositoryPort()
{
- return sshServerEmbedded.getPort();
+ return sshServer.getPort();
}
public String getTestRepositoryUrl()
{
- return TestData.getTestRepositoryUrl( sshServerEmbedded.getPort() );
+ return TestData.getTestRepositoryUrl( sshServer.getPort() );
}
protected AuthenticationInfo getAuthInfo()
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
index aa104f7..bdd80f5 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommand.java
@@ -48,7 +48,7 @@ public class ScpCommand
implements Command, Runnable, FileSystemAware
{
- protected static final Logger log = LoggerFactory.getLogger( ScpCommand.class );
+ protected static final Logger LOG = LoggerFactory.getLogger( ScpCommand.class );
protected static final int OK = 0;
@@ -87,9 +87,9 @@ public class ScpCommand
public ScpCommand( String[] args )
{
name = Arrays.asList( args ).toString();
- if ( log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- log.debug( "Executing command {}", name );
+ LOG.debug( "Executing command {}", name );
}
path = ".";
for ( int i = 1; i < args.length; i++ )
@@ -118,7 +118,7 @@ public class ScpCommand
case 'd':
optD = true;
break;
-// default:
+ default:
// error = new IOException("Unsupported option: " + args[i].charAt(j));
// return;
}
@@ -307,7 +307,7 @@ public class ScpCommand
{
// Ignore
}
- log.info( "Error in scp command", e );
+ LOG.info( "Error in scp command", e );
}
finally
{
@@ -321,9 +321,9 @@ public class ScpCommand
protected void writeDir( String header, SshFile path )
throws IOException
{
- if ( log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- log.debug( "Writing dir {}", path );
+ LOG.debug( "Writing dir {}", path );
}
if ( !header.startsWith( "D" ) )
{
@@ -385,9 +385,9 @@ public class ScpCommand
protected void writeFile( String header, SshFile path )
throws IOException
{
- if ( log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- log.debug( "Writing file {}", path );
+ LOG.debug( "Writing file {}", path );
}
if ( !header.startsWith( "C" ) )
{
@@ -428,7 +428,7 @@ public class ScpCommand
{
ack();
- byte[] buffer = new byte[8192];
+ byte[] buffer = new byte[8 * 1024];
while ( length > 0 )
{
int len = (int) Math.min( length, buffer.length );
@@ -475,9 +475,9 @@ public class ScpCommand
protected void readFile( SshFile path )
throws IOException
{
- if ( log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- log.debug( "Reading file {}", path );
+ LOG.debug( "Reading file {}", path );
}
StringBuilder buf = new StringBuilder();
buf.append( "C" );
@@ -494,7 +494,7 @@ public class ScpCommand
InputStream is = path.createInputStream( 0 );
try
{
- byte[] buffer = new byte[8192];
+ byte[] buffer = new byte[8 * 1024];
for (; ; )
{
int len = is.read( buffer, 0, buffer.length );
@@ -516,9 +516,9 @@ public class ScpCommand
protected void readDir( SshFile path )
throws IOException
{
- if ( log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- log.debug( "Reading directory {}", path );
+ LOG.debug( "Reading directory {}", path );
}
StringBuilder buf = new StringBuilder();
buf.append( "D" );
@@ -571,7 +571,7 @@ public class ScpCommand
case OK:
break;
case WARNING:
- log.warn( "Received warning: " + readLine() );
+ LOG.warn( "Received warning: " + readLine() );
break;
case ERROR:
throw new IOException( "Received nack: " + readLine() );
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
index b643b4d..e16904e 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ScpCommandFactory.java
@@ -1,4 +1,5 @@
package org.apache.maven.wagon.providers.ssh;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -34,14 +35,17 @@ import java.util.List;
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
public class ScpCommandFactory
- implements CommandFactory {
+ implements CommandFactory
+{
private CommandFactory delegate;
- public ScpCommandFactory() {
+ public ScpCommandFactory()
+ {
}
- public ScpCommandFactory( CommandFactory delegate ) {
+ public ScpCommandFactory( CommandFactory delegate )
+ {
this.delegate = delegate;
}
@@ -54,41 +58,54 @@ public class ScpCommandFactory
* @return configured {@link org.apache.sshd.server.Command} instance
* @throws IllegalArgumentException
*/
- public Command createCommand(String command) {
- try {
- return new ScpCommand(splitCommandString(command));
- } catch (IllegalArgumentException iae) {
- if (delegate != null) {
- return delegate.createCommand(command);
+ public Command createCommand( String command )
+ {
+ try
+ {
+ return new ScpCommand( splitCommandString( command ) );
+ }
+ catch ( IllegalArgumentException iae )
+ {
+ if ( delegate != null )
+ {
+ return delegate.createCommand( command );
}
throw iae;
}
}
- private String[] splitCommandString(String command) {
- if (!command.trim().startsWith("scp")) {
- throw new IllegalArgumentException("Unknown command, does not begin with 'scp'");
+ private String[] splitCommandString( String command )
+ {
+ if ( !command.trim().startsWith( "scp" ) )
+ {
+ throw new IllegalArgumentException( "Unknown command, does not begin with 'scp'" );
}
- String[] args = command.split(" ");
+ String[] args = command.split( " " );
List<String> parts = new ArrayList<String>();
- parts.add(args[0]);
- for (int i = 1; i < args.length; i++) {
- if (!args[i].trim().startsWith("-")) {
- parts.add(concatenateWithSpace(args, i));
+ parts.add( args[0] );
+ for ( int i = 1; i < args.length; i++ )
+ {
+ if ( !args[i].trim().startsWith( "-" ) )
+ {
+ parts.add( concatenateWithSpace( args, i ) );
break;
- } else {
- parts.add(args[i]);
+ }
+ else
+ {
+ parts.add( args[i] );
}
}
- return parts.toArray(new String[parts.size()]);
+ return parts.toArray( new String[parts.size()] );
}
- private String concatenateWithSpace(String[] args, int from) {
+ private String concatenateWithSpace( String[] args, int from )
+ {
StringBuilder sb = new StringBuilder();
- for (int i = from; i < args.length; i++) {
- sb.append(args[i] + " ");
+ for ( int i = from; i < args.length; i++ )
+ {
+ sb.append( args[i] + " " );
}
return sb.toString().trim();
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ShellCommand.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ShellCommand.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ShellCommand.java
index b903860..1783829 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ShellCommand.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/ShellCommand.java
@@ -1,4 +1,5 @@
package org.apache.maven.wagon.providers.ssh;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
index 3a2c4bb..d988451 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
@@ -1,4 +1,5 @@
package org.apache.maven.wagon.providers.ssh;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,6 +27,7 @@ import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.FileSystemFactory;
import org.apache.sshd.server.FileSystemView;
+import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.SshFile;
import org.apache.sshd.server.auth.UserAuthPassword;
import org.apache.sshd.server.auth.UserAuthPublicKey;
@@ -54,9 +56,9 @@ public class SshServerEmbedded
private List<String> sshKeysResources = new ArrayList<String>();
- public TestPublickeyAuthenticator publickeyAuthenticator;
+ private TestPublickeyAuthenticator publickeyAuthenticator;
- public TestPasswordAuthenticator passwordAuthenticator = new TestPasswordAuthenticator();
+ TestPasswordAuthenticator passwordAuthenticator = new TestPasswordAuthenticator();
private boolean keyAuthz;
@@ -186,6 +188,13 @@ public class SshServerEmbedded
return port;
}
+ public PasswordAuthenticator getPasswordAuthenticator()
+ {
+ return passwordAuthenticator;
+ }
+ /**
+ *
+ */
public static class TestSshFile
extends NativeSshFile
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
index c59a329..83cca13 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPasswordAuthenticator.java
@@ -1,4 +1,5 @@
package org.apache.maven.wagon.providers.ssh;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,21 +32,24 @@ import java.util.List;
public class TestPasswordAuthenticator
implements PasswordAuthenticator
{
- public List<PasswordAuthenticatorRequest> passwordAuthenticatorRequests =
+ List<PasswordAuthenticatorRequest> requests =
new ArrayList<PasswordAuthenticatorRequest>();
public boolean authenticate( String username, String password, ServerSession session )
{
- passwordAuthenticatorRequests.add( new PasswordAuthenticatorRequest( username, password ) );
- return StringUtils.equals( username, TestData.getUserName() ) && StringUtils.equals( password,
- TestData.getUserPassword() );
+ requests.add( new PasswordAuthenticatorRequest( username, password ) );
+ return StringUtils.equals( username, TestData.getUserName() )
+ && StringUtils.equals( password, TestData.getUserPassword() );
}
+ /**
+ *
+ */
public static class PasswordAuthenticatorRequest
{
- public String username;
+ private String username;
- public String password;
+ private String password;
public PasswordAuthenticatorRequest( String username, String password )
{
@@ -63,5 +67,15 @@ public class TestPasswordAuthenticator
sb.append( '}' );
return sb.toString();
}
+
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
index fb42ee9..1ed8632 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
@@ -1,4 +1,5 @@
package org.apache.maven.wagon.providers.ssh;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -41,10 +42,10 @@ import java.util.List;
public class TestPublickeyAuthenticator
implements PublickeyAuthenticator
{
- public List<PublickeyAuthenticatorRequest> publickeyAuthenticatorRequests =
+ private List<PublickeyAuthenticatorRequest> publickeyAuthenticatorRequests =
new ArrayList<PublickeyAuthenticatorRequest>();
- public boolean keyAuthz;
+ private boolean keyAuthz;
public TestPublickeyAuthenticator( boolean keyAuthz )
{
@@ -82,11 +83,14 @@ public class TestPublickeyAuthenticator
return dectyptedText;
}
+ /**
+ *
+ */
public static class PublickeyAuthenticatorRequest
{
- public String username;
+ private String username;
- public PublicKey publicKey;
+ private PublicKey publicKey;
public PublickeyAuthenticatorRequest( String username, PublicKey publicKey )
{
@@ -162,8 +166,10 @@ public class TestPublickeyAuthenticator
private int decodeInt()
{
+ // CHECKSTYLE_OFF: MagicNumber
return ( ( bytes[pos++] & 0xFF ) << 24 ) | ( ( bytes[pos++] & 0xFF ) << 16 ) | ( ( bytes[pos++] & 0xFF ) << 8 )
| ( bytes[pos++] & 0xFF );
+ // CHECKSTYLE_ON: MagicNumber
}
private BigInteger decodeBigInt()
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java
index ec7c742..77bb067 100644
--- a/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java
+++ b/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java
@@ -25,6 +25,9 @@ import org.apache.maven.wagon.providers.ssh.TestData;
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.PlexusTestCase;
+/**
+ *
+ */
public class KnownHostsProviderTestCase
extends PlexusTestCase
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
index 88a9f2b..7f5b862 100644
--- a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
+++ b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
@@ -260,7 +260,8 @@ public class ScpHelper
{
//executor.executeCommand(
// "cd " + path + "; unzip -q -o " + zipFile.getName() + "; rm -f " + zipFile.getName() );
- executor.executeCommand( "cd \"" + path + "\"; unzip -q -o \"" + zipFile.getName() + "\"; rm -f \"" + zipFile.getName() + "\"" );
+ executor.executeCommand( "cd \"" + path + "\"; unzip -q -o \"" + zipFile.getName() + "\"; rm -f \""
+ + zipFile.getName() + "\"" );
zipFile.delete();
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java
index dcc95c6..35df9a7 100644
--- a/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java
+++ b/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java
@@ -19,6 +19,9 @@ package org.apache.maven.wagon.providers.ssh.knownhost;
* under the License.
*/
+/**
+ *
+ */
public class KnownHostEntry
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java b/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
index 849ff4f..e6aadfa 100644
--- a/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
+++ b/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
@@ -310,7 +310,8 @@ public class ScpExternalWagon
int exitCode = CommandLineUtils.executeCommandLine( cl, null, err );
if ( exitCode != 0 )
{
- if ( !put && err.getOutput().trim().toLowerCase( Locale.ENGLISH ).contains( "no such file or directory" ))
+ if ( !put
+ && err.getOutput().trim().toLowerCase( Locale.ENGLISH ).contains( "no such file or directory" ) )
{
throw new ResourceDoesNotExistException( err.getOutput() );
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
index c5290b2..1ee2fc0 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
@@ -77,7 +77,8 @@ public class ScpWagon
if ( permissions != null && permissions.getGroup() != null )
{
//executeCommand( "chgrp -f " + permissions.getGroup() + " " + getPath( basedir, resource.getName() ) );
- executeCommand( "chgrp -f " + permissions.getGroup() + " \"" + getPath( basedir, resource.getName() ) + "\"" );
+ executeCommand( "chgrp -f " + permissions.getGroup() + " \"" + getPath( basedir, resource.getName() )
+ + "\"" );
}
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
index ef4a7eb..06d952a 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
@@ -292,8 +292,8 @@ public class SftpWagon
if ( sourceFile.isDirectory() )
{
- //ScpHelper.getResourceFilename( destinationDirectory ) - could return empty string
- if ( !fileName.equals( "." ) && !fileName.equals("") )
+ // ScpHelper.getResourceFilename( destinationDirectory ) - could return empty string
+ if ( !fileName.equals( "." ) && !fileName.equals( "" ) )
{
prefix = getFileName( prefix, fileName );
mkdir( fileName, directoryMode );
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
index bb895ba..c5c2bad 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
@@ -1,20 +1,22 @@
package org.apache.jackrabbit.webdav;
/*
- * 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
+ * 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
+ * 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.
+ * 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.
*/
import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
index 8387705..094e114 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
@@ -1,20 +1,22 @@
package org.apache.jackrabbit.webdav.client.methods;
/*
- * 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
+ * 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
+ * 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.
+ * 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.
*/
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
index 205866c..232e19b 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
@@ -377,6 +377,7 @@ public abstract class AbstractHttpClientWagon
fireTransferDebug( url + " - Status code: " + statusCode );
// Check that we didn't run out of retries.
+ // CHECKSTYLE_OFF: AvoidNestedBlocks
switch ( statusCode )
{
// Success Codes
@@ -386,7 +387,8 @@ public abstract class AbstractHttpClientWagon
case HttpStatus.SC_NO_CONTENT: // 204
break;
- // handle all redirect even if http specs says " the user agent MUST NOT automatically redirect the request unless it can be confirmed by the user"
+ // handle all redirect even if http specs says
+ // " the user agent MUST NOT automatically redirect the request unless it can be confirmed by the user"
case HttpStatus.SC_MOVED_PERMANENTLY: // 301
case HttpStatus.SC_MOVED_TEMPORARILY: // 302
case HttpStatus.SC_SEE_OTHER: // 303
@@ -418,6 +420,7 @@ public abstract class AbstractHttpClientWagon
throw e;
}
}
+ // CHECKSTYLE_ON: AvoidNestedBlocks
firePutCompleted( resource, source );
}
@@ -569,7 +572,7 @@ public abstract class AbstractHttpClientWagon
}
}
- private static String DEFAULT_USER_AGENT = getDefaultUserAgent();
+ private static final String DEFAULT_USER_AGENT = getDefaultUserAgent();
private static String getDefaultUserAgent()
{
@@ -585,6 +588,7 @@ public abstract class AbstractHttpClientWagon
}
catch ( IOException ignore )
{
+ // ignore
}
finally
{
@@ -678,6 +682,7 @@ public abstract class AbstractHttpClientWagon
// TODO [BP]: according to httpclient docs, really should swallow the output on error. verify if that is
// required
+ // CHECKSTYLE_OFF: AvoidNestedBlocks
switch ( statusCode )
{
case HttpStatus.SC_OK:
@@ -719,6 +724,7 @@ public abstract class AbstractHttpClientWagon
throw e;
}
}
+ // CHECKSTYLE_ON: AvoidNestedBlocks
InputStream is = null;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
index 9c3e9e6..c00b73a 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpConfiguration.java
@@ -25,6 +25,9 @@ import org.apache.commons.httpclient.methods.HeadMethod;
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
+/**
+ *
+ */
public class HttpConfiguration
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
index 83c4c23..b1dccab 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/HttpMethodConfiguration.java
@@ -30,6 +30,9 @@ import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+/**
+ *
+ */
public class HttpMethodConfiguration
{
@@ -158,33 +161,30 @@ public class HttpMethodConfiguration
char type = matcher.group( 1 ).charAt( 0 );
value = matcher.group( 2 );
+ // CHECKSTYLE_OFF: AvoidNestedBlocks
switch ( type )
{
case 'i':
- {
p.setIntParameter( key, Integer.parseInt( value ) );
break;
- }
+
case 'd':
- {
p.setDoubleParameter( key, Double.parseDouble( value ) );
break;
- }
+
case 'l':
- {
p.setLongParameter( key, Long.parseLong( value ) );
break;
- }
+
case 'b':
- {
p.setBooleanParameter( key, Boolean.valueOf( value ).booleanValue() );
break;
- }
+
case 'c':
{
String[] entries = value.split( "," );
List<String> collection = new ArrayList<String>();
- for (String e : entries)
+ for ( String e : entries )
{
collection.add( e.trim() );
}
@@ -213,7 +213,9 @@ public class HttpMethodConfiguration
p.setParameter( key, map );
break;
}
+ default:
}
+ // CHECKSTYLE_ON: AvoidNestedBlocks
}
else
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5fcf54b9/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
index c93b378..a03be54 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
@@ -45,8 +45,8 @@ public class PathNavigator
StringBuilder sb = new StringBuilder();
for ( String path : currentPathList )
{
- sb.append(path);
- sb.append('/');
+ sb.append( path );
+ sb.append( '/' );
}
return sb.toString();
}