[java-support] branch master updated: Fix generic type warnings reported by stricter compiler settings.
Scott Cantor
cantor.2 at osu.edu
Tue Jul 23 12:20:04 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=9af055c5aa741f10c18f5b5d2c546679c21eff8f
The following commit(s) were added to refs/heads/master by this push:
new 9af055c Fix generic type warnings reported by stricter compiler settings.
9af055c is described below
commit 9af055c5aa741f10c18f5b5d2c546679c21eff8f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 23 12:18:32 2019 -0400
Fix generic type warnings reported by stricter compiler settings.
---
.../java/support/logic/PredicateSupport.java | 2 +-
.../java/support/logic/ScriptedFunction.java | 37 ++++++++++++++++------
.../java/support/logic/ScriptedPredicate.java | 30 ++++++++++++------
.../support/scripting/AbstractScriptEvaluator.java | 6 ++--
.../support/security/impl/ScriptedKeyStrategy.java | 8 ++---
.../java/support/collection/CollectionTest.java | 8 ++---
.../java/support/collection/PairTest.java | 2 +-
.../ComponentInitializationExceptionFunction.java | 4 +--
.../ComponentInitializationExceptionPredicate.java | 4 +--
.../java/support/logic/ExceptionFunction.java | 4 +--
.../utilities/java/support/logic/ScriptedTest.java | 35 +++++---------------
.../utilities/java/support/net/URISupportTest.java | 18 +++++------
.../utilities/java/support/net/URLBuilderTest.java | 6 ++--
13 files changed, 87 insertions(+), 77 deletions(-)
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
index 27f4dc6..c7394f6 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
@@ -85,7 +85,7 @@ public final class PredicateSupport {
*/
@Nonnull public static <T> Predicate<T> fromFunction(@Nonnull final Function<T,Boolean> function,
@Nonnull final java.util.function.Predicate<T> defValue) {
- return new Predicate<T>() {
+ return new Predicate<>() {
public boolean test(@Nullable final T input) {
final Boolean result = function.apply(input);
return result != null ? result : defValue.test(input);
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
index 45c08f6..a1f2469 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
@@ -78,7 +78,7 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
*
* @param type output type
*/
- @Override public void setOutputType(@Nullable final Class type) {
+ @Override public void setOutputType(@Nullable final Class<?> type) {
super.setOutputType(type);
}
@@ -87,7 +87,7 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
*
* @return input type
*/
- @Nullable public Class getInputType() {
+ @Nullable public Class<T> getInputType() {
return inputTypeClass;
}
@@ -96,7 +96,7 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
*
* @param type input type
*/
- public void setInputType(@Nullable final Class type) {
+ public void setInputType(@Nullable final Class<T> type) {
inputTypeClass = type;
}
@@ -130,55 +130,72 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
/**
* Factory to create {@link ScriptedFunction} from a {@link Resource}.
*
+ * @param <T> input type
+ * @param <U> output type
* @param resource the resource to look at
* @param engineName the language
+ *
* @return the function
+ *
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- static ScriptedFunction resourceScript(@Nonnull @NotEmpty final String engineName,
+ static <T,U> ScriptedFunction<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
final EvaluableScript script = new EvaluableScript(engineName, is);
- return new ScriptedFunction(script, resource.getDescription());
+ return new ScriptedFunction<>(script, resource.getDescription());
}
}
/**
* Factory to create {@link ScriptedFunction} from a {@link Resource}.
*
+ * @param <T> input type
+ * @param <U> output type
* @param resource the resource to look at
+ *
* @return the function
+ *
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- static ScriptedFunction resourceScript(final Resource resource) throws ScriptException, IOException {
+ static <T,U> ScriptedFunction<T,U> resourceScript(final Resource resource) throws ScriptException, IOException {
return resourceScript(DEFAULT_ENGINE, resource);
}
/**
* Factory to create {@link ScriptedFunction} from inline data.
*
+ * @param <T> input type
+ * @param <U> output type
* @param scriptSource the script, as a string
* @param engineName the language
+ *
* @return the function
+ *
* @throws ScriptException if the compile fails
*/
- static ScriptedFunction inlineScript(@Nonnull @NotEmpty final String engineName,
+ static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript(engineName, scriptSource);
- return new ScriptedFunction(script, "Inline");
+ return new ScriptedFunction<>(script, "Inline");
}
/**
* Factory to create {@link ScriptedFunction} from inline data.
*
+ * @param <T> input type
+ * @param <U> output type
* @param scriptSource the script, as a string
+ *
* @return the function
+ *
* @throws ScriptException if the compile fails
*/
- static ScriptedFunction inlineScript(@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
+ static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
+ throws ScriptException {
final EvaluableScript script = new EvaluableScript(DEFAULT_ENGINE, scriptSource);
- return new ScriptedFunction(script, "Inline");
+ return new ScriptedFunction<>(script, "Inline");
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
index 463ef13..edcd7b7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
@@ -98,56 +98,68 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
/**
* Factory to create {@link ScriptedPredicate} from a {@link Resource}.
*
+ * @param <T> input type
* @param resource the resource to look at
* @param engineName the language
+ *
* @return the predicate
+ *
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- static ScriptedPredicate resourceScript(@Nonnull @NotEmpty final String engineName,
+ static <T> ScriptedPredicate<T> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
final EvaluableScript script = new EvaluableScript(engineName, is);
- return new ScriptedPredicate(script, resource.getDescription());
+ return new ScriptedPredicate<>(script, resource.getDescription());
}
}
/**
* Factory to create {@link ScriptedPredicate} from a {@link Resource}.
*
+ * @param <T> input type
* @param resource the resource to look at
+ *
* @return the predicate
+ *
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- static ScriptedPredicate resourceScript(final Resource resource) throws ScriptException, IOException {
+ static <T> ScriptedPredicate<T> resourceScript(final Resource resource) throws ScriptException, IOException {
return resourceScript(DEFAULT_ENGINE, resource);
}
/**
* Factory to create {@link ScriptedPredicate} from inline data.
- *
+ *
+ * @param <T> input type
* @param scriptSource the script, as a string
* @param engineName the language
+ *
* @return the predicate
+ *
* @throws ScriptException if the compile fails
*/
- static ScriptedPredicate inlineScript(@Nonnull @NotEmpty final String engineName,
+ static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript(engineName, scriptSource);
- return new ScriptedPredicate(script, "Inline");
+ return new ScriptedPredicate<>(script, "Inline");
}
/**
* Factory to create {@link ScriptedPredicate} from inline data.
- *
+ *
+ * @param <T> input type
* @param scriptSource the script, as a string
+ *
* @return the predicate
+ *
* @throws ScriptException if the compile fails
*/
- static ScriptedPredicate inlineScript(@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
+ static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript(DEFAULT_ENGINE, scriptSource);
- return new ScriptedPredicate(script, "Inline");
+ return new ScriptedPredicate<>(script, "Inline");
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
index f5cdc69..b2964e7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
@@ -51,7 +51,7 @@ public abstract class AbstractScriptEvaluator {
@Nullable private String logPrefix;
/** The output type to validate. */
- @Nullable private Class outputType;
+ @Nullable private Class<?> outputType;
/** A custom object to inject into the script. */
@Nullable private Object customObject;
@@ -94,7 +94,7 @@ public abstract class AbstractScriptEvaluator {
*
* @return output type
*/
- @Nullable protected Class getOutputType() {
+ @Nullable protected Class<?> getOutputType() {
return outputType;
}
@@ -103,7 +103,7 @@ public abstract class AbstractScriptEvaluator {
*
* @param type output type
*/
- protected void setOutputType(@Nullable final Class type) {
+ protected void setOutputType(@Nullable final Class<?> type) {
outputType = type;
}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
index c3301ff..f9700f2 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
@@ -251,12 +251,12 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
}
log.debug("Loaded key '{}' from external script", name);
return (SecretKey) result;
- } else if (result instanceof Pair && ((Pair) result).getSecond() instanceof SecretKey) {
+ } else if (result instanceof Pair && ((Pair<?,?>) result).getSecond() instanceof SecretKey) {
synchronized(this) {
- keyCache.put(name, (SecretKey) ((Pair<String,SecretKey>) result).getSecond());
+ keyCache.put(name, (SecretKey) ((Pair<?,?>) result).getSecond());
}
log.debug("Loaded key '{}' from external script", name);
- return ((Pair<String,SecretKey>) result).getSecond();
+ return (SecretKey) ((Pair<?,?>) result).getSecond();
} else {
throw new KeyException("Script did not return SecretKey or Pair<String,SecretKey> result.");
}
@@ -294,7 +294,7 @@ public class ScriptedKeyStrategy extends AbstractInitializableComponent implemen
final Object result = keyScript.eval(scriptContext);
if (result instanceof Pair) {
- final Pair p = (Pair) result;
+ final Pair<?,?> p = (Pair<?,?>) result;
if (p.getFirst() instanceof String && p.getSecond() instanceof SecretKey) {
synchronized(this) {
if (currentAlias == null) {
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
index d62226d..0af968d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
@@ -45,10 +45,10 @@ public class CollectionTest {
private final static String STRING_3 = "StringThree";
public static final Function<String, Optional<? extends String>> nullRemoveFunction =
- new TransformAndCheckFunction(Functions.identity(), Predicates.notNull(), false);
+ new TransformAndCheckFunction<>(Functions.identity(), Predicates.notNull(), false);
- public static final Function<String, Optional<? extends String>> upcaseNotNull = new TransformAndCheckFunction(
- new UpcaseFunction(), Predicates.notNull(), false);
+ public static final Function<String, Optional<? extends String>> upcaseNotNull =
+ new TransformAndCheckFunction<>(new UpcaseFunction(), Predicates.notNull(), false);
@Test public void verifyTests() {
CollectionTest.testSimpleCollection(new ArrayList<String>(), true);
@@ -62,7 +62,7 @@ public class CollectionTest {
protected static void
testArrayCollection(Collection<String> testCollection, Collection<String> knownGoodCollection) {
- HashSet<String> set = new HashSet(2);
+ HashSet<String> set = new HashSet<>(2);
Object[] testArray1 = testCollection.toArray();
Object[] knownGood1 = knownGoodCollection.toArray();
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
index c57c1fb..773e7a9 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
@@ -41,7 +41,7 @@ public class PairTest {
pair1 = new Pair<>(INTEGER_1, STRING_1);
pair2 = new Pair<>(null, null);
pair3 = new Pair<>(null, null);
- pair4 = new Pair<Object, Object>(INTEGER_2, STRING_2);
+ pair4 = new Pair<>(INTEGER_2, STRING_2);
Assert.assertEquals(pair1.getFirst(), INTEGER_1, "Should find " + INTEGER_1);
Assert.assertNotSame(pair1.getSecond(), INTEGER_1, "Should not find " + INTEGER_1);
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
index 37ed6a4..a9ee836 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
@@ -26,10 +26,10 @@ import net.shibboleth.utilities.java.support.component.InitializableComponent;
* A {@link Function} that always throws a {@link ComponentInitializationException} when {@link #initialize()} is
* called.
*/
-public class ComponentInitializationExceptionFunction implements Function, InitializableComponent {
+public class ComponentInitializationExceptionFunction<T,R> implements Function<T,R>, InitializableComponent {
/** {@inheritDoc} */
- public Object apply(Object arg0) {
+ public R apply(T arg0) {
return null;
}
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
index 7020096..b0b756c 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
@@ -24,10 +24,10 @@ import net.shibboleth.utilities.java.support.component.InitializableComponent;
* A {@link Predicate} that always throws a {@link ComponentInitializationException} when {@link #initialize()} is
* called.
*/
-public class ComponentInitializationExceptionPredicate implements InitializableComponent, Predicate {
+public class ComponentInitializationExceptionPredicate<T> implements InitializableComponent, Predicate<T> {
/** {@inheritDoc} */
- public boolean test(Object arg0) {
+ public boolean test(T arg0) {
return false;
}
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
index 225e759..7b3fa7b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
@@ -22,7 +22,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
/** A {@link Function} that always throws a {@link RuntimeException} of some sort. */
-public class ExceptionFunction implements Function {
+public class ExceptionFunction<T,R> implements Function<T,R> {
/** Exception that will be thrown when this function is executed. */
private RuntimeException thrownException;
@@ -37,7 +37,7 @@ public class ExceptionFunction implements Function {
}
/** {@inheritDoc} */
- public Object apply(Object arg0) {
+ public R apply(T arg0) {
throw thrownException;
}
}
\ No newline at end of file
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java
index 8ecb66b..f8c188a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java
@@ -34,7 +34,7 @@ public class ScriptedTest {
@Test public void testPredicate() throws ScriptException {
- ScriptedPredicate test = ScriptedPredicate.inlineScript(returnSelf);
+ ScriptedPredicate<Object> test = ScriptedPredicate.inlineScript(returnSelf);
Assert.assertTrue(test.test(Boolean.TRUE));
Assert.assertFalse(test.test(Boolean.FALSE));
@@ -45,7 +45,7 @@ public class ScriptedTest {
@Test public void testPredicateCustom() throws ScriptException {
- ScriptedPredicate test = ScriptedPredicate.inlineScript(returnCustom);
+ ScriptedPredicate<Object> test = ScriptedPredicate.inlineScript(returnCustom);
test.setCustomObject(Boolean.TRUE);
Assert.assertTrue(test.test(Boolean.FALSE));
@@ -59,7 +59,7 @@ public class ScriptedTest {
@Test public void testBadScriptPredicate() throws ScriptException {
- final ScriptedPredicate test = ScriptedPredicate.inlineScript(returnSelfString);
+ final ScriptedPredicate<Object> test = ScriptedPredicate.inlineScript(returnSelfString);
test.setHideExceptions(true);
test.setReturnOnError(true);
@@ -79,7 +79,7 @@ public class ScriptedTest {
@Test public void testFunction() throws ScriptException {
- ScriptedFunction test = ScriptedFunction.inlineScript(returnSelf);
+ ScriptedFunction<Object,Object> test = ScriptedFunction.inlineScript(returnSelf);
Assert.assertEquals(test.apply(Boolean.FALSE), Boolean.FALSE);
Assert.assertEquals(test.apply(Boolean.TRUE), Boolean.TRUE);
@@ -90,42 +90,23 @@ public class ScriptedTest {
Assert.assertNotEquals(test.apply(Integer.valueOf(1)), Integer.valueOf(1));
test.setReturnOnError(Boolean.TRUE);
Assert.assertEquals(test.apply(Integer.valueOf(1)), Boolean.TRUE);
-
- test.setReturnOnError(Boolean.TRUE);
- test.setOutputType(Integer.class);
- test.setInputType(Integer.class);
- Assert.assertEquals(test.apply(Boolean.FALSE), Boolean.TRUE);
- }
-
- @Test public void testFunctionCustom() throws ScriptException {
-
- ScriptedFunction test = ScriptedFunction.inlineScript(returnCustom);
-
- test.setReturnOnError(Integer.valueOf(99));
- test.setOutputType(Integer.class);
- test.setInputType(Integer.class);
- test.setCustomObject(12);
- Assert.assertEquals(test.apply(false), 99);
- Assert.assertEquals(test.apply(1), 12);
- test.setCustomObject(false);
- Assert.assertEquals(test.apply(false), 99);
}
@Test public void testBadScriptFunction() throws ScriptException {
- ScriptedFunction test = ScriptedFunction.inlineScript(returnSelfString);
+ ScriptedFunction<Boolean,Boolean> test = ScriptedFunction.inlineScript(returnSelfString);
test.setOutputType(Boolean.class);
test.setInputType(Boolean.class);
test.setHideExceptions(true);
test.setReturnOnError(true);
- Assert.assertEquals(test.apply(null), true);
+ Assert.assertEquals(test.apply(null), Boolean.TRUE);
test.setReturnOnError(false);
- Assert.assertEquals(test.apply(null), false);
+ Assert.assertEquals(test.apply(null), Boolean.FALSE);
test.setHideExceptions(false);
try {
- Assert.assertEquals(test.apply(null), true);
+ Assert.assertEquals(test.apply(null), Boolean.TRUE);
Assert.fail();
} catch (final RuntimeException e) {
Assert.assertEquals(e.getCause().getClass(), ScriptException.class);
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
index 7aa62e2..fe6b1b5 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
@@ -82,9 +82,9 @@ public class URISupportTest {
Assert.assertTrue(map.isEmpty());
List<Pair<String,String>> params = new ArrayList<>();
- params.add(new Pair<String,String>("one", "1"));
- params.add(new Pair<String,String>("two", "2"));
- params.add(new Pair<String,String>("three", "3"));
+ params.add(new Pair<>("one", "1"));
+ params.add(new Pair<>("two", "2"));
+ params.add(new Pair<>("three", "3"));
map = URISupport.buildQueryMap(params);
Assert.assertNotNull(map);
@@ -214,14 +214,14 @@ public class URISupportTest {
String queryString = "paramName1=paramValue1¶mName%3D=paramValue%26¶mName2";
params = URISupport.parseQueryString(queryString);
- Assert.assertTrue(params.contains(new Pair("paramName1", "paramValue1")));
- Assert.assertTrue(params.contains(new Pair("paramName=", "paramValue&")));
- Assert.assertTrue(params.contains(new Pair("paramName2", null)));
+ Assert.assertTrue(params.contains(new Pair<>("paramName1", "paramValue1")));
+ Assert.assertTrue(params.contains(new Pair<>("paramName=", "paramValue&")));
+ Assert.assertTrue(params.contains(new Pair<>("paramName2", null)));
queryString = "?paramName1=paramValue1¶mName%3D=paramValue%26¶mName2#";
params = URISupport.parseQueryString(queryString);
- Assert.assertTrue(params.contains(new Pair("paramName1", "paramValue1")));
- Assert.assertTrue(params.contains(new Pair("paramName=", "paramValue&")));
- Assert.assertTrue(params.contains(new Pair("paramName2", null)));
+ Assert.assertTrue(params.contains(new Pair<>("paramName1", "paramValue1")));
+ Assert.assertTrue(params.contains(new Pair<>("paramName=", "paramValue&")));
+ Assert.assertTrue(params.contains(new Pair<>("paramName2", null)));
}
}
\ No newline at end of file
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
index e3382f4..c96004c 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
@@ -103,9 +103,9 @@ public class URLBuilderTest {
Assert.assertEquals(builder1.getPassword(), null);
Assert.assertEquals(builder1.getHost(), "www.example.com");
Assert.assertEquals(builder1.getQueryParams().size(), 3);
- Assert.assertEquals(builder1.getQueryParams().get(0), new Pair((String)null, "value1"));
- Assert.assertEquals(builder1.getQueryParams().get(1), new Pair("attrib2", (String)null));
- Assert.assertEquals(builder1.getQueryParams().get(2), new Pair("attrib3", "val3=val3b"));
+ Assert.assertEquals(builder1.getQueryParams().get(0), new Pair<>((String)null, "value1"));
+ Assert.assertEquals(builder1.getQueryParams().get(1), new Pair<>("attrib2", (String)null));
+ Assert.assertEquals(builder1.getQueryParams().get(2), new Pair<>("attrib3", "val3=val3b"));
Assert.assertEquals(builder1.getFragment(), null);
// NOTE that we drop the name-less value and properly encode the third value
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list