diff options
author | Joakim Erdfelt | 2015-12-17 19:51:57 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2015-12-17 19:51:57 +0000 |
commit | 31cd3fee84fb6b9644056a32159d83854aed9c4a (patch) | |
tree | 8d718101d28f2f6e582103d4ef740226c39846c7 /jetty-util/src | |
parent | 96e4d720df8e04e7f9455be9384b45b43e90e0fe (diff) | |
parent | 3bec195d080a32f8410816b605136da9fc9ff391 (diff) | |
download | org.eclipse.jetty.project-31cd3fee84fb6b9644056a32159d83854aed9c4a.tar.gz org.eclipse.jetty.project-31cd3fee84fb6b9644056a32159d83854aed9c4a.tar.xz org.eclipse.jetty.project-31cd3fee84fb6b9644056a32159d83854aed9c4a.zip |
Merge branch 'jetty-9.3.x'
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
Diffstat (limited to 'jetty-util/src')
3 files changed, 12 insertions, 5 deletions
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java index 03cf0553a1..340761d99f 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java @@ -35,8 +35,8 @@ import java.util.function.Predicate; public class IncludeExclude<ITEM> { private final Set<ITEM> _includes; - private final Set<ITEM> _excludes; private final Predicate<ITEM> _includePredicate; + private final Set<ITEM> _excludes; private final Predicate<ITEM> _excludePredicate; private static class SetContainsPredicate<ITEM> implements Predicate<ITEM> @@ -58,6 +58,7 @@ public class IncludeExclude<ITEM> /** * Default constructor over {@link HashSet} */ + @SuppressWarnings("unchecked") public IncludeExclude() { this(HashSet.class); @@ -68,17 +69,20 @@ public class IncludeExclude<ITEM> * @param setClass The type of {@link Set} to using internally * @param predicate A predicate function to test if a passed ITEM is matched by the passed SET} */ + @SuppressWarnings("unchecked") public <SET extends Set<ITEM>> IncludeExclude(Class<SET> setClass) { try { _includes = setClass.newInstance(); _excludes = setClass.newInstance(); + if(_includes instanceof Predicate) { _includePredicate = (Predicate<ITEM>)_includes; } else { _includePredicate = new SetContainsPredicate<>(_includes); } + if(_excludes instanceof Predicate) { _excludePredicate = (Predicate<ITEM>)_excludes; } else { @@ -112,7 +116,7 @@ public class IncludeExclude<ITEM> _includes.add(element); } - public void include(ITEM... element) + public void include(@SuppressWarnings("unchecked") ITEM... element) { for (ITEM e: element) _includes.add(e); @@ -123,7 +127,7 @@ public class IncludeExclude<ITEM> _excludes.add(element); } - public void exclude(ITEM... element) + public void exclude(@SuppressWarnings("unchecked") ITEM... element) { for (ITEM e: element) _excludes.add(e); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java b/jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java index c8db063fd7..ca5a0305d8 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java @@ -23,11 +23,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.function.BiFunction; import java.util.function.Predicate; import java.util.regex.Pattern; - /** * A Set of Regular expressions strings. * <p> diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java index 898288d58f..c23742795c 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java @@ -32,12 +32,15 @@ import java.security.KeyStore; import javax.net.ssl.SSLEngine; +import org.eclipse.jetty.toolchain.test.JDK; +import org.eclipse.jetty.toolchain.test.OS; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.StdErrLog; import org.eclipse.jetty.util.resource.Resource; import org.hamcrest.Matchers; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -207,6 +210,8 @@ public class SslContextFactoryTest public void testSetIncludeCipherSuitesRegex() throws Exception { cf.setIncludeCipherSuites(".*ECDHE.*",".*WIBBLE.*"); + Assume.assumeFalse(JDK.IS_8); + cf.start(); SSLEngine sslEngine = cf.newSSLEngine(); String[] enabledCipherSuites = sslEngine.getEnabledCipherSuites(); |