Remove unnecessary constructor from TrinoException

electrum · Feb 29, 2024 · 7491f72 · 7491f72
1 parent ea8bdb2
commit 7491f72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml
@@ -437,6 +437,10 @@
                                     <code>java.method.addedToInterface</code>
                                     <new>method void io.trino.spi.block.BlockBuilder::resetTo(int)</new>
                                 </item>
+                                <item>
+                                    <code>java.method.removed</code>
+                                    <old>method void io.trino.spi.TrinoException::&lt;init&gt;(io.trino.spi.ErrorCode, java.lang.String, java.lang.Throwable)</old>
+                                </item>
                             </differences>
                         </revapi.differences>
                     </analysisConfiguration>

diff --git a/core/trino-spi/src/main/java/io/trino/spi/TrinoException.java b/core/trino-spi/src/main/java/io/trino/spi/TrinoException.java
@@ -39,20 +39,10 @@ public TrinoException(ErrorCodeSupplier errorCode, String message, Throwable cau
         this(errorCode, Optional.empty(), message, cause);
     }
 
-    public TrinoException(ErrorCode errorCode, String message, Throwable cause)
-    {
-        this(errorCode, Optional.empty(), message, cause);
-    }
-
     public TrinoException(ErrorCodeSupplier errorCodeSupplier, Optional<Location> location, String message, Throwable cause)
-    {
-        this(errorCodeSupplier.toErrorCode(), location, message, cause);
-    }
-
-    private TrinoException(ErrorCode errorCode, Optional<Location> location, String message, Throwable cause)
     {
         super(message, cause);
-        this.errorCode = requireNonNull(errorCode, "errorCode is null");
+        this.errorCode = errorCodeSupplier.toErrorCode();
         this.location = requireNonNull(location, "location is null");
     }
 

diff --git a/...ino-delta-lake/src/main/java/io/trino/plugin/deltalake/CorruptedDeltaLakeTableHandle.java b/...ino-delta-lake/src/main/java/io/trino/plugin/deltalake/CorruptedDeltaLakeTableHandle.java
@@ -35,6 +35,6 @@ public record CorruptedDeltaLakeTableHandle(
     public TrinoException createException()
     {
         // Original exception originates from a different place. Create a new exception not to confuse reader with a stacktrace not matching call site.
-        return new TrinoException(originalException.getErrorCode(), originalException.getMessage(), originalException);
+        return new TrinoException(originalException::getErrorCode, originalException.getMessage(), originalException);
     }
 }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CorruptedIcebergTableHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/CorruptedIcebergTableHandle.java
@@ -31,6 +31,6 @@ public record CorruptedIcebergTableHandle(SchemaTableName schemaTableName, Trino
     public TrinoException createException()
     {
         // Original exception originates from a different place. Create a new exception not to confuse reader with a stacktrace not matching call site.
-        return new TrinoException(originalException.getErrorCode(), originalException.getMessage(), originalException);
+        return new TrinoException(originalException::getErrorCode, originalException.getMessage(), originalException);
     }
 }