You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/12/16 21:25:43 UTC
svn commit: r1774663 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas:
FSIterator.java impl/AllFSs.java impl/BinaryCasSerDes6.java
Author: schor
Date: Fri Dec 16 21:25:43 2016
New Revision: 1774663
URL: http://svn.apache.org/viewvc?rev=1774663&view=rev
Log:
no Jira - rename asStream to stream to follow normal conventions, for FSIterator
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java?rev=1774663&r1=1774662&r2=1774663&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FSIterator.java Fri Dec 16 21:25:43 2016
@@ -260,7 +260,7 @@ public interface FSIterator<T extends Fe
Spliterator.SUBSIZED);
}
- default Stream<T> asStream() {
+ default Stream<T> stream() {
return StreamSupport.stream(spliterator(), false);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java?rev=1774663&r1=1774662&r2=1774663&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java Fri Dec 16 21:25:43 2016
@@ -89,7 +89,7 @@ class AllFSs {
void getAllIndexedFSsAllViews() {
cas.forAllSofas(sofa -> enqueueFS(sofa));
cas.forAllViews(view ->
- getFSsForView(view.indexRepository.<TOP>getAllIndexedFS(cas.getTypeSystemImpl().topType).asStream()));
+ getFSsForView(view.indexRepository.<TOP>getAllIndexedFS(cas.getTypeSystemImpl().topType).stream()));
for (int i = 0; i < toBeScanned.size(); i++) {
enqueueFeatures(toBeScanned.get(i));
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1774663&r1=1774662&r2=1774663&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java Fri Dec 16 21:25:43 2016
@@ -2845,7 +2845,7 @@ public class BinaryCasSerDes6 implements
processFSsForView(true, // is enqueue
isSerializingDelta
? view.indexRepository.getAddedFSs().stream()
- : view.indexRepository.<TOP>getAllIndexedFS(topType).asStream());
+ : view.indexRepository.<TOP>getAllIndexedFS(topType).stream());
if (isSerializingDelta) {
// for write/delta, write out (but don't enqueue) the deleted/reindexed FSs
processFSsForView(false, view.indexRepository.getDeletedFSs().stream());