You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/06/09 17:30:15 UTC
svn commit: r1133935 - in /maven/wagon/trunk: src/site/
wagon-provider-api/src/main/java/org/apache/maven/wagon/
wagon-provider-api/src/test/java/org/apache/maven/wagon/
wagon-provider-test/src/main/java/org/apache/maven/wagon/http/
wagon-providers/wag...
Author: struberg
Date: Thu Jun 9 15:30:14 2011
New Revision: 1133935
URL: http://svn.apache.org/viewvc?rev=1133935&view=rev
Log:
code cleanup + fix various TODOs
Modified:
maven/wagon/trunk/src/site/site.xml
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java
maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.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-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
Modified: maven/wagon/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/src/site/site.xml?rev=1133935&r1=1133934&r2=1133935&view=diff
==============================================================================
--- maven/wagon/trunk/src/site/site.xml (original)
+++ maven/wagon/trunk/src/site/site.xml Thu Jun 9 15:30:14 2011
@@ -21,15 +21,8 @@ under the License.
<project>
<version position="right" />
- <!-- TODO remove when using Maven Parent 11+ -->
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.1</version>
- </skin>
-
<body>
<menu ref="modules" />
<menu ref="reports" />
</body>
-</project>
\ No newline at end of file
+</project>
Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java?rev=1133935&r1=1133934&r2=1133935&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java Thu Jun 9 15:30:14 2011
@@ -19,13 +19,13 @@ package org.apache.maven.wagon;
* under the License.
*/
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.codehaus.plexus.util.FileUtils;
+
import java.io.File;
import java.io.IOException;
import java.util.LinkedList;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.codehaus.plexus.util.FileUtils;
-
/**
* @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
* @version $Id$
@@ -49,9 +49,7 @@ public final class WagonUtils
wagon.get( resource, file );
- String retValue = FileUtils.fileRead( file );
-
- return retValue;
+ return FileUtils.fileRead( file );
}
finally
{
Modified: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java?rev=1133935&r1=1133934&r2=1133935&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java Thu Jun 9 15:30:14 2011
@@ -19,14 +19,7 @@ package org.apache.maven.wagon;
* under the License.
*/
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
import junit.framework.TestCase;
-
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
@@ -43,6 +36,12 @@ import org.codehaus.plexus.util.IOUtil;
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id: AbstractWagonTest.java 630808 2008-02-25 11:01:41Z brett $
@@ -78,7 +77,7 @@ public class AbstractWagonTest
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
}
- };
+ }
private String basedir;
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java?rev=1133935&r1=1133934&r2=1133935&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java Thu Jun 9 15:30:14 2011
@@ -208,8 +208,7 @@ public abstract class HttpWagonTestCase
}
private void runTestGet( int status )
- throws Exception, ConnectionException, AuthenticationException, TransferFailedException,
- ResourceDoesNotExistException, AuthorizationException
+ throws Exception
{
StreamingWagon wagon = (StreamingWagon) getWagon();
@@ -277,8 +276,7 @@ public abstract class HttpWagonTestCase
}
private boolean runTestResourceExists( int status )
- throws Exception, ConnectionException, AuthenticationException, TransferFailedException,
- ResourceDoesNotExistException, AuthorizationException
+ throws Exception
{
StreamingWagon wagon = (StreamingWagon) getWagon();
@@ -384,8 +382,7 @@ public abstract class HttpWagonTestCase
}
private void runTestProxiedRequest( ProxyInfo proxyInfo, TestHeaderHandler handler )
- throws Exception, IOException, ConnectionException, AuthenticationException, ResourceDoesNotExistException,
- TransferFailedException, AuthorizationException
+ throws Exception
{
Server proxyServer = new Server( getTestRepositoryPort() );
@@ -700,8 +697,7 @@ public abstract class HttpWagonTestCase
}
private void runTestPut( int status )
- throws Exception, ConnectionException, AuthenticationException, TransferFailedException,
- ResourceDoesNotExistException, AuthorizationException
+ throws Exception
{
StreamingWagon wagon = (StreamingWagon) getWagon();
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=1133935&r1=1133934&r2=1133935&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 Thu Jun 9 15:30:14 2011
@@ -19,6 +19,19 @@ package org.apache.maven.wagon.providers
* under the License.
*/
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.InputData;
+import org.apache.maven.wagon.OutputData;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.StreamWagon;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.events.TransferEvent;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.resource.Resource;
+import org.apache.maven.wagon.shared.http.HtmlFileListParser;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -34,19 +47,6 @@ import java.util.List;
import java.util.Properties;
import java.util.zip.GZIPInputStream;
-import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.InputData;
-import org.apache.maven.wagon.OutputData;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.StreamWagon;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.events.TransferEvent;
-import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.resource.Resource;
-import org.apache.maven.wagon.shared.http.HtmlFileListParser;
-
/**
* LightweightHttpWagon
*
@@ -124,7 +124,7 @@ public class LightweightHttpWagon
InputStream is = urlConnection.getInputStream();
String contentEncoding = urlConnection.getHeaderField( "Content-Encoding" );
- boolean isGZipped = contentEncoding == null ? false : "gzip".equalsIgnoreCase( contentEncoding );
+ boolean isGZipped = contentEncoding != null && "gzip".equalsIgnoreCase( contentEncoding );
if ( isGZipped )
{
is = new GZIPInputStream( is );
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1133935&r1=1133934&r2=1133935&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java Thu Jun 9 15:30:14 2011
@@ -381,7 +381,7 @@ public abstract class AbstractHttpClient
}
}
- protected void mkdirs( String dirname ) throws HttpException, IOException
+ protected void mkdirs( String dirname ) throws IOException
{
}
@@ -436,7 +436,7 @@ public abstract class AbstractHttpClient
}
}
- protected int execute( HttpMethod httpMethod ) throws HttpException, IOException
+ protected int execute( HttpMethod httpMethod ) throws IOException
{
int statusCode = SC_NULL;
@@ -654,8 +654,7 @@ public abstract class AbstractHttpClient
}
Header contentEncoding = getMethod.getResponseHeader( "Content-Encoding" );
- boolean isGZipped =
- contentEncoding == null ? false : "gzip".equalsIgnoreCase( contentEncoding.getValue() );
+ boolean isGZipped = contentEncoding != null && "gzip".equalsIgnoreCase( contentEncoding.getValue() );
try
{
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1133935&r1=1133934&r2=1133935&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java Thu Jun 9 15:30:14 2011
@@ -125,11 +125,13 @@ public abstract class AbstractHttpClient
return null;
}
- public Header getContentEncoding() {
- return null; //X TODO
+ public Header getContentEncoding()
+ {
+ return null;
}
- public InputStream getContent() throws IOException, IllegalStateException {
+ public InputStream getContent() throws IOException, IllegalStateException
+ {
FileInputStream fis = new FileInputStream( source );
return fis;
@@ -140,8 +142,9 @@ public abstract class AbstractHttpClient
return true;
}
- public boolean isChunked() {
- return false; //X TODO
+ public boolean isChunked()
+ {
+ return false;
}
public void writeTo( OutputStream output )
@@ -182,12 +185,13 @@ public abstract class AbstractHttpClient
output.flush();
}
- public boolean isStreaming() {
- return false; //X TODO
+ public boolean isStreaming()
+ {
+ return false;
}
- public void consumeContent() throws IOException {
- //X TODO
+ public void consumeContent() throws IOException
+ {
}
}
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=1133935&r1=1133934&r2=1133935&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 Thu Jun 9 15:30:14 2011
@@ -52,7 +52,7 @@ public class HttpMethodConfiguration
public boolean isUseDefaultHeaders()
{
- return useDefaultHeaders == null ? true : useDefaultHeaders.booleanValue();
+ return useDefaultHeaders == null || useDefaultHeaders.booleanValue();
}
public HttpMethodConfiguration setUseDefaultHeaders( boolean useDefaultHeaders )
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=1133935&r1=1133934&r2=1133935&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 Thu Jun 9 15:30:14 2011
@@ -65,7 +65,7 @@ public class ServerFixture
private final SecurityHandler securityHandler;
- private int filterCount = 0;;
+ private int filterCount = 0;
public ServerFixture( final int port, final boolean ssl )
throws URISyntaxException, IOException