[java-opensaml] branch master updated: Guava replacement.
Scott Cantor
cantor.2 at osu.edu
Tue Jul 7 14:29:45 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=9fc8a0bf51c29d4ca4d56f90b9d631e9c2d773d0
The following commit(s) were added to refs/heads/master by this push:
new 9fc8a0bf5 Guava replacement.
9fc8a0bf5 is described below
commit 9fc8a0bf51c29d4ca4d56f90b9d631e9c2d773d0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 7 10:29:51 2020 -0400
Guava replacement.
---
.../xml/persist/FilesystemLoadSaveManagerTest.java | 28 ++++++++---------
.../profile/logic/EntityGroupNamePredicate.java | 7 ++---
.../common/profile/logic/EntityIdPredicate.java | 7 ++---
.../logic/RegistrationAuthorityPredicate.java | 7 ++---
.../profile/logic/RegistrationPolicyPredicate.java | 7 ++---
.../saml/config/SAMLConfigurationTest.java | 2 +-
.../encoding/impl/HTTPRedirectDeflateEncoder.java | 6 ++--
.../AddAudienceRestrictionToAssertionsTest.java | 6 ++--
...ctionDrivenDynamicHTTPMetadataResolverTest.java | 6 ++--
.../index/impl/EndpointMetadataIndexTest.java | 15 ++++++----
.../assertion/SAML20AssertionValidatorTest.java | 12 ++++----
.../saml2/profile/impl/TestSelfEncryption.java | 4 +--
.../saml2/profile/impl/ValidateAssertionsTest.java | 4 +--
...InlineSelfEncryptionParametersStrategyTest.java | 4 +--
.../security/x509/TrustedNamesCriterion.java | 7 ++---
.../httpclient/HttpClientSecuritySupportTest.java | 23 +++++++-------
.../StaticPKIXValidationInformationResolver.java | 4 +--
.../BasicHttpClientSecurityConfigurationTest.java | 11 ++++---
...icHttpClientSecurityParametersResolverTest.java | 7 ++---
.../soap/wsaddressing/WSAddressingConstants.java | 35 ++++++++++++----------
.../support/AbstractEncryptedKeyResolver.java | 9 ++----
.../xmlsec/signature/support/SignatureSupport.java | 5 ++--
22 files changed, 98 insertions(+), 118 deletions(-)
diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java b/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java
index f74898bfb..f6378db30 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/persist/FilesystemLoadSaveManagerTest.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.time.Instant;
+import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Set;
@@ -44,7 +45,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Uninterruptibles;
import net.shibboleth.utilities.java.support.collection.Pair;
@@ -76,7 +76,7 @@ public class FilesystemLoadSaveManagerTest extends XMLObjectBaseTestCase {
@Test
public void emptyDir() throws IOException {
- testState(Sets.<String>newHashSet());
+ testState(Collections.emptySet());
}
@DataProvider
@@ -89,20 +89,20 @@ public class FilesystemLoadSaveManagerTest extends XMLObjectBaseTestCase {
@Test(dataProvider="saveLoadUpdateRemoveParams")
public void saveLoadUpdateRemove(Boolean buildWithObjectSourceByteArray) throws IOException {
- testState(Sets.<String>newHashSet());
+ testState(Collections.emptySet());
Assert.assertNull(manager.load("bogus"));
manager.save("foo", (SimpleXMLObject) buildXMLObject(SimpleXMLObject.ELEMENT_NAME, buildWithObjectSourceByteArray));
- testState(Sets.newHashSet("foo"));
+ testState(Collections.singleton("foo"));
manager.save("bar", (SimpleXMLObject) buildXMLObject(SimpleXMLObject.ELEMENT_NAME, buildWithObjectSourceByteArray));
manager.save("baz", (SimpleXMLObject) buildXMLObject(SimpleXMLObject.ELEMENT_NAME, buildWithObjectSourceByteArray));
- testState(Sets.newHashSet("foo", "bar", "baz"));
+ testState(Set.of("foo", "bar", "baz"));
// Duplicate with overwrite
manager.save("bar", (SimpleXMLObject) buildXMLObject(SimpleXMLObject.ELEMENT_NAME, buildWithObjectSourceByteArray), true);
- testState(Sets.newHashSet("foo", "bar", "baz"));
+ testState(Set.of("foo", "bar", "baz"));
// Duplicate without overwrite
try {
@@ -111,17 +111,17 @@ public class FilesystemLoadSaveManagerTest extends XMLObjectBaseTestCase {
} catch (IOException e) {
// expected, do nothing
}
- testState(Sets.newHashSet("foo", "bar", "baz"));
+ testState(Set.of("foo", "bar", "baz"));
// Test again. Since checkModifyTime=false, we should get back data even though unmodified
- testState(Sets.newHashSet("foo", "bar", "baz"));
+ testState(Set.of("foo", "bar", "baz"));
Assert.assertTrue(manager.updateKey("foo", "foo2"));
- testState(Sets.newHashSet("foo2", "bar", "baz"));
+ testState(Set.of("foo2", "bar", "baz"));
// Doesn't exist anymore
Assert.assertFalse(manager.updateKey("foo", "foo2"));
- testState(Sets.newHashSet("foo2", "bar", "baz"));
+ testState(Set.of("foo2", "bar", "baz"));
// Can't update to an existing name
try {
@@ -130,18 +130,18 @@ public class FilesystemLoadSaveManagerTest extends XMLObjectBaseTestCase {
} catch (IOException e) {
// expected, do nothing
}
- testState(Sets.newHashSet("foo2", "bar", "baz"));
+ testState(Set.of("foo2", "bar", "baz"));
// Doesn't exist anymore
Assert.assertFalse(manager.remove("foo"));
- testState(Sets.newHashSet("foo2", "bar", "baz"));
+ testState(Set.of("foo2", "bar", "baz"));
Assert.assertTrue(manager.remove("foo2"));
- testState(Sets.newHashSet("bar", "baz"));
+ testState(Set.of("bar", "baz"));
Assert.assertTrue(manager.remove("bar"));
Assert.assertTrue(manager.remove("baz"));
- testState(Sets.<String>newHashSet());
+ testState(Collections.emptySet());
}
@Test
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
index ef8e9ab83..119e27df7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
@@ -19,7 +19,6 @@ package org.opensaml.saml.common.profile.logic;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -34,8 +33,6 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableSet;
-
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -83,7 +80,7 @@ public class EntityGroupNamePredicate implements Predicate<EntityDescriptor> {
public EntityGroupNamePredicate(@Nullable @ParameterName(name="names") final Collection<String> names,
@Nullable @ParameterName(name="resolver") final MetadataResolver resolver) {
- groupNames = new HashSet<>(StringSupport.normalizeStringCollection(names));
+ groupNames = Set.copyOf(StringSupport.normalizeStringCollection(names));
metadataResolver = resolver;
if (resolver != null) {
@@ -100,7 +97,7 @@ public class EntityGroupNamePredicate implements Predicate<EntityDescriptor> {
* @return the group name criteria
*/
@Nonnull @NonnullElements @Unmodifiable @NotLive public Set<String> getGroupNames() {
- return ImmutableSet.copyOf(groupNames);
+ return groupNames;
}
// Checkstyle: CyclomaticComplexity OFF
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
index c332136d8..56074444b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.common.profile.logic;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -26,8 +25,6 @@ import javax.annotation.Nullable;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
-import com.google.common.collect.ImmutableSet;
-
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -49,7 +46,7 @@ public class EntityIdPredicate implements Predicate<EntityDescriptor> {
* @param ids the entityIDs to check for
*/
public EntityIdPredicate(@Nullable @ParameterName(name="ids") final Collection<String> ids) {
- entityIds = new HashSet<>(StringSupport.normalizeStringCollection(ids));
+ entityIds = Set.copyOf(StringSupport.normalizeStringCollection(ids));
}
/**
@@ -58,7 +55,7 @@ public class EntityIdPredicate implements Predicate<EntityDescriptor> {
* @return the entityID criteria
*/
@Nonnull @NonnullElements @Unmodifiable @NotLive public Set<String> getEntityIds() {
- return ImmutableSet.copyOf(entityIds);
+ return entityIds;
}
/** {@inheritDoc} */
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
index 961c61e87..26c2194bd 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.common.profile.logic;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -26,8 +25,6 @@ import javax.annotation.Nullable;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationInfo;
-import com.google.common.collect.ImmutableSet;
-
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -49,7 +46,7 @@ public class RegistrationAuthorityPredicate extends AbstractRegistrationInfoPre
* @param names the authority names to test for
*/
public RegistrationAuthorityPredicate(@Nullable at ParameterName(name="names") final Collection<String> names) {
- authorities = new HashSet<>(StringSupport.normalizeStringCollection(names));
+ authorities = Set.copyOf(StringSupport.normalizeStringCollection(names));
}
/**
@@ -58,7 +55,7 @@ public class RegistrationAuthorityPredicate extends AbstractRegistrationInfoPre
* @return the authority name criteria
*/
@Nonnull @NonnullElements @Unmodifiable @NotLive public Set<String> getAuthorities() {
- return ImmutableSet.copyOf(authorities);
+ return authorities;
}
/** {@inheritDoc} */
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
index fc461efbf..aeee11c2b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
@@ -18,7 +18,6 @@
package org.opensaml.saml.common.profile.logic;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -27,8 +26,6 @@ import javax.annotation.Nullable;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationInfo;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationPolicy;
-import com.google.common.collect.ImmutableSet;
-
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -50,7 +47,7 @@ public class RegistrationPolicyPredicate extends AbstractRegistrationInfoPredica
* @param policies the policies to test for
*/
public RegistrationPolicyPredicate(@Nullable @ParameterName(name="policies") final Collection<String> policies) {
- policySet = new HashSet<>(StringSupport.normalizeStringCollection(policies));
+ policySet = Set.copyOf(StringSupport.normalizeStringCollection(policies));
}
/**
@@ -59,7 +56,7 @@ public class RegistrationPolicyPredicate extends AbstractRegistrationInfoPredica
* @return the policy criteria
*/
@Nonnull @NonnullElements @Unmodifiable @NotLive public Set<String> getPolicies() {
- return ImmutableSet.copyOf(policySet);
+ return policySet;
}
/** {@inheritDoc} */
diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/config/SAMLConfigurationTest.java b/opensaml-saml-api/src/test/java/org/opensaml/saml/config/SAMLConfigurationTest.java
index c03d49b0d..9cc27ad2e 100644
--- a/opensaml-saml-api/src/test/java/org/opensaml/saml/config/SAMLConfigurationTest.java
+++ b/opensaml-saml-api/src/test/java/org/opensaml/saml/config/SAMLConfigurationTest.java
@@ -50,4 +50,4 @@ public class SAMLConfigurationTest {
}
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
index 263bc85e1..4a154061d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
@@ -32,6 +32,7 @@ import java.util.zip.DeflaterOutputStream;
import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletResponse;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.collection.Pair;
@@ -58,7 +59,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
/**
* SAML 2.0 HTTP Redirect encoder using the DEFLATE encoding method.
@@ -68,8 +68,8 @@ import com.google.common.collect.Sets;
public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
/** Params which are disallowed from appearing in the input endpoint URL. */
- private static final Set<String> DISALLOWED_ENDPOINT_QUERY_PARAMS =
- Sets.newHashSet("SAMLEncoding", "SAMLRequest", "SAMLResponse", "RelayState", "SigAlg", "Signature");
+ @Nonnull @NonnullElements private static final Set<String> DISALLOWED_ENDPOINT_QUERY_PARAMS =
+ Set.of("SAMLEncoding", "SAMLRequest", "SAMLResponse", "RelayState", "SigAlg", "Signature");
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(HTTPRedirectDeflateEncoder.class);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
index 1e9016466..2610b208e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
@@ -20,6 +20,8 @@ package org.opensaml.saml.common.profile.impl;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
+import java.util.List;
+
import org.opensaml.core.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.profile.RequestContextBuilder;
@@ -38,8 +40,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableList;
-
/** {@link AddAudienceRestrictionToAssertions} unit test. */
public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCase {
@@ -50,7 +50,7 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
@BeforeMethod public void setUp() throws ComponentInitializationException {
action = new AddAudienceRestrictionToAssertions();
- action.setAudienceRestrictionsLookupStrategy(FunctionSupport.constant(ImmutableList.of(AUDIENCE1, AUDIENCE2)));
+ action.setAudienceRestrictionsLookupStrategy(FunctionSupport.constant(List.of(AUDIENCE1, AUDIENCE2)));
action.initialize();
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
index d04826572..b553e0f1f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
@@ -20,12 +20,12 @@ package org.opensaml.saml.metadata.resolver.impl;
import java.security.MessageDigest;
import java.security.SecureRandom;
import java.util.Arrays;
+import java.util.Collections;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.saml.common.binding.artifact.SAMLSourceIDArtifact;
import org.opensaml.saml.criterion.ArtifactCriterion;
-import org.opensaml.saml.metadata.resolver.impl.MetadataQueryProtocolRequestURLBuilder.MetadataQueryProtocolURLBuilder;
import org.opensaml.saml.metadata.resolver.impl.TemplateRequestURLBuilder.EncodingStyle;
import org.opensaml.saml.saml2.binding.artifact.SAML2ArtifactType0004;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
@@ -36,8 +36,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
import net.shibboleth.utilities.java.support.codec.StringDigester;
import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
@@ -245,7 +243,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
String entityID = "https://foo1.example.org/idp/shibboleth";
MetadataQueryProtocolRequestURLBuilder requestURLBuilder = new MetadataQueryProtocolRequestURLBuilder(baseURL,
- Lists.<MetadataQueryProtocolURLBuilder>newArrayList(new SAMLArtifactURLBuilder()));
+ Collections.singletonList(new SAMLArtifactURLBuilder()));
resolver = new FunctionDrivenDynamicHTTPMetadataResolver(httpClientBuilder.buildClient());
resolver.setId("myDynamicResolver");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
index 04d00ea43..0a6d1b764 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
@@ -46,7 +46,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.base.Predicates;
-import com.google.common.collect.Sets;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -179,7 +178,7 @@ public class EndpointMetadataIndexTest extends XMLObjectBaseTestCase {
@Test
public void testGenerateKeysFromDescriptorAlwaysFalseSelector() {
- EndpointMetadataIndex metadataIndex = new EndpointMetadataIndex(Predicates.<Endpoint>alwaysFalse());
+ EndpointMetadataIndex metadataIndex = new EndpointMetadataIndex(Predicates.alwaysFalse());
Set<MetadataIndexKey> keys = metadataIndex.generateKeys(descriptor);
@@ -228,7 +227,8 @@ public class EndpointMetadataIndexTest extends XMLObjectBaseTestCase {
@Test
public void testGenerateKeysFromDescriptorIndexOnlyACS() {
Map<QName, Set<QName>> indexableEndpoints = new HashMap<>();
- indexableEndpoints.put(SPSSODescriptor.DEFAULT_ELEMENT_NAME, Sets.newHashSet(AssertionConsumerService.DEFAULT_ELEMENT_NAME));
+ indexableEndpoints.put(SPSSODescriptor.DEFAULT_ELEMENT_NAME,
+ Collections.singleton(AssertionConsumerService.DEFAULT_ELEMENT_NAME));
EndpointMetadataIndex metadataIndex =
new EndpointMetadataIndex(new EndpointMetadataIndex.DefaultEndpointSelectionPredicate(indexableEndpoints));
@@ -257,17 +257,20 @@ public class EndpointMetadataIndexTest extends XMLObjectBaseTestCase {
Assert.assertFalse(predicate.test(endpoint));
indexableEndpoints = new HashMap<>();
- indexableEndpoints.put(SPSSODescriptor.DEFAULT_ELEMENT_NAME, Sets.newHashSet(ArtifactResolutionService.DEFAULT_ELEMENT_NAME));
+ indexableEndpoints.put(SPSSODescriptor.DEFAULT_ELEMENT_NAME,
+ Collections.singleton(ArtifactResolutionService.DEFAULT_ELEMENT_NAME));
predicate = new EndpointMetadataIndex.DefaultEndpointSelectionPredicate(indexableEndpoints);
Assert.assertFalse(predicate.test(endpoint));
indexableEndpoints = new HashMap<>();
- indexableEndpoints.put(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, Sets.newHashSet(ArtifactResolutionService.DEFAULT_ELEMENT_NAME));
+ indexableEndpoints.put(IDPSSODescriptor.DEFAULT_ELEMENT_NAME,
+ Collections.singleton(ArtifactResolutionService.DEFAULT_ELEMENT_NAME));
predicate = new EndpointMetadataIndex.DefaultEndpointSelectionPredicate(indexableEndpoints);
Assert.assertFalse(predicate.test(endpoint));
indexableEndpoints = new HashMap<>();
- indexableEndpoints.put(SPSSODescriptor.DEFAULT_ELEMENT_NAME, Sets.newHashSet(AssertionConsumerService.DEFAULT_ELEMENT_NAME));
+ indexableEndpoints.put(SPSSODescriptor.DEFAULT_ELEMENT_NAME,
+ Collections.singleton(AssertionConsumerService.DEFAULT_ELEMENT_NAME));
predicate = new EndpointMetadataIndex.DefaultEndpointSelectionPredicate(indexableEndpoints);
Assert.assertTrue(predicate.test(endpoint));
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java
index 95311f8a0..6683d3ef7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/assertion/SAML20AssertionValidatorTest.java
@@ -28,6 +28,7 @@ import java.security.cert.X509Certificate;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -66,8 +67,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Sets;
-
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -382,7 +381,8 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, false);
- staticParams.put(SAML2AssertionValidationParameters.COND_REQUIRED_CONDITIONS, Sets.newHashSet(MockCondition.ELEMENT_NAME));
+ staticParams.put(SAML2AssertionValidationParameters.COND_REQUIRED_CONDITIONS,
+ Collections.singleton(MockCondition.ELEMENT_NAME));
ValidationContext validationContext = new ValidationContext(staticParams);
@@ -403,7 +403,8 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, false);
- staticParams.put(SAML2AssertionValidationParameters.COND_REQUIRED_CONDITIONS, Sets.newHashSet(MockCondition.ELEMENT_NAME));
+ staticParams.put(SAML2AssertionValidationParameters.COND_REQUIRED_CONDITIONS,
+ Collections.singleton(MockCondition.ELEMENT_NAME));
ValidationContext validationContext = new ValidationContext(staticParams);
@@ -423,7 +424,8 @@ public class SAML20AssertionValidatorTest extends BaseAssertionValidationTest {
Map<String,Object> staticParams = buildBasicStaticParameters();
staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, false);
- staticParams.put(SAML2AssertionValidationParameters.COND_REQUIRED_CONDITIONS, Sets.newHashSet(MockCondition.ELEMENT_NAME));
+ staticParams.put(SAML2AssertionValidationParameters.COND_REQUIRED_CONDITIONS,
+ Collections.singleton(MockCondition.ELEMENT_NAME));
ValidationContext validationContext = new ValidationContext(staticParams);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
index 4daadae9a..d1648231b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/TestSelfEncryption.java
@@ -20,6 +20,7 @@ package org.opensaml.saml.saml2.profile.impl;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.Collections;
+import java.util.List;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -45,7 +46,6 @@ import org.testng.annotations.Test;
import com.google.common.base.Predicates;
import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
/** Unit test for self-encryption support in {@link AbstractEncryptAction} (using {@link EncryptNameIDs} as the concrete impl.) */
public class TestSelfEncryption extends OpenSAMLInitBaseTestCase {
@@ -100,7 +100,7 @@ public class TestSelfEncryption extends OpenSAMLInitBaseTestCase {
response.getAssertions().get(0).setSubject(SAML2ActionTestingSupport.buildSubject("morpheus"));
action.setEncryptToSelf(Predicates.<ProfileRequestContext>alwaysTrue());
- action.setEncryptToSelfParametersStrategy(FunctionSupport.constant(Lists.newArrayList(encParamsSelf1, encParamsSelf2)));
+ action.setEncryptToSelfParametersStrategy(FunctionSupport.constant(List.of(encParamsSelf1, encParamsSelf2)));
action.setSelfRecipientLookupStrategy(FunctionSupport.constant("https://idp.example.org"));
action.initialize();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
index 856cee546..c384f7a6c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertionsTest.java
@@ -40,8 +40,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
@@ -207,7 +205,7 @@ public class ValidateAssertionsTest extends OpenSAMLInitBaseTestCase {
Assertion assertion1 = SAML2ActionTestingSupport.buildAssertion();
resultsMap.put(assertion1, ValidationResult.VALID);
- action.setAssertionResolver(input -> {return Lists.newArrayList(assertion1);});
+ action.setAssertionResolver(input -> {return Collections.singletonList(assertion1);});
action.initialize();
action.execute(prc);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
index 72e7dbc01..ce13eae0f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategyTest.java
@@ -47,8 +47,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
/**
*
*/
@@ -133,7 +131,7 @@ public class InlineSelfEncryptionParametersStrategyTest extends OpenSAMLInitBase
rsaParams.setDigestMethod(EncryptionConstants.ALGO_ID_DIGEST_SHA256);
selfConfig.setRSAOAEPParameters(rsaParams);
selfConfig.setRSAOAEPParametersMerge(true);
- return Lists.newArrayList(selfConfig, SecurityConfigurationSupport.getGlobalEncryptionConfiguration());
+ return List.of(selfConfig, SecurityConfigurationSupport.getGlobalEncryptionConfiguration());
}};
InlineSelfEncryptionParametersStrategy strategy = new InlineSelfEncryptionParametersStrategy(credResolver, paramsResolver, configStrategy);
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java b/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
index f61b1d0f9..6688dbef0 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/x509/TrustedNamesCriterion.java
@@ -18,7 +18,6 @@
package org.opensaml.security.x509;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -30,8 +29,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.Criterion;
-import com.google.common.collect.ImmutableSet;
-
/**
* A criterion implementation for conveying a dynamically-generated set of trusted
* names for PKIX validation purposes. This criterion would typically be evaluated
@@ -57,7 +54,7 @@ public class TrustedNamesCriterion implements Criterion {
* @return the set of trusted names
*/
@Nonnull @NonnullElements @NotLive @Unmodifiable public Set<String> getTrustedNames() {
- return ImmutableSet.copyOf(trustedNames);
+ return trustedNames;
}
/**
@@ -71,7 +68,7 @@ public class TrustedNamesCriterion implements Criterion {
return;
}
- trustedNames = new HashSet<>(StringSupport.normalizeStringCollection(names));
+ trustedNames = Set.copyOf(StringSupport.normalizeStringCollection(names));
}
/** {@inheritDoc} */
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/HttpClientSecuritySupportTest.java b/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/HttpClientSecuritySupportTest.java
index 3a9ae98d9..477772057 100644
--- a/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/HttpClientSecuritySupportTest.java
+++ b/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/HttpClientSecuritySupportTest.java
@@ -32,6 +32,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import java.util.Collections;
import java.util.List;
import javax.net.ssl.HostnameVerifier;
@@ -58,8 +59,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
/**
*
*/
@@ -105,8 +104,8 @@ public class HttpClientSecuritySupportTest {
params.setCredentialsProvider(new BasicCredentialsProvider());
params.setTLSTrustEngine(new MockTrustEngine());
params.setTLSCriteriaSet(new CriteriaSet());
- params.setTLSProtocols(Lists.newArrayList("foo"));
- params.setTLSCipherSuites(Lists.newArrayList("foo"));
+ params.setTLSProtocols(Collections.singletonList("foo"));
+ params.setTLSCipherSuites(Collections.singletonList("foo"));
params.setClientTLSCredential(new BasicX509Credential(cert));
params.setHostnameVerifier(new DefaultHostnameVerifier());
params.setServerTLSFailureFatal(Boolean.TRUE);
@@ -131,8 +130,8 @@ public class HttpClientSecuritySupportTest {
context.setCredentialsProvider(new BasicCredentialsProvider());
context.setAttribute(CONTEXT_KEY_TRUST_ENGINE, new MockTrustEngine());
context.setAttribute(CONTEXT_KEY_CRITERIA_SET, new CriteriaSet());
- context.setAttribute(CONTEXT_KEY_TLS_PROTOCOLS, Lists.newArrayList("foo"));
- context.setAttribute(CONTEXT_KEY_TLS_CIPHER_SUITES, Lists.newArrayList("foo"));
+ context.setAttribute(CONTEXT_KEY_TLS_PROTOCOLS, Collections.singletonList("foo"));
+ context.setAttribute(CONTEXT_KEY_TLS_CIPHER_SUITES, Collections.singletonList("foo"));
context.setAttribute(CONTEXT_KEY_CLIENT_TLS_CREDENTIAL, new BasicX509Credential(cert));
context.setAttribute(CONTEXT_KEY_HOSTNAME_VERIFIER, new DefaultHostnameVerifier());
context.setAttribute(CONTEXT_KEY_SERVER_TLS_FAILURE_IS_FATAL, Boolean.FALSE);
@@ -141,8 +140,8 @@ public class HttpClientSecuritySupportTest {
params.setCredentialsProvider(new BasicCredentialsProvider());
params.setTLSTrustEngine(new MockTrustEngine());
params.setTLSCriteriaSet(new CriteriaSet());
- params.setTLSProtocols(Lists.newArrayList("foo"));
- params.setTLSCipherSuites(Lists.newArrayList("foo"));
+ params.setTLSProtocols(Collections.singletonList("foo"));
+ params.setTLSCipherSuites(Collections.singletonList("foo"));
params.setClientTLSCredential(new BasicX509Credential(cert));
params.setHostnameVerifier(new DefaultHostnameVerifier());
params.setServerTLSFailureFatal(Boolean.TRUE);
@@ -166,8 +165,8 @@ public class HttpClientSecuritySupportTest {
CredentialsProvider credProvider = new BasicCredentialsProvider();
TrustEngine<X509Credential> trustEngine = new MockTrustEngine();
CriteriaSet criteriaSet = new CriteriaSet();
- List<String> protocols = Lists.newArrayList("foo");
- List<String> cipherSuites = Lists.newArrayList("foo");
+ List<String> protocols = Collections.singletonList("foo");
+ List<String> cipherSuites = Collections.singletonList("foo");
X509Credential clientTLSCred = new BasicX509Credential(cert);
HostnameVerifier verifier = new DefaultHostnameVerifier();
@@ -184,8 +183,8 @@ public class HttpClientSecuritySupportTest {
params.setCredentialsProvider(new BasicCredentialsProvider());
params.setTLSTrustEngine(new MockTrustEngine());
params.setTLSCriteriaSet(new CriteriaSet());
- params.setTLSProtocols(Lists.newArrayList("foo"));
- params.setTLSCipherSuites(Lists.newArrayList("foo"));
+ params.setTLSProtocols(Collections.singletonList("foo"));
+ params.setTLSCipherSuites(Collections.singletonList("foo"));
params.setClientTLSCredential(new BasicX509Credential(cert));
params.setHostnameVerifier(new DefaultHostnameVerifier());
params.setServerTLSFailureFatal(Boolean.TRUE);
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
index 539a99a76..362ee2700 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
@@ -81,13 +81,13 @@ public class StaticPKIXValidationInformationResolver implements PKIXValidationIn
if (info != null) {
pkixInfo = new ArrayList<>(info);
} else {
- pkixInfo = Collections.EMPTY_LIST;
+ pkixInfo = Collections.emptyList();
}
if (names != null) {
trustedNames = new HashSet<>(names);
} else {
- trustedNames = Collections.EMPTY_SET;
+ trustedNames = Collections.emptySet();
}
supportDynamicTrustedNames = supportDynamicNames;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfigurationTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfigurationTest.java
index 6fab6df32..5df152b36 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfigurationTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityConfigurationTest.java
@@ -20,6 +20,7 @@ package org.opensaml.security.httpclient.impl;
import java.io.File;
import java.net.URISyntaxException;
import java.security.cert.CertificateException;
+import java.util.Collections;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
@@ -33,8 +34,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
@@ -56,8 +55,8 @@ public class BasicHttpClientSecurityConfigurationTest {
config.setClientTLSCredential(x509Credential);
config.setCredentialsProvider(new BasicCredentialsProvider());
config.setHostnameVerifier(new DefaultHostnameVerifier());
- config.setTLSCipherSuites(Lists.newArrayList("test"));
- config.setTLSProtocols(Lists.newArrayList("test"));
+ config.setTLSCipherSuites(Collections.singletonList("test"));
+ config.setTLSProtocols(Collections.singletonList("test"));
config.setTLSTrustEngine(new MockTrustEngine());
Assert.assertNotNull(config.getClientTLSCredential());
@@ -71,8 +70,8 @@ public class BasicHttpClientSecurityConfigurationTest {
@Test
public void testEmptyLists() {
BasicHttpClientSecurityConfiguration config = new BasicHttpClientSecurityConfiguration();
- config.setTLSCipherSuites(Lists.<String>newArrayList());
- config.setTLSProtocols(Lists.<String>newArrayList());
+ config.setTLSCipherSuites(Collections.emptyList());
+ config.setTLSProtocols(Collections.emptyList());
Assert.assertNull(config.getTLSCipherSuites());
Assert.assertNull(config.getTLSProtocols());
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolverTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolverTest.java
index 1ccbdccbc..a5b6657f8 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolverTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/BasicHttpClientSecurityParametersResolverTest.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.net.URISyntaxException;
import java.security.KeyException;
import java.security.cert.CertificateException;
+import java.util.Collections;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
import org.apache.http.impl.client.BasicCredentialsProvider;
@@ -37,8 +38,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -233,8 +232,8 @@ public class BasicHttpClientSecurityParametersResolverTest {
config.setClientTLSCredential(x509Credential);
config.setCredentialsProvider(new BasicCredentialsProvider());
config.setHostnameVerifier(new DefaultHostnameVerifier());
- config.setTLSCipherSuites(Lists.newArrayList("test"));
- config.setTLSProtocols(Lists.newArrayList("test"));
+ config.setTLSCipherSuites(Collections.singletonList("test"));
+ config.setTLSProtocols(Collections.singletonList("test"));
config.setTLSTrustEngine(new MockTrustEngine());
config.setServerTLSFailureFatal(true);
return config;
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java
index 74ebab17d..f3b5200b0 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/WSAddressingConstants.java
@@ -19,9 +19,11 @@ package org.opensaml.soap.wsaddressing;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import com.google.common.collect.Sets;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* WS-Addressing 1.0 constants.
@@ -32,59 +34,59 @@ import com.google.common.collect.Sets;
public final class WSAddressingConstants {
/** WS-Addressing 1.0 namespace. */
- public static final String WSA_NS= "http://www.w3.org/2005/08/addressing";
+ @Nonnull @NotEmpty public static final String WSA_NS= "http://www.w3.org/2005/08/addressing";
/** WS-Addressing prefix. */
- public static final String WSA_PREFIX= "wsa";
+ @Nonnull @NotEmpty public static final String WSA_PREFIX= "wsa";
// SOAP fault codes
/** WS-Addressing SOAP fault code: "wsa:InvalidAddressingHeader". */
- public static final QName SOAP_FAULT_INVALID_ADDRESSING_HEADER =
+ @Nonnull public static final QName SOAP_FAULT_INVALID_ADDRESSING_HEADER =
new QName(WSA_NS, "InvalidAddressingHeader", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:InvalidAddress". */
- public static final QName SOAP_FAULT_INVALID_ADDRESS =
+ @Nonnull public static final QName SOAP_FAULT_INVALID_ADDRESS =
new QName(WSA_NS, "InvalidAddress", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:InvalidEPR". */
- public static final QName SOAP_FAULT_INVALID_EPR =
+ @Nonnull public static final QName SOAP_FAULT_INVALID_EPR =
new QName(WSA_NS, "InvalidEPR", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:InvalidCardinality". */
- public static final QName SOAP_FAULT_INVALID_CARDINALITY =
+ @Nonnull public static final QName SOAP_FAULT_INVALID_CARDINALITY =
new QName(WSA_NS, "InvalidCardinality", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:MissingAddressInEPR". */
- public static final QName SOAP_FAULT_MISSING_ADDRESS_IN_EPR =
+ @Nonnull public static final QName SOAP_FAULT_MISSING_ADDRESS_IN_EPR =
new QName(WSA_NS, "MissingAddressInEPR", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:DuplicateMessageID". */
- public static final QName SOAP_FAULT_DUPLICATE_MESSAGE_ID =
+ @Nonnull public static final QName SOAP_FAULT_DUPLICATE_MESSAGE_ID =
new QName(WSA_NS, "DuplicateMessageID", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:ActionMismatch". */
- public static final QName SOAP_FAULT_ACTION_MISMATCH =
+ @Nonnull public static final QName SOAP_FAULT_ACTION_MISMATCH =
new QName(WSA_NS, "ActionMismatch", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:MessageAddressingHeaderRequired". */
- public static final QName SOAP_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED =
+ @Nonnull public static final QName SOAP_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED =
new QName(WSA_NS, "MessageAddressingHeaderRequired", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:DestinationUnreachable". */
- public static final QName SOAP_FAULT_DESTINATION_UNREACHABLE =
+ @Nonnull public static final QName SOAP_FAULT_DESTINATION_UNREACHABLE =
new QName(WSA_NS, "DestinationUnreachable", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:ActionNotSupported". */
- public static final QName SOAP_FAULT_ACTION_NOT_SUPPORTED =
+ @Nonnull public static final QName SOAP_FAULT_ACTION_NOT_SUPPORTED =
new QName(WSA_NS, "ActionNotSupported", WSA_PREFIX);
/** WS-Addressing SOAP fault code: "wsa:EndpointUnavailable". */
- public static final QName SOAP_FAULT_ENDPOINT_UNAVAILABLE =
+ @Nonnull public static final QName SOAP_FAULT_ENDPOINT_UNAVAILABLE =
new QName(WSA_NS, "EndpointUnavailable", WSA_PREFIX);
/** Set of all WS-Addressing SOAP fault codes. */
- public static final Set<QName> WS_ADDRESSING_FAULTS = Sets.<QName>newHashSet(
+ @Nonnull @NonnullElements public static final Set<QName> WS_ADDRESSING_FAULTS = Set.of(
SOAP_FAULT_INVALID_ADDRESSING_HEADER,
SOAP_FAULT_INVALID_ADDRESS,
SOAP_FAULT_INVALID_EPR,
@@ -102,9 +104,10 @@ public final class WSAddressingConstants {
// Fault Action URIs
/** WS-Addressing Action URI for messages carrying WS-Addressing Faults ONLY. */
- public static final String ACTION_URI_FAULT = "http://www.w3.org/2005/08/addressing/fault";
+ @Nonnull @NotEmpty public static final String ACTION_URI_FAULT = "http://www.w3.org/2005/08/addressing/fault";
/** WS-Addressing Action URI for messages carrying non-WS-Addressing Faults. */
+ @Nonnull @NotEmpty
public static final String ACTION_URI_SOAP_FAULT = "http://www.w3.org/2005/08/addressing/soap/fault";
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
index 4ece6564a..d431fc237 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
@@ -17,9 +17,7 @@
package org.opensaml.xmlsec.encryption.support;
-import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -38,7 +36,6 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
import org.opensaml.xmlsec.keyinfo.KeyInfoSupport;
import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
/**
* Abstract class implementation for {@link EncryptedKeyResolver}.
@@ -46,7 +43,7 @@ import com.google.common.collect.ImmutableSet;
public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolver {
/** Recipient attribute criteria against which to match.*/
- private final Collection<String> recipients;
+ private final Set<String> recipients;
/** Constructor. */
public AbstractEncryptedKeyResolver() {
@@ -59,7 +56,7 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
* @param newRecipents set of recipients
*/
public AbstractEncryptedKeyResolver(@Nullable final Set<String> newRecipents) {
- recipients = new HashSet<>(StringSupport.normalizeStringCollection(newRecipents));
+ recipients = Set.copyOf(StringSupport.normalizeStringCollection(newRecipents));
}
/**
@@ -79,7 +76,7 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
/** {@inheritDoc} */
@Override
@Nonnull @NonnullElements @Unmodifiable @NotLive public Set<String> getRecipients() {
- return ImmutableSet.copyOf(recipients);
+ return recipients;
}
/**
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
index 8afbcf48d..b1b9f5106 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
@@ -37,8 +37,7 @@ import org.opensaml.xmlsec.signature.Signature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
-
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -48,7 +47,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
public final class SignatureSupport {
/** Set of known canonicalization algorithm URIs. */
- private static final Set<String> C14N_ALGORITHMS = Sets.newHashSet(
+ @Nonnull @NonnullElements private static final Set<String> C14N_ALGORITHMS = Set.of(
SignatureConstants.ALGO_ID_C14N11_OMIT_COMMENTS,
SignatureConstants.ALGO_ID_C14N11_WITH_COMMENTS,
SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list