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 2016/05/01 12:56:11 UTC
[09/50] [abbrv] maven-aether git commit: Replaced discouraged
StringTokenizer usage with String.split()
Replaced discouraged StringTokenizer usage with String.split()
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/caf41eca
Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/caf41eca
Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/caf41eca
Branch: refs/heads/master
Commit: caf41ecab637210499b7c094bed85e41567e7655
Parents: 39accef
Author: Benjamin Bentmann <be...@sonatype.com>
Authored: Sun May 25 22:43:07 2014 +0200
Committer: Benjamin Bentmann <be...@sonatype.com>
Committed: Sun May 25 22:43:07 2014 +0200
----------------------------------------------------------------------
.../util/repository/DefaultProxySelector.java | 17 ++++++++---------
.../util/repository/DefaultProxySelectorTest.java | 6 ++++++
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-aether/blob/caf41eca/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
----------------------------------------------------------------------
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
index 0a3cb71..a47b5ac 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
@@ -11,12 +11,12 @@
package org.eclipse.aether.util.repository;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.StringTokenizer;
import java.util.regex.Pattern;
import org.eclipse.aether.repository.Proxy;
@@ -53,9 +53,8 @@ public final class DefaultProxySelector
* a given repository will be used.
*
* @param proxy The proxy definition to add, must not be {@code null}.
- * @param nonProxyHosts The list of (case-insensitive) host names to exclude from proxying, may be {@code null} but
- * must not contain {@code null} elements. The asterisk character ('*') may be used as wildcard in a host
- * name.
+ * @param nonProxyHosts The list of (case-insensitive) host names to exclude from proxying, may be {@code null}. The
+ * asterisk character ('*') may be used as wildcard in a host name.
* @return This proxy selector for chaining, never {@code null}.
* @since 1.1.0
*/
@@ -123,6 +122,10 @@ public final class DefaultProxySelector
{
for ( String nonProxyHost : nonProxyHosts )
{
+ if ( nonProxyHost == null || nonProxyHost.length() <= 0 )
+ {
+ continue;
+ }
String pattern = nonProxyHost;
pattern = pattern.replace( ".", "\\." ).replace( "*", ".*" );
patterns.add( Pattern.compile( pattern, Pattern.CASE_INSENSITIVE ) );
@@ -136,11 +139,7 @@ public final class DefaultProxySelector
List<String> hosts = null;
if ( nonProxyHosts != null )
{
- hosts = new ArrayList<String>();
- for ( StringTokenizer tokenizer = new StringTokenizer( nonProxyHosts, "|" ); tokenizer.hasMoreTokens(); )
- {
- hosts.add( tokenizer.nextToken() );
- }
+ hosts = Arrays.asList( nonProxyHosts.split( "\\|" ) );
}
return hosts;
}
http://git-wip-us.apache.org/repos/asf/maven-aether/blob/caf41eca/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
----------------------------------------------------------------------
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
index b33c1b2..a8cc141 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
@@ -37,9 +37,13 @@ public class DefaultProxySelectorTest
{
assertFalse( isNonProxyHost( "www.eclipse.org", (String) null ) );
assertFalse( isNonProxyHost( "www.eclipse.org", "" ) );
+ assertFalse( isNonProxyHost( "", "" ) );
assertFalse( isNonProxyHost( "www.eclipse.org", (String[]) null ) );
assertFalse( isNonProxyHost( "www.eclipse.org", new String[0] ) );
+ assertFalse( isNonProxyHost( "", new String[0] ) );
+ assertFalse( isNonProxyHost( "", new String[] { null } ) );
+ assertFalse( isNonProxyHost( "", new String[] { "" } ) );
}
@Test
@@ -59,6 +63,8 @@ public class DefaultProxySelectorTest
assertTrue( isNonProxyHost( "eclipse.org", "host1|eclipse.org" ) );
assertTrue( isNonProxyHost( "eclipse.org", "host1|eclipse.org|host2" ) );
+ assertFalse( isNonProxyHost( "", "||host||" ) );
+
// controversial (no trimming) but consistent with JRE's handling of http.nonProxyHosts
assertFalse( isNonProxyHost( "eclipse.org", "host1| eclipse.org |host2" ) );
assertFalse( isNonProxyHost( "eclipse.org", "host1|eclipse.org " ) );