[java-shib-shared] branch main updated: Rename collections package.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 15:06:50 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=6737b1163a561d16912286fead1f0ff7d1a27715
The following commit(s) were added to refs/heads/main by this push:
new 6737b116 Rename collections package.
6737b116 is described below
commit 6737b1163a561d16912286fead1f0ff7d1a27715
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 11:06:48 2022 -0400
Rename collections package.
---
.../shared/httpclient/ContextHandlingHttpClient.java | 2 +-
.../main/java/net/shibboleth/shared/net/URISupport.java | 4 ++--
.../main/java/net/shibboleth/shared/net/URLBuilder.java | 2 +-
.../java/support/net/DynamicResponseHeaderFilter.java | 2 +-
.../java/net/shibboleth/shared/net/URISupportTest.java | 4 ++--
.../java/net/shibboleth/shared/net/URLBuilderTest.java | 5 +++--
.../java/net/shibboleth/shared/security/DataSealer.java | 2 +-
.../shibboleth/shared/security/DataSealerKeyStrategy.java | 2 +-
.../shared/security/impl/BasicKeystoreKeyStrategy.java | 2 +-
.../shared/security/impl/ScriptedKeyStrategy.java | 2 +-
.../shibboleth/shared/security/impl/keyStrategyScript.js | 2 +-
.../spring/expression/SpringExpressionBiConsumer.java | 2 +-
.../spring/expression/SpringExpressionBiFunction.java | 2 +-
.../spring/expression/SpringExpressionBiPredicate.java | 2 +-
.../support => shared}/collection/ClassIndexedSet.java | 2 +-
.../collection/ClassToInstanceMultiMap.java | 2 +-
.../support => shared}/collection/CollectionSupport.java | 2 +-
.../support => shared}/collection/IndexingObjectStore.java | 2 +-
.../java/support => shared}/collection/LazyList.java | 2 +-
.../java/support => shared}/collection/LazyMap.java | 2 +-
.../java/support => shared}/collection/LazySet.java | 2 +-
.../collection/LockableClassToInstanceMultiMap.java | 2 +-
.../java/support => shared}/collection/Pair.java | 2 +-
.../collection/ReflectionSafeIterator.java | 2 +-
.../support => shared}/collection/ValueTypeIndexedMap.java | 2 +-
.../java/support => shared}/collection/package-info.java | 2 +-
.../utilities/java/support/logic/ScriptedBiConsumer.java | 2 +-
.../utilities/java/support/logic/ScriptedBiFunction.java | 2 +-
.../utilities/java/support/logic/ScriptedBiPredicate.java | 2 +-
.../java/support/primitive/LangBearingString.java | 2 +-
.../utilities/java/support/resolver/CriteriaSet.java | 2 +-
.../utilities/java/support/xml/SerializeSupport.java | 2 +-
.../support => shared}/collection/ClassIndexedSetTest.java | 5 ++++-
.../collection/ClassToInstanceMultiMapTest.java | 2 +-
.../java/support => shared}/collection/CollectionTest.java | 14 +-------------
.../collection/IndexingObjectStoreTest.java | 2 +-
.../java/support => shared}/collection/LazyListTest.java | 2 +-
.../java/support => shared}/collection/LazyMapTest.java | 5 ++++-
.../java/support => shared}/collection/LazySetTest.java | 2 +-
.../java/support => shared}/collection/ListTest.java | 2 +-
.../collection/LockableClassToInstanceMultiMapTest.java | 2 +-
.../java/support => shared}/collection/MapTest.java | 2 +-
.../java/support => shared}/collection/PairTest.java | 2 +-
.../collection/ValueTypeIndexedMapTest.java | 2 +-
44 files changed, 54 insertions(+), 59 deletions(-)
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
index ac8b87ac..9e001ca5 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
-import net.shibboleth.utilities.java.support.collection.LazyList;
+import net.shibboleth.shared.collection.LazyList;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
index a1131c8a..d01f2ae5 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
@@ -31,8 +31,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.collection.LazyList;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.LazyList;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Helper methods for building {@link URI}s and parsing some HTTP URL information. */
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
index 7524d7ae..d6b4b257 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Strings;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
index 27350bd7..472bb6ca 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
@@ -40,7 +40,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
index 5ad76e53..2ba890d5 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
@@ -22,11 +22,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import net.shibboleth.utilities.java.support.collection.Pair;
-
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.collection.Pair;
+
/** Unit test for {@link URISupport}. */
public class URISupportTest {
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
index 5273a3c2..4dc6ee33 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
@@ -19,9 +19,10 @@ package net.shibboleth.shared.net;
import java.net.MalformedURLException;
-import net.shibboleth.utilities.java.support.collection.Pair;
-
import org.testng.annotations.Test;
+
+import net.shibboleth.shared.collection.Pair;
+
import org.testng.Assert;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
index 76692d15..1124a937 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
@@ -46,9 +46,9 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
index f658c9f1..4329498e 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import javax.crypto.SecretKey;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
/**
* Interface for acquiring secret keys on behalf of the {@link DataSealer} class,
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
index 7b090465..d486245b 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
@@ -42,11 +42,11 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
import net.shibboleth.shared.security.KeyNotFoundException;
-import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
index 62c2857e..7c5e49c9 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
@@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NonNegative;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
-import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-security/src/test/resources/net/shibboleth/shared/security/impl/keyStrategyScript.js b/shib-security/src/test/resources/net/shibboleth/shared/security/impl/keyStrategyScript.js
index 22c64f6c..ae9451f6 100644
--- a/shib-security/src/test/resources/net/shibboleth/shared/security/impl/keyStrategyScript.js
+++ b/shib-security/src/test/resources/net/shibboleth/shared/security/impl/keyStrategyScript.js
@@ -1,4 +1,4 @@
-var Pair = Java.type("net.shibboleth.utilities.java.support.collection.Pair");
+var Pair = Java.type("net.shibboleth.shared.collection.Pair");
if (typeof name != "undefined" && name != null) {
custom.get(name);
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
index 72bd02f2..a0c416cf 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
@@ -28,7 +28,7 @@ import org.springframework.expression.EvaluationContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
/**
* Predicate whose condition is defined by an Spring EL expression.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
index f79f2dbe..308ee4d4 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
@@ -28,7 +28,7 @@ import org.springframework.expression.EvaluationContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
/**
* Predicate whose condition is defined by an Spring EL expression.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
index 25954088..9a243865 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
@@ -28,7 +28,7 @@ import org.springframework.expression.EvaluationContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
/**
* Predicate whose condition is defined by an Spring EL expression.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
index 7b3fbdd9..d4f2e34d 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.AbstractSet;
import java.util.HashMap;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
index b45c57bb..c81bdc3e 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java b/shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java
index 13db57de..8975ec91 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/CollectionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/CollectionSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.function.BinaryOperator;
import java.util.stream.Collectors;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java b/shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java
index c6d04f25..4c8d3b16 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/IndexingObjectStore.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.Map;
import java.util.concurrent.locks.Lock;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java
index 3fcd4ade..bc8894b9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyList.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java
index af90f729..bb22622b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LazyMap.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.io.Serializable;
import java.util.Collection;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java
index 88354e0f..63516b02 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LazySet.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.io.Serializable;
import java.util.Collection;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java
index 41ea5b31..4e2b5ebe 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMap.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.Collection;
import java.util.List;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java b/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
index 481a4723..e1368331 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ReflectionSafeIterator.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ReflectionSafeIterator.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
index 28dd1689..5dbc57a5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ReflectionSafeIterator.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.Iterator;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java
index 2934bd22..f15f6cc5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ValueTypeIndexedMap.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.Collection;
import java.util.Collections;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java
index a8c3d193..1608259f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/package-info.java
@@ -17,4 +17,4 @@
/** Additional implementations of, and helpers for working with, collections. */
-package net.shibboleth.utilities.java.support.collection;
\ No newline at end of file
+package net.shibboleth.shared.collection;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
index e70d50b8..de4d15e5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
@@ -29,7 +29,7 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
index 26c94ceb..fdf48adb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
@@ -29,7 +29,7 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
index ccdb3739..32795290 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
@@ -29,7 +29,7 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
index 63021496..183e8a1c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
@@ -20,7 +20,7 @@ package net.shibboleth.utilities.java.support.primitive;
import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.collection.Pair;
+import net.shibboleth.shared.collection.Pair;
/**
* An object that represents a string associated with a language tag/locale.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
index 6e0bc4fa..3cc71775 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/CriteriaSet.java
@@ -19,7 +19,7 @@ package net.shibboleth.utilities.java.support.resolver;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.collection.ClassIndexedSet;
+import net.shibboleth.shared.collection.ClassIndexedSet;
/** This class holds instances of {@link Criterion} which are used in resolution or evaluation operations. */
public class CriteriaSet extends ClassIndexedSet<Criterion> implements Criterion {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
index 7f496649..9698ee2e 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SerializeSupport.java
@@ -25,7 +25,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.collection.LazyMap;
+import net.shibboleth.shared.collection.LazyMap;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.w3c.dom.DOMConfiguration;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java
index f04a918a..70569a7f 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSetTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassIndexedSetTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -247,6 +247,9 @@ public class ClassIndexedSetTest {
}
}
+ /**
+ * Test hash code equality.
+ */
@Test public void testEqualsHash() {
memberSet = new ClassIndexedSet<>();
ClassIndexedSet<Member> other = new ClassIndexedSet<>();
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java
index 2b57124a..775f3c31 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ClassToInstanceMultiMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.io.Serializable;
import java.time.Instant;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java
similarity index 94%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java
index 4dd4deb4..8f1e3c31 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/CollectionTest.java
@@ -15,23 +15,17 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.Optional;
import java.util.function.Function;
-import net.shibboleth.utilities.java.support.logic.TransformAndCheckFunction;
-
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Functions;
-import com.google.common.base.Predicates;
-
/**
* Generic {@link Collection} tester
*
@@ -44,12 +38,6 @@ 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);
-
- 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);
CollectionTest.testArrayCollection(new ArrayList<String>(), new ArrayList<String>());
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java
index ddbdfc03..b288182b 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/IndexingObjectStoreTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java
similarity index 97%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java
index d1fa5bc5..ede393af 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazyListTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyListTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java
similarity index 93%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java
index 700dab41..f358cfa5 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LazyMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import org.testng.annotations.Test;
@@ -24,6 +24,9 @@ import org.testng.annotations.Test;
*/
public class LazyMapTest {
+ /**
+ * Unit test.
+ */
@Test
public void testLazyMap() {
MapTest.testMap(new LazyMap<String, Object>());
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java
similarity index 96%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java
index 121a64b3..435fa5b2 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LazySetTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LazySetTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.HashSet;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java
index f77ae4e9..3824e2e8 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ListTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ListTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.ArrayList;
import java.util.List;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMapTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java
index 32726d81..437805af 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/LockableClassToInstanceMultiMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.io.Serializable;
import java.time.Instant;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java
index ac12c2ca..d93d7a64 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/MapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.Collection;
import java.util.HashMap;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java
index 773e7a96..000b17cb 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/PairTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java b/shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java
index 4b8ba3c5..27634002 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/collection/ValueTypeIndexedMapTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.collection;
+package net.shibboleth.shared.collection;
import java.util.Arrays;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list