Skip to content

Import checkArgument statically #17811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2023
Merged

Import checkArgument statically #17811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions core/trino-spi/src/main/java/io/trino/spi/function/table/Descriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -36,7 +37,7 @@ public class Descriptor
public Descriptor(@JsonProperty("fields") List<Field> 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);
}

Expand All @@ -52,7 +53,7 @@ public static Descriptor descriptor(List<String> names, List<Type> 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<Field> fields = new ArrayList<>();
for (int i = 0; i < names.size(); i++) {
fields.add(new Field(names.get(i), Optional.of(types.get(i))));
Expand Down Expand Up @@ -104,7 +105,7 @@ public Field(String name, Optional<Type> type)
public Field(@JsonProperty("name") Optional<String> name, @JsonProperty("type") Optional<Type> 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");
}

Expand Down
3 changes: 2 additions & 1 deletion core/trino-spi/src/main/java/io/trino/spi/function/table/DescriptorArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -40,7 +41,7 @@ public class DescriptorArgument
public DescriptorArgument(@JsonProperty("descriptor") Optional<Descriptor> 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"));
}
Expand Down
3 changes: 2 additions & 1 deletion core/trino-spi/src/main/java/io/trino/spi/function/table/TableFunctionAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -50,7 +51,7 @@ public final class TableFunctionAnalysis
private TableFunctionAnalysis(Optional<Descriptor> returnedType, Map<String, List<Integer>> 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");
Expand Down