This is an automated email from the ASF dual-hosted git repository. jhyde pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 6b750b8e9b44e644d9073d908c384307b4aa7e2c Author: Ran Tao <[email protected]> AuthorDate: Tue Aug 8 23:29:15 2023 +0800 [CALCITE-5908] Refactor: Remove unnecessary null checks in CalciteSchema Add static import for Objects.requireNonNull. Close apache/calcite#3358 --- .../org/apache/calcite/jdbc/CalciteSchema.java | 38 ++++++++-------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java index b1218c1e4f..236b4989d8 100644 --- a/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java +++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteSchema.java @@ -49,10 +49,11 @@ import java.util.List; import java.util.Map; import java.util.NavigableMap; import java.util.NavigableSet; -import java.util.Objects; import java.util.Set; import javax.sql.DataSource; +import static java.util.Objects.requireNonNull; + /** * Schema. * @@ -87,21 +88,9 @@ public abstract class CalciteSchema { this.parent = parent; this.schema = schema; this.name = name; - if (tableMap == null) { - this.tableMap = new NameMap<>(); - } else { - this.tableMap = Objects.requireNonNull(tableMap, "tableMap"); - } - if (latticeMap == null) { - this.latticeMap = new NameMap<>(); - } else { - this.latticeMap = Objects.requireNonNull(latticeMap, "latticeMap"); - } - if (subSchemaMap == null) { - this.subSchemaMap = new NameMap<>(); - } else { - this.subSchemaMap = Objects.requireNonNull(subSchemaMap, "subSchemaMap"); - } + this.tableMap = tableMap != null ? tableMap : new NameMap<>(); + this.latticeMap = latticeMap != null ? latticeMap : new NameMap<>(); + this.subSchemaMap = subSchemaMap != null ? subSchemaMap : new NameMap<>(); if (functionMap == null) { this.functionMap = new NameMultimap<>(); this.functionNames = new NameSet(); @@ -109,14 +98,15 @@ public abstract class CalciteSchema { } else { // If you specify functionMap, you must also specify functionNames and // nullaryFunctionMap. - this.functionMap = Objects.requireNonNull(functionMap, "functionMap"); - this.functionNames = Objects.requireNonNull(functionNames, "functionNames"); - this.nullaryFunctionMap = Objects.requireNonNull(nullaryFunctionMap, "nullaryFunctionMap"); + this.functionMap = functionMap; + this.functionNames = requireNonNull(functionNames, "functionNames"); + this.nullaryFunctionMap = + requireNonNull(nullaryFunctionMap, "nullaryFunctionMap"); } if (typeMap == null) { this.typeMap = new NameMap<>(); } else { - this.typeMap = Objects.requireNonNull(typeMap, "typeMap"); + this.typeMap = typeMap; } this.path = path; } @@ -570,8 +560,8 @@ public abstract class CalciteSchema { public final String name; protected Entry(CalciteSchema schema, String name) { - this.schema = Objects.requireNonNull(schema, "schema"); - this.name = Objects.requireNonNull(name, "name"); + this.schema = requireNonNull(schema, "schema"); + this.name = requireNonNull(name, "name"); } /** Returns this object's path. For example ["hr", "emps"]. */ @@ -587,7 +577,7 @@ public abstract class CalciteSchema { protected TableEntry(CalciteSchema schema, String name, ImmutableList<String> sqls) { super(schema, name); - this.sqls = Objects.requireNonNull(sqls, "sqls"); + this.sqls = requireNonNull(sqls, "sqls"); } public abstract Table getTable(); @@ -760,7 +750,7 @@ public abstract class CalciteSchema { public TableEntryImpl(CalciteSchema schema, String name, Table table, ImmutableList<String> sqls) { super(schema, name, sqls); - this.table = Objects.requireNonNull(table, "table"); + this.table = requireNonNull(table, "table"); } @Override public Table getTable() {
