[java-opensaml] branch master updated: IDP-1516 - Reduce Guava dependence
Scott Cantor
cantor.2 at osu.edu
Mon Nov 4 12:45:20 EST 2019
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=2c6b6ca138e248a5ebdede452d57ce3f94e0ee74
The following commit(s) were added to refs/heads/master by this push:
new 2c6b6ca IDP-1516 - Reduce Guava dependence
2c6b6ca is described below
commit 2c6b6ca138e248a5ebdede452d57ce3f94e0ee74
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 4 12:45:18 2019 -0500
IDP-1516 - Reduce Guava dependence
https://issues.shibboleth.net/jira/browse/IDP-1516
Replace Optional and some collection creations.
---
.../impl/AbstractBatchMetadataResolver.java | 2 +-
.../impl/AbstractDynamicMetadataResolver.java | 4 ++--
.../resolver/index/impl/MetadataIndexManager.java | 8 +++-----
.../impl/AbstractDynamicMetadataResolverTest.java | 21 ++++++++++-----------
.../index/impl/MetadataIndexManagerTest.java | 12 +++++-------
.../impl/client/LoadClientStorageServices.java | 13 ++++++-------
6 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
index 246a34a..1368a9b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
@@ -21,6 +21,7 @@ import java.time.Instant;
import java.util.Collections;
import java.util.Iterator;
+import java.util.Optional;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -39,7 +40,6 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
index bf15cde..735c8fc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
@@ -65,7 +66,6 @@ import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.RatioGauge;
import com.codahale.metrics.Timer.Context;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
import com.google.common.base.Predicates;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
@@ -764,7 +764,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
return Collections.emptySet();
}
- Optional<Set<String>> indexedResult = null;
+ Optional<Set<String>> indexedResult = Optional.empty();
final Lock readLock = getBackingStore().getSecondaryIndexManager().getReadWriteLock().readLock();
try {
readLock.lock();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
index f902a45..e1ee77f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
@@ -20,6 +20,7 @@ package org.opensaml.saml.metadata.resolver.index.impl;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
@@ -33,9 +34,6 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableSet;
-
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -92,7 +90,7 @@ public class MetadataIndexManager<T> {
*/
@Nonnull @NonnullElements @Unmodifiable @NotLive
public Set<MetadataIndex> getIndexes() {
- return ImmutableSet.copyOf(indexes.keySet());
+ return Set.copyOf(indexes.keySet());
}
/**
@@ -151,7 +149,7 @@ public class MetadataIndexManager<T> {
// 2) no criteria was supplied applicable for any indexes
// (i.e. no MetadataIndexKeys were generated for any criteria)
// Returning absent here allows to distinguish these cases from the empty set case above.
- return Optional.absent();
+ return Optional.empty();
}
return Optional.of(items);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java
index 672b5c4..225bb0c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolverTest.java
@@ -24,8 +24,10 @@ import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.Timer;
import java.util.function.Function;
@@ -71,10 +73,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -411,7 +410,7 @@ public class AbstractDynamicMetadataResolverTest extends XMLObjectBaseTestCase {
Assert.assertTrue(sourceMap.isEmpty());
- for (String entityID : Lists.newArrayList(id1, id2, id3)) {
+ for (final String entityID : List.of(id1, id2, id3)) {
EntityDescriptor ed = resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(entityID)));
Assert.assertNotNull(ed);
Assert.assertEquals(ed.getEntityID(), entityID);
@@ -512,7 +511,7 @@ public class AbstractDynamicMetadataResolverTest extends XMLObjectBaseTestCase {
resolver.initialize();
DynamicEntityBackingStore backingStore = resolver.getBackingStore();
- Optional<Set<String>> indexedData = null;
+ Optional<Set<String>> indexedData = Optional.empty();
Assert.assertNull(resolver.resolveSingle(new CriteriaSet(new SimpleStringCriterion(id1.toUpperCase()))));
@@ -520,7 +519,7 @@ public class AbstractDynamicMetadataResolverTest extends XMLObjectBaseTestCase {
indexedData = backingStore.getSecondaryIndexManager().lookupIndexedItems(new CriteriaSet(new SimpleStringCriterion(id1.toUpperCase())));
Assert.assertTrue(indexedData.isPresent());
- Assert.assertEquals(indexedData.get(), Sets.newHashSet(id1));
+ Assert.assertEquals(indexedData.get(), Set.of(id1));
Assert.assertSame(resolver.resolveSingle(new CriteriaSet(new SimpleStringCriterion(id1.toUpperCase()))), ed1);
}
@@ -550,24 +549,24 @@ public class AbstractDynamicMetadataResolverTest extends XMLObjectBaseTestCase {
indexedData = backingStore.getSecondaryIndexManager().lookupIndexedItems(new CriteriaSet(new EntityRoleCriterion(SPSSODescriptor.DEFAULT_ELEMENT_NAME)));
Assert.assertTrue(indexedData.isPresent());
- Assert.assertEquals(indexedData.get(), Sets.newHashSet(id1));
+ Assert.assertEquals(indexedData.get(), Set.of(id1));
results.clear();
Iterables.addAll(results, resolver.resolve(new CriteriaSet(new EntityRoleCriterion(SPSSODescriptor.DEFAULT_ELEMENT_NAME))));
Assert.assertEquals(results.size(), 1);
- Assert.assertEquals(results, Sets.newHashSet(ed1));
+ Assert.assertEquals(results, Set.of(ed1));
Assert.assertSame(resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(id2))), ed2);
Assert.assertSame(resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(id3))), ed3);
indexedData = backingStore.getSecondaryIndexManager().lookupIndexedItems(new CriteriaSet(new EntityRoleCriterion(SPSSODescriptor.DEFAULT_ELEMENT_NAME)));
Assert.assertTrue(indexedData.isPresent());
- Assert.assertEquals(indexedData.get(), Sets.newHashSet(id1, id2));
+ Assert.assertEquals(indexedData.get(), Set.of(id1, id2));
results.clear();
Iterables.addAll(results, resolver.resolve(new CriteriaSet(new EntityRoleCriterion(SPSSODescriptor.DEFAULT_ELEMENT_NAME))));
Assert.assertEquals(results.size(), 2);
- Assert.assertEquals(results, Sets.newHashSet(ed1, ed2));
+ Assert.assertEquals(results, Set.of(ed1, ed2));
}
@Test
@@ -593,7 +592,7 @@ public class AbstractDynamicMetadataResolverTest extends XMLObjectBaseTestCase {
indexedData = backingStore.getSecondaryIndexManager().lookupIndexedItems(new CriteriaSet(new SimpleStringCriterion(id1.toUpperCase())));
Assert.assertTrue(indexedData.isPresent());
- Assert.assertEquals(indexedData.get(), Sets.newHashSet(id1));
+ Assert.assertEquals(indexedData.get(), Set.of(id1));
Assert.assertSame(resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(id1))), ed1);
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java
index 861b787..b6572f3 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManagerTest.java
@@ -18,6 +18,7 @@
package org.opensaml.saml.metadata.resolver.index.impl;
import java.util.Collections;
+import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
@@ -33,9 +34,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Optional;
-import com.google.common.collect.Sets;
-
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
@@ -275,7 +273,7 @@ public class MetadataIndexManagerTest extends XMLObjectBaseTestCase {
new SimpleStringCriteriaFunction());
MetadataIndexManager<EntityDescriptor> manager =
- new MetadataIndexManager<>(Sets.newHashSet(roleIndex, functionIndex), extractionFunction);
+ new MetadataIndexManager<>(Set.of(roleIndex, functionIndex), extractionFunction);
manager.indexEntityDescriptor(a);
manager.indexEntityDescriptor(b);
@@ -300,7 +298,7 @@ public class MetadataIndexManagerTest extends XMLObjectBaseTestCase {
new SimpleStringCriteriaFunction());
MetadataIndexManager<EntityDescriptor> manager =
- new MetadataIndexManager<>(Sets.newHashSet(roleIndex, functionIndex), extractionFunction);
+ new MetadataIndexManager<>(Set.of(roleIndex, functionIndex), extractionFunction);
manager.indexEntityDescriptor(a);
manager.indexEntityDescriptor(b);
@@ -323,7 +321,7 @@ public class MetadataIndexManagerTest extends XMLObjectBaseTestCase {
new SimpleStringCriteriaFunction());
MetadataIndexManager<EntityDescriptor> manager =
- new MetadataIndexManager<>(Sets.newHashSet(roleIndex, functionIndex), extractionFunction);
+ new MetadataIndexManager<>(Set.of(roleIndex, functionIndex), extractionFunction);
manager.indexEntityDescriptor(a);
manager.indexEntityDescriptor(b);
@@ -354,7 +352,7 @@ public class MetadataIndexManagerTest extends XMLObjectBaseTestCase {
@Test
public void testNoIndexes() {
MetadataIndexManager<EntityDescriptor> manager =
- new MetadataIndexManager<>(Sets.newHashSet(), extractionFunction);
+ new MetadataIndexManager<>(Collections.emptySet(), extractionFunction);
manager.indexEntityDescriptor(a);
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java
index bf1ddbc..07d7d79 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -37,9 +38,7 @@ import org.opensaml.storage.impl.client.ClientStorageService.ClientStorageSource
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -180,14 +179,14 @@ public class LoadClientStorageServices extends AbstractProfileAction {
private void loadFromCookie(@Nonnull final ClientStorageService storageService,
@Nonnull final ClientStorageSource source) {
- Optional<Cookie> cookie = Optional.absent();
+ Optional<Cookie> cookie = Optional.empty();
// Search for our cookie.
final Cookie[] cookies = getHttpServletRequest().getCookies();
if (cookies != null) {
- cookie = Iterables.tryFind(
- Arrays.asList(cookies),
- c -> c != null && c.getName().equals(storageService.getStorageName()));
+ cookie = Arrays.asList(cookies).stream().filter(
+ c -> c != null && c.getName().equals(storageService.getStorageName())
+ ).findFirst();
}
if (!cookie.isPresent() || Strings.isNullOrEmpty(cookie.get().getValue())) {
@@ -196,7 +195,7 @@ public class LoadClientStorageServices extends AbstractProfileAction {
storageService.load(null, source);
} else {
log.debug("{} Initializing StorageService '{}' from cookie", getLogPrefix(), storageService.getId());
- storageService.load(URISupport.doURLDecode(cookie.get().getValue()), source);
+ storageService.load(URISupport.doURLDecode(cookie.orElseThrow().getValue()), source);
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list