You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/21 16:28:06 UTC
svn commit: r1173675 - in /maven/wagon/trunk/wagon-providers:
wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
Author: olamy
Date: Wed Sep 21 14:28:06 2011
New Revision: 1173675
URL: http://svn.apache.org/viewvc?rev=1173675&view=rev
Log:
return empty array rather than null to avoid NPE
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java?rev=1173675&r1=1173674&r2=1173675&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HttpMethodConfiguration.java Wed Sep 21 14:28:06 2011
@@ -33,17 +33,17 @@ import java.util.regex.Pattern;
public class HttpMethodConfiguration
{
-
+
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
private static final String COERCE_PATTERN = "%(\\w+),(.+)";
-
+
private Boolean useDefaultHeaders;
-
+
private Properties headers = new Properties();
-
+
private Properties params = new Properties();
-
+
private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
public boolean isUseDefaultHeaders()
@@ -56,12 +56,12 @@ public class HttpMethodConfiguration
this.useDefaultHeaders = Boolean.valueOf( useDefaultHeaders );
return this;
}
-
+
public Boolean getUseDefaultHeaders()
{
return useDefaultHeaders;
}
-
+
public HttpMethodConfiguration addHeader( String header, String value )
{
headers.setProperty( header, value );
@@ -78,7 +78,7 @@ public class HttpMethodConfiguration
this.headers = headers;
return this;
}
-
+
public HttpMethodConfiguration addParam( String param, String value )
{
params.setProperty( param, value );
@@ -113,12 +113,12 @@ public class HttpMethodConfiguration
{
return null;
}
-
+
HttpMethodParams p = new HttpMethodParams();
p.setDefaults( defaults );
-
+
fillParams( p );
-
+
return p;
}
@@ -128,7 +128,7 @@ public class HttpMethodConfiguration
{
return false;
}
-
+
return true;
}
@@ -138,30 +138,30 @@ public class HttpMethodConfiguration
{
return;
}
-
+
if ( connectionTimeout > 0 )
{
p.setSoTimeout( connectionTimeout );
}
-
+
if ( params != null )
{
Pattern coercePattern = Pattern.compile( COERCE_PATTERN );
-
+
for ( Iterator it = params.entrySet().iterator(); it.hasNext(); )
{
Map.Entry entry = (Map.Entry) it.next();
-
+
String key = (String) entry.getKey();
String value = (String) entry.getValue();
-
+
Matcher matcher = coercePattern.matcher( value );
if ( matcher.matches() )
{
char type = matcher.group( 1 ).charAt( 0 );
value = matcher.group( 2 );
-
- switch( type )
+
+ switch ( type )
{
case 'i':
{
@@ -191,14 +191,14 @@ public class HttpMethodConfiguration
{
collection.add( entries[i].trim() );
}
-
+
p.setParameter( key, collection );
break;
}
case 'm':
{
String[] entries = value.split( "," );
-
+
Map map = new LinkedHashMap();
for ( int i = 0; i < entries.length; i++ )
{
@@ -207,12 +207,12 @@ public class HttpMethodConfiguration
{
break;
}
-
+
String mapKey = entries[i].substring( 0, idx );
String mapVal = entries[i].substring( idx + 1, entries[i].length() );
map.put( mapKey.trim(), mapVal.trim() );
}
-
+
p.setParameter( key, map );
break;
}
@@ -230,52 +230,53 @@ public class HttpMethodConfiguration
{
if ( headers == null )
{
- return null;
+ return new Header[0];
}
-
+
Header[] result = new Header[headers.size()];
-
+
int index = 0;
for ( Iterator it = headers.entrySet().iterator(); it.hasNext(); )
{
Map.Entry entry = (Map.Entry) it.next();
-
+
String key = (String) entry.getKey();
String value = (String) entry.getValue();
-
+
Header header = new Header( key, value );
result[index++] = header;
}
-
+
return result;
}
-
+
private HttpMethodConfiguration copy()
{
HttpMethodConfiguration copy = new HttpMethodConfiguration();
-
+
copy.setConnectionTimeout( getConnectionTimeout() );
if ( getHeaders() != null )
{
copy.setHeaders( getHeaders() );
}
-
+
if ( getParams() != null )
{
copy.setParams( getParams() );
}
copy.setUseDefaultHeaders( isUseDefaultHeaders() );
-
+
return copy;
}
- public static HttpMethodConfiguration merge( HttpMethodConfiguration defaults, HttpMethodConfiguration base, HttpMethodConfiguration local )
+ public static HttpMethodConfiguration merge( HttpMethodConfiguration defaults, HttpMethodConfiguration base,
+ HttpMethodConfiguration local )
{
HttpMethodConfiguration result = merge( defaults, base );
return merge( result, local );
}
-
+
public static HttpMethodConfiguration merge( HttpMethodConfiguration base, HttpMethodConfiguration local )
{
if ( base == null && local == null )
@@ -293,29 +294,29 @@ public class HttpMethodConfiguration
else
{
HttpMethodConfiguration result = base.copy();
-
+
if ( local.getConnectionTimeout() != DEFAULT_CONNECTION_TIMEOUT )
{
result.setConnectionTimeout( local.getConnectionTimeout() );
}
-
+
if ( local.getHeaders() != null )
{
result.getHeaders().putAll( local.getHeaders() );
}
-
+
if ( local.getParams() != null )
{
result.getParams().putAll( local.getParams() );
}
-
+
if ( local.getUseDefaultHeaders() != null )
{
result.setUseDefaultHeaders( local.isUseDefaultHeaders() );
}
-
+
return result;
}
}
-
+
}
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=1173675&r1=1173674&r2=1173675&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 Wed Sep 21 14:28:06 2011
@@ -37,17 +37,17 @@ import java.util.regex.Pattern;
public class HttpMethodConfiguration
{
-
+
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
private static final String COERCE_PATTERN = "%(\\w+),(.+)";
-
+
private Boolean useDefaultHeaders;
-
+
private Properties headers = new Properties();
-
+
private Properties params = new Properties();
-
+
private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
public boolean isUseDefaultHeaders()
@@ -60,12 +60,12 @@ public class HttpMethodConfiguration
this.useDefaultHeaders = Boolean.valueOf( useDefaultHeaders );
return this;
}
-
+
public Boolean getUseDefaultHeaders()
{
return useDefaultHeaders;
}
-
+
public HttpMethodConfiguration addHeader( String header, String value )
{
headers.setProperty( header, value );
@@ -82,7 +82,7 @@ public class HttpMethodConfiguration
this.headers = headers;
return this;
}
-
+
public HttpMethodConfiguration addParam( String param, String value )
{
params.setProperty( param, value );
@@ -117,11 +117,11 @@ public class HttpMethodConfiguration
{
return null;
}
-
+
DefaultedHttpParams p = new DefaultedHttpParams( new BasicHttpParams(), defaults );
fillParams( p );
-
+
return p;
}
@@ -131,7 +131,7 @@ public class HttpMethodConfiguration
{
return false;
}
-
+
return true;
}
@@ -141,30 +141,30 @@ public class HttpMethodConfiguration
{
return;
}
-
+
if ( connectionTimeout > 0 )
{
p.setParameter( CoreConnectionPNames.SO_TIMEOUT, connectionTimeout );
}
-
+
if ( params != null )
{
Pattern coercePattern = Pattern.compile( COERCE_PATTERN );
-
+
for ( Iterator<?> it = params.entrySet().iterator(); it.hasNext(); )
{
Map.Entry<String, String> entry = (Map.Entry) it.next();
-
+
String key = entry.getKey();
String value = entry.getValue();
-
+
Matcher matcher = coercePattern.matcher( value );
if ( matcher.matches() )
{
char type = matcher.group( 1 ).charAt( 0 );
value = matcher.group( 2 );
-
- switch( type )
+
+ switch ( type )
{
case 'i':
{
@@ -194,14 +194,14 @@ public class HttpMethodConfiguration
{
collection.add( entries[i].trim() );
}
-
+
p.setParameter( key, collection );
break;
}
case 'm':
{
String[] entries = value.split( "," );
-
+
Map<String, String> map = new LinkedHashMap<String, String>();
for ( int i = 0; i < entries.length; i++ )
{
@@ -210,12 +210,12 @@ public class HttpMethodConfiguration
{
break;
}
-
+
String mapKey = entries[i].substring( 0, idx );
String mapVal = entries[i].substring( idx + 1, entries[i].length() );
map.put( mapKey.trim(), mapVal.trim() );
}
-
+
p.setParameter( key, map );
break;
}
@@ -233,52 +233,53 @@ public class HttpMethodConfiguration
{
if ( headers == null )
{
- return null;
+ return new Header[0];
}
-
+
Header[] result = new Header[headers.size()];
-
+
int index = 0;
for ( Iterator<?> it = headers.entrySet().iterator(); it.hasNext(); )
{
Map.Entry<String, String> entry = (Map.Entry) it.next();
-
+
String key = (String) entry.getKey();
String value = (String) entry.getValue();
-
+
Header header = new BasicHeader( key, value );
result[index++] = header;
}
-
+
return result;
}
-
+
private HttpMethodConfiguration copy()
{
HttpMethodConfiguration copy = new HttpMethodConfiguration();
-
+
copy.setConnectionTimeout( getConnectionTimeout() );
if ( getHeaders() != null )
{
copy.setHeaders( getHeaders() );
}
-
+
if ( getParams() != null )
{
copy.setParams( getParams() );
}
copy.setUseDefaultHeaders( isUseDefaultHeaders() );
-
+
return copy;
}
- public static HttpMethodConfiguration merge( HttpMethodConfiguration defaults, HttpMethodConfiguration base, HttpMethodConfiguration local )
+ public static HttpMethodConfiguration merge( HttpMethodConfiguration defaults, HttpMethodConfiguration base,
+ HttpMethodConfiguration local )
{
HttpMethodConfiguration result = merge( defaults, base );
return merge( result, local );
}
-
+
public static HttpMethodConfiguration merge( HttpMethodConfiguration base, HttpMethodConfiguration local )
{
if ( base == null && local == null )
@@ -296,29 +297,29 @@ public class HttpMethodConfiguration
else
{
HttpMethodConfiguration result = base.copy();
-
+
if ( local.getConnectionTimeout() != DEFAULT_CONNECTION_TIMEOUT )
{
result.setConnectionTimeout( local.getConnectionTimeout() );
}
-
+
if ( local.getHeaders() != null )
{
result.getHeaders().putAll( local.getHeaders() );
}
-
+
if ( local.getParams() != null )
{
result.getParams().putAll( local.getParams() );
}
-
+
if ( local.getUseDefaultHeaders() != null )
{
result.setUseDefaultHeaders( local.isUseDefaultHeaders() );
}
-
+
return result;
}
}
-
+
}