Skip to content

Commit 0544497

Browse files
committed
Merge branch 'jspecify_query_light' into 'master'
add minimal jspecify-annotation to Query search methods See merge request exedio/cope!1927
2 parents 3ed0856 + f01a3a5 commit 0544497

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

runtime/src/com/exedio/cope/Query.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import java.util.Collection;
3535
import java.util.Collections;
3636
import java.util.List;
37+
import org.jspecify.annotations.NonNull;
38+
import org.jspecify.annotations.Nullable;
3739

3840
public final class Query<R> implements Serializable
3941
{
@@ -755,7 +757,7 @@ public void setSearchSizeCacheLimit(final int searchSizeCacheLimit)
755757
* result in an {@code UnsupportedOperationException}.
756758
* @see SchemaInfo#search(Query)
757759
*/
758-
public List<R> search()
760+
public @NonNull List<R> search()
759761
{
760762
final Transaction transaction = model.currentTransaction();
761763

@@ -851,7 +853,7 @@ TC check()
851853
* This method does it's best to avoid issuing two queries
852854
* for searching and totaling.
853855
*/
854-
public Result<R> searchAndTotal()
856+
public @NonNull Result<R> searchAndTotal()
855857
{
856858
return new Result<>(this);
857859
}
@@ -1026,7 +1028,7 @@ public int getLimit()
10261028
* @see #searchSingletonStrict()
10271029
* @see Type#searchSingleton(Condition)
10281030
*/
1029-
public R searchSingleton()
1031+
public @Nullable R searchSingleton()
10301032
{
10311033
// this is the most efficient implementation for
10321034
// array-backed lists returned by #search()
@@ -1055,7 +1057,7 @@ public R searchSingleton()
10551057
* @see #searchSingleton()
10561058
* @see Type#searchSingletonStrict(Condition)
10571059
*/
1058-
public R searchSingletonStrict()
1060+
public @NonNull R searchSingletonStrict()
10591061
{
10601062
// this is the most efficient implementation for
10611063
// array-backed lists returned by #search()

0 commit comments

Comments
 (0)