Replace StreamSupport.stream calls with Streams.stream

sidohaakma · Dec 19, 2018 · e05bc98 · e05bc98
1 parent faa01e5
commit e05bc98
Show file tree

Hide file tree

Showing 59 changed files with 172 additions and 224 deletions.
diff --git a/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l1/L1CacheRepositoryDecorator.java b/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l1/L1CacheRepositoryDecorator.java
@@ -13,6 +13,7 @@
 import static org.molgenis.data.RepositoryCapability.WRITABLE;
 
 import com.google.common.collect.Iterators;
+import com.google.common.collect.Streams;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -199,9 +200,7 @@ private void evictBiDiReferencedEntities(Entity entity) {
     Stream<EntityKey> backreffingEntities =
         getEntityType()
             .getMappedByAttributes()
-            .flatMap(
-                mappedByAttr ->
-                    stream(entity.getEntities(mappedByAttr.getName()).spliterator(), false))
+            .flatMap(mappedByAttr -> Streams.stream(entity.getEntities(mappedByAttr.getName())))
             .map(EntityKey::create);
     Stream<EntityKey> manyToOneEntities =
         getEntityType()

diff --git a/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l2/L2Cache.java b/molgenis-data-cache/src/main/java/org/molgenis/data/cache/l2/L2Cache.java
@@ -1,11 +1,11 @@
 package org.molgenis.data.cache.l2;
 
 import static com.google.common.collect.Maps.newConcurrentMap;
+import static com.google.common.collect.Streams.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.Optional.empty;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.stream.Collectors.toMap;
-import static java.util.stream.StreamSupport.stream;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.guava.CaffeinatedGuava;
@@ -197,7 +197,7 @@ public Optional<Map<String, Object>> load(@Nonnull Object id) {
        */
       @Override
       public Map<Object, Optional<Map<String, Object>>> loadAll(Iterable<?> ids) {
-        Stream<Object> typedIds = stream(ids.spliterator(), false).map(id -> id);
+        Stream<Object> typedIds = stream(ids).map(id -> id);
         Map<Object, Optional<Map<String, Object>>> result =
             repository.findAll(typedIds).collect(toMap(Entity::getIdValue, this::dehydrateEntity));
         for (Object key : ids) {

diff --git a/...asticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/MappingGenerator.java b/...asticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/MappingGenerator.java
@@ -1,8 +1,8 @@
 package org.molgenis.data.elasticsearch.generator;
 
+import static com.google.common.collect.Streams.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static java.util.stream.StreamSupport.stream;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -33,8 +33,7 @@ Mapping createMapping(EntityType entityType) {
   }
 
   private List<FieldMapping> createFieldMappings(EntityType entityType, int depth, int maxDepth) {
-    Stream<Attribute> attributeStream =
-        stream(entityType.getAtomicAttributes().spliterator(), false);
+    Stream<Attribute> attributeStream = stream(entityType.getAtomicAttributes());
     return attributeStream
         .map(attribute -> createFieldMapping(attribute, depth, maxDepth))
         .collect(toList());

diff --git a/...elasticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/QueryGenerator.java b/...elasticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/QueryGenerator.java
@@ -10,12 +10,12 @@
 import static org.molgenis.data.elasticsearch.FieldConstants.DEFAULT_ANALYZER;
 import static org.molgenis.data.elasticsearch.FieldConstants.FIELD_NOT_ANALYZED;
 
+import com.google.common.collect.Streams;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.StreamSupport;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.DisMaxQueryBuilder;
@@ -410,7 +410,7 @@ private QueryBuilder createQueryClauseIn(QueryRule queryRule, EntityType entityT
               + "]");
     }
     Object[] queryValues =
-        StreamSupport.stream(((Iterable<?>) queryRuleValue).spliterator(), false)
+        Streams.stream((Iterable<?>) queryRuleValue)
             .map(aQueryRuleValue -> getQueryValue(attr, aQueryRuleValue))
             .toArray();
 

diff --git a/...-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/SortGenerator.java b/...-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/generator/SortGenerator.java
@@ -1,8 +1,8 @@
 package org.molgenis.data.elasticsearch.generator;
 
+import static com.google.common.collect.Streams.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.elasticsearch.FieldConstants.FIELD_NOT_ANALYZED;
 
 import java.util.List;
@@ -27,7 +27,7 @@ class SortGenerator {
   }
 
   Sort generateSort(org.molgenis.data.Sort sort, EntityType entityType) {
-    Stream<org.molgenis.data.Sort.Order> orderStream = stream(sort.spliterator(), false);
+    Stream<org.molgenis.data.Sort.Order> orderStream = stream(sort);
     List<SortOrder> sortOrders =
         orderStream.map(order -> this.toSortOrder(order, entityType)).collect(toList());
     return Sort.create(sortOrders);

diff --git a/molgenis-data-icd10/src/main/java/org/molgenis/data/icd10/Icd10ClassExpanderImpl.java b/molgenis-data-icd10/src/main/java/org/molgenis/data/icd10/Icd10ClassExpanderImpl.java
@@ -2,10 +2,10 @@
 
 import static java.util.stream.Collectors.toList;
 
+import com.google.common.collect.Streams;
 import com.google.common.collect.TreeTraverser;
 import java.util.Collection;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 import javax.annotation.Nonnull;
 import org.molgenis.data.Entity;
 import org.springframework.stereotype.Component;
@@ -28,7 +28,7 @@ public Collection<Entity> expandClasses(Collection<Entity> diseaseClasses) {
   private Stream<Entity> expandClass(Entity diseaseClass) {
     Iterable<Entity> diseaseClasses =
         new DiseaseClassTreeTraverser().postOrderTraversal(diseaseClass);
-    return StreamSupport.stream(diseaseClasses.spliterator(), false);
+    return Streams.stream(diseaseClasses);
   }
 
   private DiseaseClass toDiseaseClass(Entity entity) {

diff --git a/molgenis-data-import/src/main/java/org/molgenis/data/importer/emx/EmxDataProvider.java b/molgenis-data-import/src/main/java/org/molgenis/data/importer/emx/EmxDataProvider.java
@@ -1,8 +1,8 @@
 package org.molgenis.data.importer.emx;
 
+import static com.google.common.collect.Streams.stream;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.EntityManager.CreationMode.POPULATE;
 import static org.molgenis.data.meta.model.Package.PACKAGE_SEPARATOR;
 
@@ -71,8 +71,7 @@ public Stream<Entity> getEntities(EntityType entityType) {
     if (repository == null) {
       throw new UnknownRepositoryException(entityType.getId());
     }
-    return stream(repository.spliterator(), false)
-        .map(sourceEntity -> toEntity(entityType, sourceEntity));
+    return stream(repository).map(sourceEntity -> toEntity(entityType, sourceEntity));
   }
 
   /**

diff --git a/molgenis-data-import/src/main/java/org/molgenis/data/importer/emx/EmxImportService.java b/molgenis-data-import/src/main/java/org/molgenis/data/importer/emx/EmxImportService.java
@@ -3,7 +3,6 @@
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newLinkedHashMap;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.StreamSupport.stream;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -142,7 +141,8 @@ public LinkedHashMap<String, Boolean> determineImportableEntities(
         parser.parse(repositoryCollection, selectedPackage).getEntityMap();
 
     LinkedHashMap<String, Boolean> importableEntitiesMap = newLinkedHashMap();
-    stream(entityTypeMap.keySet().spliterator(), false)
+    entityTypeMap
+        .keySet()
         .forEach(
             entityTypeId -> {
               boolean importable =

diff --git a/molgenis-data-index/src/main/java/org/molgenis/data/index/IndexDependencyModel.java b/molgenis-data-index/src/main/java/org/molgenis/data/index/IndexDependencyModel.java
@@ -1,8 +1,8 @@
 package org.molgenis.data.index;
 
 import static com.google.common.collect.Maps.uniqueIndex;
+import static com.google.common.collect.Streams.stream;
 import static java.util.Collections.emptySet;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.meta.model.AttributeMetadata.REF_ENTITY_TYPE;
 import static org.molgenis.data.meta.model.EntityTypeMetadata.ATTRIBUTES;
 import static org.molgenis.data.meta.model.EntityTypeMetadata.EXTENDS;
@@ -96,7 +96,7 @@ private boolean extendsFrom(EntityType candidateEntityType, String entityTypeId)
    */
   private boolean hasAttributeThatReferences(EntityType candidate, String entityTypeId) {
     Iterable<Attribute> attributes = candidate.getOwnAtomicAttributes();
-    return stream(attributes.spliterator(), false)
+    return stream(attributes)
         .map(Attribute::getRefEntity)
         .filter(Objects::nonNull)
         .map(EntityType::getId)

diff --git a/molgenis-data-index/src/main/java/org/molgenis/data/index/job/IndexStatus.java b/molgenis-data-index/src/main/java/org/molgenis/data/index/job/IndexStatus.java
@@ -1,7 +1,7 @@
 package org.molgenis.data.index.job;
 
+import static com.google.common.collect.Streams.stream;
 import static java.util.stream.Collectors.toSet;
-import static java.util.stream.StreamSupport.stream;
 
 import com.google.common.util.concurrent.AtomicLongMap;
 import java.util.Map;
@@ -78,7 +78,7 @@ private boolean isIndexStableIncludingReferences(EntityType emd) {
       return true;
     }
     Set<String> referencedEntityIds =
-        stream(emd.getAtomicAttributes().spliterator(), false)
+        stream(emd.getAtomicAttributes())
             .map(Attribute::getRefEntity)
             .filter(Objects::nonNull)
             .map(EntityType::getId)

diff --git a/...-data-platform/src/main/java/org/molgenis/data/meta/system/SystemEntityTypePersister.java b/...-data-platform/src/main/java/org/molgenis/data/meta/system/SystemEntityTypePersister.java
@@ -1,9 +1,9 @@
 package org.molgenis.data.meta.system;
 
+import static com.google.common.collect.Streams.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.meta.model.EntityTypeMetadata.ENTITY_TYPE_META_DATA;
 import static org.molgenis.data.meta.model.PackageMetadata.PACKAGE;
 
@@ -171,7 +171,7 @@ private void injectExistingEntityTypeAttributeIdentifiers(
             entityType.setId(existingEntityType.getId());
 
             Map<String, Attribute> existingAttrs =
-                stream(existingEntityType.getOwnAllAttributes().spliterator(), false)
+                stream(existingEntityType.getOwnAllAttributes())
                     .collect(toMap(Attribute::getName, Function.identity()));
             entityType
                 .getOwnAllAttributes()

diff --git a/...-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlQueryGenerator.java b/...-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlQueryGenerator.java
@@ -1,11 +1,11 @@
 package org.molgenis.data.postgresql;
 
+import static com.google.common.collect.Streams.stream;
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.IntStream.range;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.QueryRule.Operator.GREATER;
 import static org.molgenis.data.QueryRule.Operator.GREATER_EQUAL;
 import static org.molgenis.data.QueryRule.Operator.IN;
@@ -918,7 +918,7 @@ static <E extends Entity> String getSqlWhere(
             StringBuilder in = new StringBuilder();
             Attribute inAttr = attr;
             Stream<Object> postgreSqlIds =
-                stream(((Iterable<?>) inValue).spliterator(), false)
+                stream((Iterable<?>) inValue)
                     .map(idValue -> PostgreSqlUtils.getPostgreSqlQueryValue(idValue, inAttr));
             for (Iterator<Object> it = postgreSqlIds.iterator(); it.hasNext(); ) {
               Object postgreSqlId = it.next();

diff --git a/...enis-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlQueryUtils.java b/...enis-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlQueryUtils.java
@@ -1,11 +1,11 @@
 package org.molgenis.data.postgresql;
 
+import static com.google.common.collect.Streams.stream;
 import static org.molgenis.data.meta.AttributeType.ONE_TO_MANY;
 import static org.molgenis.data.util.EntityTypeUtils.isMultipleReferenceType;
 import static org.molgenis.util.ApplicationContextProvider.getApplicationContext;
 
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 import org.molgenis.data.DataService;
 import org.molgenis.data.meta.model.Attribute;
 import org.molgenis.data.meta.model.EntityType;
@@ -21,7 +21,7 @@ private PostgreSqlQueryUtils() {}
    * @return stream of persisted attributes
    */
   static Stream<Attribute> getPersistedAttributes(EntityType entityType) {
-    return StreamSupport.stream(entityType.getAtomicAttributes().spliterator(), false)
+    return stream(entityType.getAtomicAttributes())
         .filter(atomicAttr -> atomicAttr.getExpression() == null);
   }
 

diff --git a/...enis-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlRepository.java b/...enis-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlRepository.java
@@ -3,14 +3,14 @@
 import static com.google.common.base.Stopwatch.createStarted;
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
+import static com.google.common.collect.Streams.stream;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableSet;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.QueryRule.Operator.AND;
 import static org.molgenis.data.QueryRule.Operator.EQUALS;
 import static org.molgenis.data.QueryRule.Operator.GREATER;
@@ -188,7 +188,7 @@ public long count(Query<Entity> q) {
 
   @Override
   public Stream<Entity> findAll(Query<Entity> q) {
-    return stream(findAllBatching(q).spliterator(), false);
+    return stream(findAllBatching(q));
   }
 
   @Override

diff --git a/molgenis-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlUtils.java b/molgenis-data-postgresql/src/main/java/org/molgenis/data/postgresql/PostgreSqlUtils.java
@@ -1,9 +1,9 @@
 package org.molgenis.data.postgresql;
 
+import static com.google.common.collect.Streams.stream;
 import static java.lang.String.format;
 import static java.time.ZoneOffset.UTC;
 import static java.util.stream.Collectors.toList;
-import static java.util.stream.StreamSupport.stream;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -44,7 +44,7 @@ static Object getPostgreSqlValue(Entity entity, Attribute attr) {
       case MREF:
       case ONE_TO_MANY:
         Iterable<Entity> entities = entity.getEntities(attrName);
-        return stream(entities.spliterator(), false)
+        return stream(entities)
             .map(
                 mrefEntity ->
                     getPostgreSqlValue(mrefEntity, mrefEntity.getEntityType().getIdAttribute()))

diff --git a/molgenis-data-rest/src/main/java/org/molgenis/data/rest/service/RestService.java b/molgenis-data-rest/src/main/java/org/molgenis/data/rest/service/RestService.java
@@ -1,12 +1,12 @@
 package org.molgenis.data.rest.service;
 
+import static com.google.common.collect.Streams.stream;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
-import static java.util.stream.StreamSupport.stream;
 import static org.molgenis.data.EntityManager.CreationMode.POPULATE;
 import static org.molgenis.data.file.model.FileMetaMetaData.FILENAME;
 import static org.molgenis.data.file.model.FileMetaMetaData.FILE_META;
@@ -498,11 +498,11 @@ private void updateMappedByEntitiesOneToMany(
 
     // update ref entities of created/updated entity
     Attribute refAttr = attr.getMappedBy();
-    Stream<Entity> stream = stream(entity.getEntities(attr.getName()).spliterator(), false);
+    Stream<Entity> stream = stream(entity.getEntities(attr.getName()));
     if (existingEntity != null) {
       // filter out unchanged ref entities
       Set<Object> refEntityIds =
-          stream(existingEntity.getEntities(attr.getName()).spliterator(), false)
+          stream(existingEntity.getEntities(attr.getName()))
               .map(Entity::getIdValue)
               .collect(toSet());
       stream = stream.filter(refEntity -> !refEntityIds.contains(refEntity.getIdValue()));
@@ -529,11 +529,9 @@ private void updateMappedByEntitiesOneToMany(
     // update ref entities of existing entity
     if (existingEntity != null) {
       Set<Object> refEntityIds =
-          stream(entity.getEntities(attr.getName()).spliterator(), false)
-              .map(Entity::getIdValue)
-              .collect(toSet());
+          stream(entity.getEntities(attr.getName())).map(Entity::getIdValue).collect(toSet());
       List<Entity> updatedRefEntitiesExistingEntity =
-          stream(existingEntity.getEntities(attr.getName()).spliterator(), false)
+          stream(existingEntity.getEntities(attr.getName()))
               .filter(refEntity -> !refEntityIds.contains(refEntity.getIdValue()))
               .map(
                   refEntity -> {

diff --git a/...data-security/src/main/java/org/molgenis/data/security/auth/GroupRepositoryDecorator.java b/...data-security/src/main/java/org/molgenis/data/security/auth/GroupRepositoryDecorator.java
@@ -1,9 +1,9 @@
 package org.molgenis.data.security.auth;
 
+import static com.google.common.collect.Streams.stream;
 import static java.util.Objects.requireNonNull;
 
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 import org.molgenis.data.AbstractRepositoryDecorator;
 import org.molgenis.data.DataService;
 import org.molgenis.data.Repository;
@@ -53,7 +53,7 @@ private void deleteGroup(Object id) {
     Group group = dataService.findOneById(GroupMetadata.GROUP, id, Group.class);
     Iterable<Role> roles = group.getRoles();
     roles.forEach(this::removeMembers);
-    dataService.delete(RoleMetadata.ROLE, StreamSupport.stream(roles.spliterator(), false));
+    dataService.delete(RoleMetadata.ROLE, stream(roles));
     delegate().deleteById(id);
     mutableAclService.deleteAcl(new GroupIdentity(group.getName()), true);
   }