diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java index 6368556a81c6..7281e287e149 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java +++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java @@ -25,6 +25,7 @@ import java.util.Optional; import java.util.stream.Collectors; +import static io.trino.spi.function.table.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; @Experimental(eta = "2022-10-31") @@ -36,7 +37,7 @@ public class Descriptor public Descriptor(@JsonProperty("fields") List fields) { requireNonNull(fields, "fields is null"); - Preconditions.checkArgument(!fields.isEmpty(), "descriptor has no fields"); + checkArgument(!fields.isEmpty(), "descriptor has no fields"); this.fields = List.copyOf(fields); } @@ -52,7 +53,7 @@ public static Descriptor descriptor(List names, List types) { requireNonNull(names, "names is null"); requireNonNull(types, "types is null"); - Preconditions.checkArgument(names.size() == types.size(), "names and types lists do not match"); + checkArgument(names.size() == types.size(), "names and types lists do not match"); List fields = new ArrayList<>(); for (int i = 0; i < names.size(); i++) { fields.add(new Field(names.get(i), Optional.of(types.get(i)))); @@ -104,7 +105,7 @@ public Field(String name, Optional type) public Field(@JsonProperty("name") Optional name, @JsonProperty("type") Optional type) { this.name = requireNonNull(name, "name is null"); - name.ifPresent(nameValue -> Preconditions.checkArgument(!nameValue.isEmpty(), "name is empty")); + name.ifPresent(nameValue -> checkArgument(!nameValue.isEmpty(), "name is empty")); this.type = requireNonNull(type, "type is null"); } diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java index 3a11353a53fe..5cd3b0ac7963 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java +++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java @@ -21,6 +21,7 @@ import java.util.Objects; import java.util.Optional; +import static io.trino.spi.function.table.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; /** @@ -40,7 +41,7 @@ public class DescriptorArgument public DescriptorArgument(@JsonProperty("descriptor") Optional descriptor) { this.descriptor = requireNonNull(descriptor, "descriptor is null"); - descriptor.ifPresent(descriptorValue -> Preconditions.checkArgument( + descriptor.ifPresent(descriptorValue -> checkArgument( descriptorValue.getFields().stream().allMatch(field -> field.getName().isPresent()), "All fields of a descriptor argument must have names")); } diff --git a/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java index 1fbbe683ebe7..fcc1c5e72dcd 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java +++ b/core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.Optional; +import static io.trino.spi.function.table.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toMap; @@ -50,7 +51,7 @@ public final class TableFunctionAnalysis private TableFunctionAnalysis(Optional returnedType, Map> requiredColumns, ConnectorTableFunctionHandle handle) { this.returnedType = requireNonNull(returnedType, "returnedType is null"); - returnedType.ifPresent(descriptor -> Preconditions.checkArgument(descriptor.isTyped(), "field types not specified")); + returnedType.ifPresent(descriptor -> checkArgument(descriptor.isTyped(), "field types not specified")); this.requiredColumns = Map.copyOf(requiredColumns.entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> List.copyOf(entry.getValue())))); this.handle = requireNonNull(handle, "handle is null");