Skip to content

Commit 9d048fd

Browse files
committed
[CALCITE-4199] Add package-level NonNull annotations to calcite packages
1 parent 99fd162 commit 9d048fd

19 files changed

+133
-0
lines changed

core/src/main/java/org/apache/calcite/adapter/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,11 @@
3737
* </pre>
3838
* </blockquote>
3939
*/
40+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
41+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
42+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
4043
package org.apache.calcite.adapter;
44+
45+
import org.checkerframework.checker.nullness.qual.NonNull;
46+
import org.checkerframework.framework.qual.DefaultQualifier;
47+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/config/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Configuration.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.config;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/interpreter/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@
2222
* preparation time is less, and so the total prepare + execute time is
2323
* competitive for queries over small data sets.
2424
*/
25+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
26+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
27+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2528
package org.apache.calcite.interpreter;
29+
30+
import org.checkerframework.checker.nullness.qual.NonNull;
31+
import org.checkerframework.framework.qual.DefaultQualifier;
32+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/jdbc/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* JDBC driver for Calcite.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.jdbc;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/materialize/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,11 @@
3232
* instantiating materializations from the intermediate results of queries, and
3333
* recognize what materializations would be useful based on actual query load.
3434
*/
35+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
36+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
37+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
3538
package org.apache.calcite.materialize;
39+
40+
import org.checkerframework.checker.nullness.qual.NonNull;
41+
import org.checkerframework.framework.qual.DefaultQualifier;
42+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/model/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,11 @@
3333
* <p>There are several examples of schemas in the
3434
* <a href="https://calcite.apache.org/docs/tutorial.html">tutorial</a>.
3535
*/
36+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
37+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
38+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
3639
package org.apache.calcite.model;
40+
41+
import org.checkerframework.checker.nullness.qual.NonNull;
42+
import org.checkerframework.framework.qual.DefaultQualifier;
43+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/plan/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,11 @@
1919
* Defines interfaces for constructing rule-based optimizers of
2020
* relational expressions.
2121
*/
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
24+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2225
package org.apache.calcite.plan;
26+
27+
import org.checkerframework.checker.nullness.qual.NonNull;
28+
import org.checkerframework.framework.qual.DefaultQualifier;
29+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/prepare/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Preparation of queries (parsing, planning and implementation).
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.prepare;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/profile/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Utilities to analyze data sets.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.profile;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/rel/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@
3535
*
3636
* </ul>
3737
*/
38+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
39+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
40+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
3841
package org.apache.calcite.rel;
42+
43+
import org.checkerframework.checker.nullness.qual.NonNull;
44+
import org.checkerframework.framework.qual.DefaultQualifier;
45+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/rex/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,11 @@
7979
*
8080
* </ul>
8181
*/
82+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
83+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
84+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
8285
package org.apache.calcite.rex;
86+
87+
import org.checkerframework.checker.nullness.qual.NonNull;
88+
import org.checkerframework.framework.qual.DefaultQualifier;
89+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/runtime/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Utilities required at runtime.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.runtime;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/schema/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@
2222
* SQL validator to validate SQL abstract syntax trees and resolve
2323
* identifiers to objects.
2424
*/
25+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
26+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
27+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2528
package org.apache.calcite.schema;
29+
30+
import org.checkerframework.checker.nullness.qual.NonNull;
31+
import org.checkerframework.framework.qual.DefaultQualifier;
32+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/server/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Provides a server for hosting Calcite connections.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.server;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/sql/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,11 @@
9191
* {@link org.apache.calcite.sql.SqlNode}s into a SQL string. A
9292
* {@link org.apache.calcite.sql.SqlDialect} defines how this happens.</p>
9393
*/
94+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
95+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
96+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
9497
package org.apache.calcite.sql;
98+
99+
import org.checkerframework.checker.nullness.qual.NonNull;
100+
import org.checkerframework.framework.qual.DefaultQualifier;
101+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/sql2rel/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Translates a SQL parse tree to relational expression.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.sql2rel;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/statistic/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,11 @@
2020
*
2121
* @see org.apache.calcite.materialize.SqlStatisticProvider
2222
*/
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
24+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
25+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2326
package org.apache.calcite.statistic;
27+
28+
import org.checkerframework.checker.nullness.qual.NonNull;
29+
import org.checkerframework.framework.qual.DefaultQualifier;
30+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/tools/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Provides utility classes.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.tools;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

core/src/main/java/org/apache/calcite/util/package-info.java

+7
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818
/**
1919
* Provides utility classes.
2020
*/
21+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD)
22+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER)
23+
@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN)
2124
package org.apache.calcite.util;
25+
26+
import org.checkerframework.checker.nullness.qual.NonNull;
27+
import org.checkerframework.framework.qual.DefaultQualifier;
28+
import org.checkerframework.framework.qual.TypeUseLocation;

0 commit comments

Comments
 (0)