[spring-extensions] branch master updated: Clean unnecessary Guava usage.
Scott Cantor
cantor.2 at osu.edu
Thu Oct 24 19:10:44 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository spring-extensions.
View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=f9220c422f5a5d8fe3e4be2ead36482b9ec85638
The following commit(s) were added to refs/heads/master by this push:
new f9220c4 Clean unnecessary Guava usage.
f9220c4 is described below
commit f9220c422f5a5d8fe3e4be2ead36482b9ec85638
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 24 19:10:42 2019 -0400
Clean unnecessary Guava usage.
---
.../spring/service/ReloadableSpringService.java | 14 +++++---------
.../ext/spring/util/ApplicationContextBuilder.java | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java b/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
index fdad286..02e1cd3 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
@@ -19,7 +19,6 @@ package net.shibboleth.ext.spring.service;
import java.io.IOException;
import java.time.Instant;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -54,10 +53,6 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.io.Resource;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
/**
* This class provides a reloading interface to a {@link ServiceableComponent} via Spring.
@@ -183,8 +178,7 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
- serviceConfigurations =
- ImmutableList.<Resource> builder().addAll(Iterables.filter(configs, Predicates.notNull())).build();
+ serviceConfigurations = List.copyOf(Constraint.isNotNull(configs, "Service configurations cannot be null"));
if (!serviceConfigurations.isEmpty()) {
resourceLastModifiedTimes = new Instant[serviceConfigurations.size()];
@@ -228,8 +222,9 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
@Nonnull @NonnullElements final List<BeanFactoryPostProcessor> processors) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+ Constraint.isNotNull(processors, "BeanFactoryPostProcessor collection cannot be null");
- factoryPostProcessors = new ArrayList<>(Collections2.filter(processors, Predicates.notNull()));
+ factoryPostProcessors = List.copyOf(processors);
}
/**
@@ -240,8 +235,9 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
public void setBeanPostProcessors(@Nonnull @NonnullElements final List<BeanPostProcessor> processors) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+ Constraint.isNotNull(processors, "BeanPostProcessor collection cannot be null");
- postProcessors = new ArrayList<>(Collections2.filter(processors, Predicates.notNull()));
+ postProcessors = List.copyOf(processors);
}
/**
diff --git a/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java b/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
index 49c7851..6e055cd 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
@@ -17,7 +17,6 @@
package net.shibboleth.ext.spring.util;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -53,9 +52,6 @@ import org.springframework.core.convert.ConversionService;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.Resource;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-
/**
* Fluent builder for a {@link FilesystemGenericApplicationContext} equipped with various standard features,
* behavior, converters, etc. that are applicable to the Shibboleth software components.
@@ -143,7 +139,7 @@ public class ApplicationContextBuilder {
*/
@Nonnull public ApplicationContextBuilder setServiceConfigurations(
@Nonnull @NonnullElements final Collection<Resource> configs) {
- configurationResources = new ArrayList<>(Collections2.filter(configs, Predicates.notNull()));
+ configurationResources = List.copyOf(Constraint.isNotNull(configs, "Service configurations cannot be null"));
return this;
}
@@ -157,7 +153,7 @@ public class ApplicationContextBuilder {
*/
@Nonnull public ApplicationContextBuilder setPropertySources(
@Nonnull @NonnullElements final List<PropertySource<?>> sources) {
- propertySources = new ArrayList<>(Collections2.filter(sources, Predicates.notNull()));
+ propertySources = List.copyOf(Constraint.isNotNull(sources, "Property sources cannot be null"));
return this;
}
@@ -191,7 +187,7 @@ public class ApplicationContextBuilder {
@Nonnull public ApplicationContextBuilder setContextInitializers(
@Nonnull @NonnullElements
final List<ApplicationContextInitializer<? super FilesystemGenericApplicationContext>> initializers) {
- contextInitializers = new ArrayList<>(Collections2.filter(initializers, Predicates.notNull()));
+ contextInitializers = List.copyOf(Constraint.isNotNull(initializers, "Context initializers cannot be null"));
return this;
}
@@ -221,8 +217,10 @@ public class ApplicationContextBuilder {
* @return this builder
*/
@Nonnull public ApplicationContextBuilder setBeanFactoryPostProcessors(
- @Nonnull @NonnullElements final List<BeanFactoryPostProcessor> processors) {
- factoryPostProcessors = new ArrayList<>(Collections2.filter(processors, Predicates.notNull()));
+ @Nonnull @NonnullElements final List<BeanFactoryPostProcessor> processors) {
+ Constraint.isNotNull(processors, "BeanFactoryPostProcessor collection cannot be null");
+
+ factoryPostProcessors = List.copyOf(processors);
return this;
}
@@ -250,8 +248,10 @@ public class ApplicationContextBuilder {
* @return this builder
*/
@Nonnull public ApplicationContextBuilder setBeanPostProcessors(
- @Nonnull @NonnullElements final List<BeanPostProcessor> processors) {
- postProcessors = new ArrayList<>(Collections2.filter(processors, Predicates.notNull()));
+ @Nonnull @NonnullElements final List<BeanPostProcessor> processors) {
+ Constraint.isNotNull(processors, "BeanPostProcessor collection cannot be null");
+
+ postProcessors = List.copyOf(processors);
return this;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list