CheckerFramework and ErrorProne fixes

Signed-off-by: Mihai Budiu <mbudiu@feldera.com>
apache · Sep 4, 2024 · 8a651dd · 8a651dd
1 parent 258aa0a
commit 8a651dd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/core/src/main/java/org/apache/calcite/util/Variant.java b/core/src/main/java/org/apache/calcite/util/Variant.java
@@ -64,7 +64,7 @@ public boolean isVariantNull() {
     return this.isVariantNull;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override public boolean equals(@Nullable Object o) {
     if (this == o) {
       return true;
     }
@@ -173,6 +173,9 @@ public boolean isVariantNull() {
       // are printed with double quotes
       // https://docs.snowflake.com/en/sql-reference/data-types-semistructured
       quote = "\"";
+      break;
+    default:
+      break;
     }
     return quote + value + quote;
   }

diff --git a/core/src/main/java/org/apache/calcite/util/rtti/BasicSqlTypeRtti.java b/core/src/main/java/org/apache/calcite/util/rtti/BasicSqlTypeRtti.java
@@ -16,6 +16,8 @@
  */
 package org.apache.calcite.util.rtti;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /** Runtime type information about a base (primitive) SQL type. */
 public class BasicSqlTypeRtti extends RuntimeTypeInformation {
   private final int precision;
@@ -28,7 +30,7 @@ public BasicSqlTypeRtti(RuntimeSqlTypeName typeName, int precision, int scale) {
     this.scale = scale;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override public boolean equals(@Nullable Object o) {
     if (this == o) {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/util/rtti/GenericSqlTypeRtti.java b/core/src/main/java/org/apache/calcite/util/rtti/GenericSqlTypeRtti.java
@@ -16,6 +16,8 @@
  */
 package org.apache.calcite.util.rtti;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import java.util.Arrays;
 
 /** Runtime type information which contains some type parameters. */
@@ -55,7 +57,7 @@ public String getTypeString()  {
     return builder.toString();
   }
 
-  @Override public boolean equals(Object o) {
+  @Override public boolean equals(@Nullable Object o) {
     if (this == o) {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/util/rtti/RowSqlTypeRtti.java b/core/src/main/java/org/apache/calcite/util/rtti/RowSqlTypeRtti.java
@@ -16,6 +16,8 @@
  */
 package org.apache.calcite.util.rtti;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import java.util.Arrays;
 import java.util.Map;
 
@@ -49,7 +51,7 @@ public String getTypeString()  {
     return builder.toString();
   }
 
-  @Override public boolean equals(Object o) {
+  @Override public boolean equals(@Nullable Object o) {
     if (this == o) {
       return true;
     }