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 2011/09/19 23:28:05 UTC
svn commit: r1172843 - in /maven/wagon/trunk:
wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/
wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/
wagon-providers/wagon-http-lightweight/src/main/...
Author: hboutemy
Date: Mon Sep 19 21:28:04 2011
New Revision: 1172843
URL: http://svn.apache.org/viewvc?rev=1172843&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
Modified: maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java Mon Sep 19 21:28:04 2011
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.maven.wagon.ConnectionException;
Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Mon Sep 19 21:28:04 2011
@@ -49,7 +49,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
-
/**
* FtpWagon
*
@@ -441,7 +440,7 @@ public class FtpWagon
}
List<String> ret = new ArrayList<String>();
- for( int i=0; i < ftpFiles.length; i++ )
+ for ( int i = 0; i < ftpFiles.length; i++ )
{
String name = ftpFiles[i].getName();
@@ -617,6 +616,7 @@ public class FtpWagon
// This appears to be a conscious decision, based on other parts of this code.
String group = permissions.getGroup();
if ( group != null )
+ {
try
{
ftp.sendSiteCommand( "CHGRP " + permissions.getGroup() );
@@ -624,8 +624,10 @@ public class FtpWagon
catch ( IOException e )
{
}
+ }
String mode = permissions.getFileMode();
if ( mode != null )
+ {
try
{
ftp.sendSiteCommand( "CHMOD " + permissions.getDirectoryMode() );
@@ -633,6 +635,7 @@ public class FtpWagon
catch ( IOException e )
{
}
+ }
}
}
else
@@ -655,7 +658,7 @@ public class FtpWagon
}
- fireTransferDebug("completed = " + sourceFile.getAbsolutePath());
+ fireTransferDebug( "completed = " + sourceFile.getAbsolutePath() );
}
/**
@@ -666,7 +669,8 @@ public class FtpWagon
*
* @param permissions group and directory permissions
*/
- private void setPermissions(RepositoryPermissions permissions) {
+ private void setPermissions( RepositoryPermissions permissions )
+ {
if ( permissions != null )
{
// Process permissions; note that if we get errors or exceptions here, they are ignored.
@@ -704,10 +708,11 @@ public class FtpWagon
* @return ok
* @throws IOException
*/
- private boolean makeFtpDirectoryRecursive(String fileName, RepositoryPermissions permissions) throws IOException
+ private boolean makeFtpDirectoryRecursive( String fileName, RepositoryPermissions permissions )
+ throws IOException
{
- if ( fileName == null || fileName.length() == 0 ||
- fileName.replace('/', '_').trim().length() == 0 ) // if a string is '/', '//' or similar
+ if ( fileName == null || fileName.length() == 0
+ || fileName.replace('/', '_').trim().length() == 0 ) // if a string is '/', '//' or similar
{
return false;
}
@@ -729,10 +734,10 @@ public class FtpWagon
slashPos = fileName.indexOf( "/" );
}
- if ( slashPos >= 0 &&
- slashPos < ( fileName.length() - 1 ) ) // not only a slash at the end, like in 'newDir/'
+ if ( slashPos >= 0
+ && slashPos < ( fileName.length() - 1 ) ) // not only a slash at the end, like in 'newDir/'
{
- if ( oldPwd == null)
+ if ( oldPwd == null )
{
oldPwd = ftp.printWorkingDirectory();
}
@@ -754,7 +759,7 @@ public class FtpWagon
// now create the deeper directories
String remainingDirs = fileName.substring( slashPos + 1 );
- ok &= makeFtpDirectoryRecursive( remainingDirs, permissions);
+ ok &= makeFtpDirectoryRecursive( remainingDirs, permissions );
}
}
else
Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Mon Sep 19 21:28:04 2011
@@ -272,7 +272,7 @@ public class LightweightHttpWagon
{
this.proxy = getProxy( proxyInfo );
}
- authenticator.setWagon(this);
+ authenticator.setWagon( this );
setPreemptiveAuthentication(
Boolean.getBoolean( "maven.wagon.http.preemptiveAuthentication" )
@@ -313,17 +313,22 @@ public class LightweightHttpWagon
return new Proxy( getProxyType( proxyInfo ), getSocketAddress( proxyInfo ) );
}
- private Type getProxyType( ProxyInfo proxyInfo ) {
- if ( ProxyInfo.PROXY_SOCKS4.equals( proxyInfo.getType() ) || ProxyInfo.PROXY_SOCKS5.equals( proxyInfo.getType() ) )
+ private Type getProxyType( ProxyInfo proxyInfo )
+ {
+ if ( ProxyInfo.PROXY_SOCKS4.equals( proxyInfo.getType() )
+ || ProxyInfo.PROXY_SOCKS5.equals( proxyInfo.getType() ) )
{
return Type.SOCKS;
}
- else return Type.HTTP;
+ else
+ {
+ return Type.HTTP;
+ }
}
public SocketAddress getSocketAddress( ProxyInfo proxyInfo )
{
- return InetSocketAddress.createUnresolved(proxyInfo.getHost(), proxyInfo.getPort());
+ return InetSocketAddress.createUnresolved( proxyInfo.getHost(), proxyInfo.getPort() );
}
public void closeConnection()
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java Mon Sep 19 21:28:04 2011
@@ -1,4 +1,5 @@
package org.apache.maven.wagon.shared.http;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpConfiguration.java Mon Sep 19 21:28:04 2011
@@ -30,13 +30,13 @@ public class HttpConfiguration
private static final HttpMethodConfiguration DEFAULT_PUT =
new HttpMethodConfiguration().addParam( HTTP.EXPECT_CONTINUE, "%b,true" );
-
+
private HttpMethodConfiguration all;
-
+
private HttpMethodConfiguration get;
-
+
private HttpMethodConfiguration put;
-
+
private HttpMethodConfiguration head;
public HttpMethodConfiguration getAll()
@@ -54,7 +54,7 @@ public class HttpConfiguration
{
return get;
}
-
+
public HttpConfiguration setGet( HttpMethodConfiguration get )
{
this.get = get;
@@ -82,22 +82,22 @@ public class HttpConfiguration
this.head = head;
return this;
}
-
+
public HttpMethodConfiguration getMethodConfiguration( HttpUriRequest method )
{
if ( method instanceof HttpGet )
{
return HttpMethodConfiguration.merge( all, get );
}
- else if ( method instanceof HttpPut)
+ else if ( method instanceof HttpPut )
{
return HttpMethodConfiguration.merge( DEFAULT_PUT, all, put );
}
- else if ( method instanceof HttpHead)
+ else if ( method instanceof HttpHead )
{
return HttpMethodConfiguration.merge( all, head );
}
-
+
return all;
}
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java Mon Sep 19 21:28:04 2011
@@ -118,7 +118,7 @@ public class HttpMethodConfiguration
return null;
}
- DefaultedHttpParams p = new DefaultedHttpParams( new BasicHttpParams(), defaults);
+ DefaultedHttpParams p = new DefaultedHttpParams( new BasicHttpParams(), defaults );
fillParams( p );
@@ -151,12 +151,12 @@ public class HttpMethodConfiguration
{
Pattern coercePattern = Pattern.compile( COERCE_PATTERN );
- for ( Iterator it = params.entrySet().iterator(); it.hasNext(); )
+ for ( Iterator<?> it = params.entrySet().iterator(); it.hasNext(); )
{
- Map.Entry entry = (Map.Entry) it.next();
+ Map.Entry<String, String> entry = (Map.Entry) it.next();
- String key = (String) entry.getKey();
- String value = (String) entry.getValue();
+ String key = entry.getKey();
+ String value = entry.getValue();
Matcher matcher = coercePattern.matcher( value );
if ( matcher.matches() )
@@ -189,7 +189,7 @@ public class HttpMethodConfiguration
case 'c':
{
String[] entries = value.split( "," );
- List collection = new ArrayList();
+ List<String> collection = new ArrayList<String>();
for ( int i = 0; i < entries.length; i++ )
{
collection.add( entries[i].trim() );
@@ -202,7 +202,7 @@ public class HttpMethodConfiguration
{
String[] entries = value.split( "," );
- Map map = new LinkedHashMap();
+ Map<String, String> map = new LinkedHashMap<String, String>();
for ( int i = 0; i < entries.length; i++ )
{
int idx = entries[i].indexOf( "=>" );
@@ -239,9 +239,9 @@ public class HttpMethodConfiguration
Header[] result = new Header[headers.size()];
int index = 0;
- for ( Iterator it = headers.entrySet().iterator(); it.hasNext(); )
+ for ( Iterator<?> it = headers.entrySet().iterator(); it.hasNext(); )
{
- Map.Entry entry = (Map.Entry) it.next();
+ Map.Entry<String, String> entry = (Map.Entry) it.next();
String key = (String) entry.getKey();
String value = (String) entry.getValue();
Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java Mon Sep 19 21:28:04 2011
@@ -95,7 +95,8 @@ public class HttpWagon
{
throw new TransferFailedException( "Could not read response body.", e );
}
- catch (HttpException e) {
+ catch ( HttpException e )
+ {
throw new TransferFailedException( "Could not read response body.", e );
}
finally
Modified: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java Mon Sep 19 21:28:04 2011
@@ -178,7 +178,7 @@ public class ScmWagon
private void removeCheckoutDirectory()
throws ConnectionException
{
- if( checkoutDirectory == null )
+ if ( checkoutDirectory == null )
{
return; // Silently return.
}
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java Mon Sep 19 21:28:04 2011
@@ -37,7 +37,7 @@ import org.apache.maven.wagon.TransferFa
*/
public class LSParser
{
- private final static Pattern PATTERN = Pattern.compile( ".+\\s+[0-9]+\\s+.+\\s+.+\\s+[0-9]+\\s+"
+ private static final Pattern PATTERN = Pattern.compile( ".+\\s+[0-9]+\\s+.+\\s+.+\\s+[0-9]+\\s+"
+ "([0-9]{4}-[0-9]{2}-[0-9]{2}|.+\\s+[0-9]+)\\s+[0-9:]+\\s+(.+?)" );
/**
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java Mon Sep 19 21:28:04 2011
@@ -140,17 +140,15 @@ public class ScpHelper
return privateKey;
}
- public static void createZip( List files, File zipName, File basedir )
+ public static void createZip( List<String> files, File zipName, File basedir )
throws IOException
{
ZipOutputStream zos = new ZipOutputStream( new FileOutputStream( zipName ) );
try
{
- for ( int i = 0; i < files.size(); i++ )
+ for ( String file : files )
{
- String file = (String) files.get( i );
-
file = file.replace( '\\', '/' );
writeZipEntry( zos, new File( basedir, file ), file );
@@ -238,7 +236,7 @@ public class ScpHelper
zipFile = File.createTempFile( "wagon", ".zip" );
zipFile.deleteOnExit();
- List files = FileUtils.getFileNames( sourceDirectory, "**/**", "", false );
+ List<String> files = FileUtils.getFileNames( sourceDirectory, "**/**", "", false );
createZip( files, zipFile, sourceDirectory );
}
@@ -251,7 +249,8 @@ public class ScpHelper
try
{
- 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();
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java Mon Sep 19 21:28:04 2011
@@ -44,7 +44,7 @@ public abstract class AbstractKnownHosts
*/
protected String contents;
- protected Set knownHosts = new HashSet();
+ protected Set<KnownHostEntry> knownHosts = new HashSet<KnownHostEntry>();
public void setHostKeyChecking( String hostKeyChecking )
{
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java Mon Sep 19 21:28:04 2011
@@ -71,7 +71,7 @@ public class FileKnownHostsProvider
public void storeKnownHosts( String contents )
throws IOException
{
- Set hosts = this.loadKnownHosts( contents );
+ Set<KnownHostEntry> hosts = this.loadKnownHosts( contents );
if ( ! this.knownHosts.equals( hosts ) )
{
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostEntry.java Mon Sep 19 21:28:04 2011
@@ -30,7 +30,6 @@ public class KnownHostEntry
public KnownHostEntry()
{
-
}
public KnownHostEntry( String hostName, String keyType, String keyValue )
@@ -83,33 +82,56 @@ public class KnownHostEntry
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
+
if ( obj == null )
+ {
return false;
+ }
+
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
+
KnownHostEntry other = (KnownHostEntry) obj;
if ( hostName == null )
{
if ( other.hostName != null )
+ {
return false;
+ }
}
else if ( !hostName.equals( other.hostName ) )
+ {
return false;
+ }
+
if ( keyType == null )
{
if ( other.keyType != null )
+ {
return false;
+ }
}
else if ( !keyType.equals( other.keyType ) )
+ {
return false;
+ }
+
if ( keyValue == null )
{
if ( other.keyValue != null )
+ {
return false;
+ }
}
else if ( !keyValue.equals( other.keyValue ) )
+ {
return false;
+ }
return true;
}
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java Mon Sep 19 21:28:04 2011
@@ -57,10 +57,10 @@ public class StreamKnownHostsProvider
}
}
- protected Set loadKnownHosts( String contents )
+ protected Set<KnownHostEntry> loadKnownHosts( String contents )
throws IOException
{
- Set hosts = new HashSet();
+ Set<KnownHostEntry> hosts = new HashSet<KnownHostEntry>();
BufferedReader br = new BufferedReader( new StringReader( contents ) );
@@ -78,7 +78,8 @@ public class StreamKnownHostsProvider
}
}
- }while ( line != null );
+ }
+ while ( line != null );
return hosts;
}
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java Mon Sep 19 21:28:04 2011
@@ -312,8 +312,8 @@ public class ScpExternalWagon
int exitCode = CommandLineUtils.executeCommandLine( cl, null, err );
if ( exitCode != 0 )
{
- if ( !put &&
- err.getOutput().trim().toLowerCase( Locale.ENGLISH ).indexOf( "no such file or directory" ) != -1 )
+ if ( !put
+ && err.getOutput().trim().toLowerCase( Locale.ENGLISH ).indexOf( "no such file or directory" ) != -1 )
{
throw new ResourceDoesNotExistException( err.getOutput() );
}
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java Mon Sep 19 21:28:04 2011
@@ -244,7 +244,7 @@ public class SftpWagon
{
throw new ResourceDoesNotExistException( e.toString(), e );
}
- else if( e.toString().trim().indexOf( "Can't change directory" ) != -1 )
+ else if ( e.toString().trim().indexOf( "Can't change directory" ) != -1 )
{
throw new ResourceDoesNotExistException( e.toString(), e );
}
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java Mon Sep 19 21:28:04 2011
@@ -1,3 +1,5 @@
+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
@@ -14,7 +16,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.webdav;
import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
import org.apache.jackrabbit.webdav.xml.DomUtil;
@@ -23,7 +24,6 @@ import org.apache.jackrabbit.webdav.xml.
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import java.util.Iterator;
import java.util.Map;
import java.util.LinkedHashMap;
@@ -31,14 +31,15 @@ import java.util.LinkedHashMap;
* MultiStatus representing the content of a multistatus response body and
* allows to retrieve the Xml representation.
*/
-public class MultiStatus implements DavConstants, XmlSerializable
+public class MultiStatus
+ implements DavConstants, XmlSerializable
{
/**
* Map collecting the responses for this multistatus, where every href must
- * only occure one single time.
+ * only occur one single time.
*/
- private Map responses = new LinkedHashMap();
+ private Map<String, MultiStatusResponse> responses = new LinkedHashMap<String, MultiStatusResponse>();
/**
* A general response description at the multistatus top level is used to
@@ -161,10 +162,9 @@ public class MultiStatus implements DavC
public Element toXml( Document document )
{
Element multistatus = DomUtil.createElement( document, XML_MULTISTATUS, NAMESPACE );
- Iterator it = responses.values().iterator();
- while ( it.hasNext() )
+ for ( MultiStatusResponse response : responses.values() )
{
- multistatus.appendChild( ( (MultiStatusResponse) it.next() ).toXml( document ) );
+ multistatus.appendChild( response.toXml( document ) );
}
if ( responseDescription != null )
{
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java Mon Sep 19 21:28:04 2011
@@ -1,3 +1,5 @@
+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
@@ -14,7 +16,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.webdav.client.methods;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,14 +37,16 @@ import javax.xml.transform.stream.Stream
/**
* <code>XmlRequestEntity</code>...
*/
-public class XmlRequestEntity implements RequestEntity
+public class XmlRequestEntity
+ implements RequestEntity
{
private static Logger log = LoggerFactory.getLogger( XmlRequestEntity.class );
private final RequestEntity delegatee;
- public XmlRequestEntity( Document xmlDocument ) throws IOException
+ public XmlRequestEntity( Document xmlDocument )
+ throws IOException
{
super();
ByteArrayOutputStream out = new ByteArrayOutputStream();
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java Mon Sep 19 21:28:04 2011
@@ -29,7 +29,7 @@ import java.util.Arrays;
*/
public class PathNavigator
{
- final private List list;
+ private final List<String> list;
private int currentPosition;
@@ -41,7 +41,7 @@ public class PathNavigator
public String getPath()
{
- List currentPathList = list.subList( 0, currentPosition );
+ List<String> currentPathList = list.subList( 0, currentPosition );
StringBuffer sb = new StringBuffer();
for ( int i = 0; i < currentPathList.size(); i++ )
{
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java Mon Sep 19 21:28:04 2011
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
@@ -102,7 +101,8 @@ public class WebDavWagon
* @throws HttpException
* @throws TransferFailedException
*/
- protected void mkdirs( String dir ) throws IOException
+ protected void mkdirs( String dir )
+ throws IOException
{
Repository repository = getRepository();
String basedir = repository.getBasedir();
@@ -116,7 +116,7 @@ public class WebDavWagon
// create relative path that will always have a leading and trailing slash
String relpath = FileUtils.normalize( getPath( basedir, dir ) + "/" );
- PathNavigator navigator = new PathNavigator(relpath);
+ PathNavigator navigator = new PathNavigator( relpath );
// traverse backwards until we hit a directory that already exists (OK/NOT_ALLOWED), or that we were able to
// create (CREATED), or until we get to the top of the path
@@ -145,7 +145,8 @@ public class WebDavWagon
}
}
- private int doMkCol( String url ) throws IOException
+ private int doMkCol( String url )
+ throws IOException
{
MkColMethod method = null;
try
@@ -192,7 +193,8 @@ public class WebDavWagon
}
- private boolean isDirectory( String url ) throws IOException, DavException
+ private boolean isDirectory( String url )
+ throws IOException, DavException
{
DavPropertyNameSet nameSet = new DavPropertyNameSet();
nameSet.add( DavPropertyName.create( DavConstants.PROPERTY_RESOURCETYPE ) );
@@ -225,7 +227,7 @@ public class WebDavWagon
}
}
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
String url = getRepository().getUrl() + '/' + destinationDirectory;
@@ -242,7 +244,7 @@ public class WebDavWagon
int status = execute( method );
if ( method.succeeded() )
{
- ArrayList dirs = new ArrayList();
+ ArrayList<String> dirs = new ArrayList<String>();
MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
for ( int i = 0; i < multiStatus.getResponses().length; i++ )
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java Mon Sep 19 21:28:04 2011
@@ -56,7 +56,7 @@ public abstract class HttpWagonTests
private String baseUrl;
- private final static Set<File> tmpFiles = new HashSet<File>();
+ private static final Set<File> tmpFiles = new HashSet<File>();
private Repository repo;
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java Mon Sep 19 21:28:04 2011
@@ -50,7 +50,6 @@ public class ServerFixture
{
private static Logger logger = Logger.getLogger( ServerFixture.class );
-
public static final String SERVER_ROOT_RESOURCE_PATH = "default-server-root";
// it seems that some JDKs have a problem if you use different key stores
@@ -183,7 +182,7 @@ public class ServerFixture
public void start()
throws Exception
{
- if (server.isStarted() || server.isRunning())
+ if ( server.isStarted() || server.isRunning() )
{
return;
}
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java?rev=1172843&r1=1172842&r2=1172843&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java Mon Sep 19 21:28:04 2011
@@ -72,7 +72,7 @@ public final class TestUtil
base = new File( "target/tck-resources/" + urlFile.getName() );
base.getParentFile().mkdirs();
- logger.info("unpacking test resources in jar: " + url);
+ logger.info( "unpacking test resources in jar: " + url );
JarFile jf = null;
try
{