core: assertNonNull -> requireNonNull

apache · Oct 12, 2020 · 7d80985 · 7d80985
1 parent db9e969
commit 7d80985
Show file tree

Hide file tree

Showing 38 changed files with 170 additions and 153 deletions.
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcSchema.java
@@ -60,12 +60,11 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiFunction;
 import javax.sql.DataSource;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Implementation of {@link Schema} that is backed by a JDBC data source.
@@ -106,8 +105,8 @@ public JdbcSchema(DataSource dataSource, SqlDialect dialect,
   private JdbcSchema(DataSource dataSource, SqlDialect dialect,
       JdbcConvention convention, @Nullable String catalog, @Nullable String schema,
       @Nullable ImmutableMap<String, JdbcTable> tableMap) {
-    this.dataSource = Objects.requireNonNull(dataSource);
-    this.dialect = Objects.requireNonNull(dialect);
+    this.dataSource = requireNonNull(dataSource, "dataSource");
+    this.dialect = requireNonNull(dialect, "dialect");
     this.convention = convention;
     this.catalog = catalog;
     this.schema = schema;
@@ -381,7 +380,7 @@ RelProtoDataType getRelDataType(DatabaseMetaData metaData, String catalogName,
         new SqlTypeFactoryImpl(RelDataTypeSystem.DEFAULT);
     final RelDataTypeFactory.Builder fieldInfo = typeFactory.builder();
     while (resultSet.next()) {
-      final String columnName = assertNonNull(resultSet.getString(4), "columnName");
+      final String columnName = requireNonNull(resultSet.getString(4), "columnName");
       final int dataType = resultSet.getInt(5);
       final String typeString = resultSet.getString(6);
       final int precision;

diff --git a/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/CachingCalciteSchema.java
@@ -251,7 +251,8 @@ private CachingCalciteSchema(@Nullable CalciteSchema parent, Schema schema,
     return null;
   }
 
-  @Override protected CalciteSchema snapshot(@Nullable CalciteSchema parent, SchemaVersion version) {
+  @Override protected CalciteSchema snapshot(@Nullable CalciteSchema parent,
+      SchemaVersion version) {
     CalciteSchema snapshot = new CachingCalciteSchema(parent,
         schema.snapshot(version), name, null, tableMap, latticeMap, typeMap,
         functionMap, functionNames, nullaryFunctionMap, getPath());

diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java b/core/src/main/java/org/apache/calcite/jdbc/CalcitePrepare.java
@@ -60,9 +60,10 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * API for a service that prepares statements for execution.
  */
@@ -177,7 +178,9 @@ private static SparkHandler createHandler() {
         final Class<?> clazz =
             Class.forName("org.apache.calcite.adapter.spark.SparkHandlerImpl");
         Method method = clazz.getMethod("instance");
-        return (CalcitePrepare.SparkHandler) assertNonNull(method.invoke(null));
+        return (CalcitePrepare.SparkHandler) requireNonNull(
+            method.invoke(null),
+            () -> "non-null SparkHandler expected from " + method);
       } catch (ClassNotFoundException e) {
         return new TrivialSparkHandler();
       } catch (IllegalAccessException

diff --git a/core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java
@@ -176,7 +176,8 @@ private SimpleCalciteSchema(@Nullable CalciteSchema parent,
     return null;
   }
 
-  @Override protected CalciteSchema snapshot(@Nullable CalciteSchema parent, SchemaVersion version) {
+  @Override protected CalciteSchema snapshot(@Nullable CalciteSchema parent,
+      SchemaVersion version) {
     CalciteSchema snapshot = new SimpleCalciteSchema(parent,
         schema.snapshot(version), name, null, tableMap, latticeMap, typeMap,
         functionMap, functionNames, nullaryFunctionMap, getPath());

diff --git a/core/src/main/java/org/apache/calcite/materialize/Lattice.java b/core/src/main/java/org/apache/calcite/materialize/Lattice.java
@@ -86,9 +86,10 @@
 import java.util.function.IntFunction;
 import java.util.stream.Collectors;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Structure that allows materialized views based upon a star schema to be
  * recognized and recommended.
@@ -113,13 +114,13 @@ private Lattice(CalciteSchema rootSchema, LatticeRootNode rootNode,
       ImmutableSortedSet<Measure> defaultMeasures, ImmutableList<Tile> tiles,
       ImmutableListMultimap<Integer, Boolean> columnUses) {
     this.rootSchema = rootSchema;
-    this.rootNode = Objects.requireNonNull(rootNode);
-    this.columns = Objects.requireNonNull(columns);
+    this.rootNode = requireNonNull(rootNode);
+    this.columns = requireNonNull(columns);
     this.auto = auto;
     this.algorithm = algorithm;
     this.algorithmMaxMillis = algorithmMaxMillis;
     this.defaultMeasures = defaultMeasures.asList(); // unique and sorted
-    this.tiles = Objects.requireNonNull(tiles);
+    this.tiles = requireNonNull(tiles);
     this.columnUses = columnUses;
 
     assert isValid(Litmus.THROW);
@@ -133,7 +134,7 @@ private Lattice(CalciteSchema rootSchema, LatticeRootNode rootNode,
     this.rowCountEstimate = rowCountEstimate;
     @SuppressWarnings("argument.type.incompatible")
     LatticeStatisticProvider statisticProvider =
-        Objects.requireNonNull(statisticProviderFactory.apply(this));
+        requireNonNull(statisticProviderFactory.apply(this));
     this.statisticProvider = statisticProvider;
   }
 
@@ -387,7 +388,7 @@ public StarTable createStarTable() {
     final List<Table> tables = new ArrayList<>();
     for (LatticeNode node : rootNode.descendants) {
       tables.add(
-          assertNonNull(
+          requireNonNull(
               node.table.t.unwrap(Table.class),
               () -> "can't get table for " + node.table.t));
     }
@@ -562,7 +563,7 @@ public static class Measure implements Comparable<Measure> {
 
     public Measure(SqlAggFunction agg, boolean distinct, @Nullable String name,
         Iterable<Column> args) {
-      this.agg = Objects.requireNonNull(agg);
+      this.agg = requireNonNull(agg);
       this.distinct = distinct;
       this.name = name;
       this.args = ImmutableList.copyOf(args);
@@ -658,7 +659,7 @@ public abstract static class Column implements Comparable<Column> {
 
     private Column(int ordinal, String alias) {
       this.ordinal = ordinal;
-      this.alias = Objects.requireNonNull(alias);
+      this.alias = requireNonNull(alias);
     }
 
     /** Converts a list of columns to a bit set of their ordinals. */
@@ -703,8 +704,8 @@ public static class BaseColumn extends Column {
 
     private BaseColumn(int ordinal, String table, String column, String alias) {
       super(ordinal, alias);
-      this.table = Objects.requireNonNull(table);
-      this.column = Objects.requireNonNull(column);
+      this.table = requireNonNull(table);
+      this.column = requireNonNull(column);
     }
 
     @Override public String toString() {
@@ -799,7 +800,7 @@ public static class Builder {
         new LinkedHashMap<>();
 
     public Builder(LatticeSpace space, CalciteSchema schema, String sql) {
-      this.rootSchema = Objects.requireNonNull(schema.root());
+      this.rootSchema = requireNonNull(schema.root());
       Preconditions.checkArgument(rootSchema.isRoot(), "must be root schema");
       CalcitePrepare.ConvertResult parsed =
           Schemas.convert(MaterializedViewTable.MATERIALIZATION_CONNECTION,
@@ -1149,8 +1150,8 @@ public static class Tile {
 
     public Tile(ImmutableList<Measure> measures,
         ImmutableList<Column> dimensions) {
-      this.measures = Objects.requireNonNull(measures);
-      this.dimensions = Objects.requireNonNull(dimensions);
+      this.measures = requireNonNull(measures);
+      this.dimensions = requireNonNull(dimensions);
       assert Ordering.natural().isStrictlyOrdered(dimensions);
       assert Ordering.natural().isStrictlyOrdered(measures);
       bitSet = Column.toBitSet(dimensions);

diff --git a/core/src/main/java/org/apache/calcite/materialize/LatticeNode.java b/core/src/main/java/org/apache/calcite/materialize/LatticeNode.java
@@ -26,9 +26,8 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.List;
-import java.util.Objects;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
+import static java.util.Objects.requireNonNull;
 
 /** Source relation of a lattice.
  *
@@ -48,7 +47,7 @@ public abstract class LatticeNode {
    * <p>The {@code parent} and {@code mutableNode} arguments are used only
    * during construction. */
   LatticeNode(LatticeSpace space, @Nullable LatticeNode parent, MutableNode mutableNode) {
-    this.table = Objects.requireNonNull(mutableNode.table);
+    this.table = requireNonNull(mutableNode.table);
     this.startCol = mutableNode.startCol;
     this.endCol = mutableNode.endCol;
     this.alias = mutableNode.alias;
@@ -60,7 +59,7 @@ public abstract class LatticeNode {
     if (parent != null) {
       sb.append(':');
       int i = 0;
-      for (IntPair p : assertNonNull(mutableNode.step, "mutableNode.step").keys) {
+      for (IntPair p : requireNonNull(mutableNode.step, "mutableNode.step").keys) {
         if (i++ > 0) {
           sb.append(",");
         }

diff --git a/core/src/main/java/org/apache/calcite/plan/hep/HepPlanner.java b/core/src/main/java/org/apache/calcite/plan/hep/HepPlanner.java
@@ -53,9 +53,9 @@
 
 import com.google.common.collect.ImmutableList;
 
-import java.util.ArrayDeque;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;

diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java b/core/src/main/java/org/apache/calcite/plan/volcano/RelSet.java
@@ -45,9 +45,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A <code>RelSet</code> is an equivalence-set of expressions; that is, a set of
  * expressions which have identical semantics. We are generally interested in
@@ -247,7 +248,7 @@ void addConverters(RelSubset subset, boolean required,
           enforcer = new AbstractConverter(
               cluster, from, null, to.getTraitSet());
         } else {
-          Convention convention = assertNonNull(
+          Convention convention = requireNonNull(
               subset.getConvention(),
               () -> "convention is null for " + subset);
           enforcer = convention.enforce(from, to.getTraitSet());

diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java b/core/src/main/java/org/apache/calcite/plan/volcano/RelSubset.java
@@ -62,9 +62,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Subset of an equivalence class where all relational expressions have the
  * same physical properties.
@@ -447,7 +448,7 @@ void propagateCostImprovements0(VolcanoPlanner planner, RelMetadataQuery mq,
           // removes parent cached metadata since its input was changed
           mq.clearCache(parent);
           final RelSubset parentSubset =
-              assertNonNull(planner.getSubset(parent), "subset not found for " + parent);
+              requireNonNull(planner.getSubset(parent), "subset not found for " + parent);
 
           // parent subset will clear its cache in propagateCostImprovements0 method itself
           for (RelSubset subset : parentSubset.set.subsets) {

diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/TopDownRuleDriver.java b/core/src/main/java/org/apache/calcite/plan/volcano/TopDownRuleDriver.java
@@ -36,7 +36,7 @@
 import java.util.Stack;
 import java.util.function.Predicate;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A rule driver that apply rules in a Top-Down manner.
@@ -165,7 +165,7 @@ private void clearProcessed(RelSet set) {
         Collection<RelNode> parentRels = subset.getParentRels();
         for (RelNode parentRel : parentRels) {
           RelSet parentRelSet =
-              assertNonNull(planner.getSet(parentRel), () -> "no set found for " + parentRel);
+              requireNonNull(planner.getSet(parentRel), () -> "no set found for " + parentRel);
           clearProcessed(parentRelSet);
         }
         if (subset == planner.root) {

diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/TopDownRuleQueue.java b/core/src/main/java/org/apache/calcite/plan/volcano/TopDownRuleQueue.java
@@ -19,10 +19,10 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.util.Pair;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;

diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
@@ -84,9 +84,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * VolcanoPlanner optimizes queries by transforming expressions selectively
  * according to a dynamic programming algorithm.
@@ -763,7 +764,7 @@ public void setNoneConventionHasInfiniteCost(boolean infinite) {
    */
   @API(since = "1.26", status = API.Status.EXPERIMENTAL)
   public RelSubset getSubsetNonNull(RelNode rel) {
-    return assertNonNull(getSubset(rel), () -> "Subset is not found for " + rel);
+    return requireNonNull(getSubset(rel), () -> "Subset is not found for " + rel);
   }
 
   public @Nullable RelSubset getSubset(RelNode rel, RelTraitSet traits) {

diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleCall.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoRuleCall.java
@@ -41,9 +41,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * <code>VolcanoRuleCall</code> implements the {@link RelOptRuleCall} interface
  * for VolcanoPlanner.
@@ -313,7 +314,7 @@ private void matchRecurse(int solve) {
         final RelSubset subset = volcanoPlanner.getSubsetNonNull(previous);
         successors = subset.getParentRels();
       } else {
-        parentOperand = assertNonNull(
+        parentOperand = requireNonNull(
             operand.getParent(),
             () -> "operand.getParent() for " + operand);
         final RelNode parentRel = rels[parentOperand.ordinalInRule];

diff --git a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
@@ -52,7 +52,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.apache.calcite.linq4j.Nullness.assertNonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Base class for every relational expression ({@link RelNode}).
@@ -453,7 +453,7 @@ private class InnerRelDigest implements RelDigest {
     @Override public String toString() {
       RelDigestWriter rdw = new RelDigestWriter();
       explain(rdw);
-      return assertNonNull(rdw.digest);
+      return requireNonNull(rdw.digest, "digest");
     }
   }