/*
 * Copyright 2018, TeamDev. All rights reserved.
 *
 * Redistribution and use in source and/or binary forms, with or without
 * modification, must retain the above copyright notice and the following
 * disclaimer.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package io.spine.server.stand;

import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableList;
import com.google.protobuf.Any;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import io.spine.client.EntityFilters;
import io.spine.client.Query;
import io.spine.client.Target;
import io.spine.protobuf.AnyPacker;
import io.spine.server.entity.Entity;
import io.spine.server.entity.RecordBasedRepository;

import java.util.Iterator;

/**
 * Processes the queries targeting {@link io.spine.server.entity.Entity Entity} objects.
 *
 * @author Alex Tymchenko
 */
class EntityQueryProcessor implements QueryProcessor {

    private final RecordBasedRepository<?, ? extends Entity, ? extends Message> repository;

    EntityQueryProcessor(RecordBasedRepository<?, ? extends Entity, ? extends Message> repository) {
        this.repository = repository;
    }

    @Override
    public ImmutableCollection<Any> process(Query query) {
        ImmutableList.Builder<Any> resultBuilder = ImmutableList.builder();

        Target target = query.getTarget();
        FieldMask fieldMask = query.getFieldMask();

        Iterator<? extends Entity> entities;
        if (target.getIncludeAll() && fieldMask.getPathsList()
                                               .isEmpty()) {
            entities = repository.loadAll();
        } else {
            EntityFilters filters = target.getFilters();
            entities = repository.find(filters, fieldMask);
        }
        while (entities.hasNext()) {
            Entity entity = entities.next();
            Message state = entity.getState();
            Any packedState = AnyPacker.pack(state);
            resultBuilder.add(packedState);
        }
        ImmutableList<Any> result = resultBuilder.build();
        return result;
    }
}

@@ -1500,16 +1500,144 @@
 rator;%0A%0A
+import static com.google.common.collect.ImmutableList.toImmutableList;%0Aimport static com.google.common.collect.Streams.stream;%0A%0A
 /**%0A * P
@@ -2126,85 +2126,8 @@
 ) %7B%0A
-        ImmutableList.Builder%3CAny%3E resultBuilder = ImmutableList.builder();%0A%0A
     
@@ -2251,16 +2251,22 @@
 s Entity
+%3C?, ?%3E
 %3E entiti
@@ -2594,125 +2594,90 @@
     
-while (entities.hasNext()) %7B%0A            Entity entity = entities.next();%0A            Message state = e
+ImmutableList%3CAny%3E result = stream(entities)%0A                .map(E
 ntity
-.
+::
 getState
 ();%0A
@@ -2672,19 +2672,17 @@
 getState
-();
+)
 %0A       
@@ -2690,26 +2690,17 @@
     
-Any packedState = 
+    .map(
 AnyP
@@ -2708,21 +2708,15 @@
 cker
-.
+::
 pack
-(state);
+)
 %0A   
@@ -2728,106 +2728,38 @@
     
-resultBuilder.add(packedState);%0A        %7D%0A        ImmutableList%3CAny%3E result = resultBuilder.build(
+    .collect(toImmutableList()
 );%0A 

Simplify query processor.