|
|
@ -20,6 +20,7 @@ import com.google.common.base.Function; |
|
|
import com.google.common.util.concurrent.FutureCallback; |
|
|
import com.google.common.util.concurrent.FutureCallback; |
|
|
import com.google.common.util.concurrent.Futures; |
|
|
import com.google.common.util.concurrent.Futures; |
|
|
import com.google.common.util.concurrent.ListenableFuture; |
|
|
import com.google.common.util.concurrent.ListenableFuture; |
|
|
|
|
|
import com.google.common.util.concurrent.MoreExecutors; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.cache.Cache; |
|
|
import org.springframework.cache.Cache; |
|
|
@ -311,7 +312,7 @@ public class BaseEdgeService extends AbstractEntityService implements EdgeServic |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return Futures.successfulAsList(futures); |
|
|
return Futures.successfulAsList(futures); |
|
|
}); |
|
|
}, MoreExecutors.directExecutor()); |
|
|
|
|
|
|
|
|
edges = Futures.transform(edges, new Function<List<Edge>, List<Edge>>() { |
|
|
edges = Futures.transform(edges, new Function<List<Edge>, List<Edge>>() { |
|
|
@Nullable |
|
|
@Nullable |
|
|
@ -319,7 +320,7 @@ public class BaseEdgeService extends AbstractEntityService implements EdgeServic |
|
|
public List<Edge> apply(@Nullable List<Edge> edgeList) { |
|
|
public List<Edge> apply(@Nullable List<Edge> edgeList) { |
|
|
return edgeList == null ? Collections.emptyList() : edgeList.stream().filter(edge -> query.getEdgeTypes().contains(edge.getType())).collect(Collectors.toList()); |
|
|
return edgeList == null ? Collections.emptyList() : edgeList.stream().filter(edge -> query.getEdgeTypes().contains(edge.getType())).collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}, MoreExecutors.directExecutor()); |
|
|
|
|
|
|
|
|
return edges; |
|
|
return edges; |
|
|
} |
|
|
} |
|
|
@ -333,7 +334,7 @@ public class BaseEdgeService extends AbstractEntityService implements EdgeServic |
|
|
edgeTypes -> { |
|
|
edgeTypes -> { |
|
|
edgeTypes.sort(Comparator.comparing(EntitySubtype::getType)); |
|
|
edgeTypes.sort(Comparator.comparing(EntitySubtype::getType)); |
|
|
return edgeTypes; |
|
|
return edgeTypes; |
|
|
}); |
|
|
}, MoreExecutors.directExecutor()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
|