Remove redundant requireNonNull when copying Optional content

core/trino-main/src/main/java/io/trino/server/ResourceGroupInfo.java

@@ -93,8 +93,8 @@ public ResourceGroupInfo(
         this.numRunningQueries = numRunningQueries;
         this.numEligibleSubGroups = numEligibleSubGroups;
 
-        this.subGroups = requireNonNull(subGroups, "subGroups is null").map(ImmutableList::copyOf);
-        this.runningQueries = requireNonNull(runningQueries, "runningQueries is null").map(ImmutableList::copyOf);
+        this.subGroups = subGroups.map(ImmutableList::copyOf);
+        this.runningQueries = runningQueries.map(ImmutableList::copyOf);
     }
 
     @JsonProperty

core/trino-main/src/main/java/io/trino/sql/analyzer/Analysis.java

@@ -1987,7 +1987,7 @@ public UpdateTarget(QualifiedObjectName name, Optional<Table> table, Optional<Li
         {
             this.name = requireNonNull(name, "name is null");
             this.table = requireNonNull(table, "table is null");
-            this.columns = requireNonNull(columns, "columns is null").map(ImmutableList::copyOf);
+            this.columns = columns.map(ImmutableList::copyOf);
         }
 
         public QualifiedObjectName getName()

core/trino-main/src/main/java/io/trino/sql/analyzer/Output.java

@@ -43,7 +43,7 @@ public Output(
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.schema = requireNonNull(schema, "schema is null");
         this.table = requireNonNull(table, "table is null");
-        this.columns = requireNonNull(columns, "columns is null").map(ImmutableList::copyOf);
+        this.columns = columns.map(ImmutableList::copyOf);
     }
 
     @JsonProperty

core/trino-main/src/main/java/io/trino/sql/planner/optimizations/StreamPreferredProperties.java

@@ -58,7 +58,7 @@ private StreamPreferredProperties(
             boolean orderSensitive)
     {
         this.distribution = requireNonNull(distribution, "distribution is null");
-        this.partitioningColumns = requireNonNull(partitioningColumns, "partitioningColumns is null").map(ImmutableList::copyOf);
+        this.partitioningColumns = partitioningColumns.map(ImmutableList::copyOf);
         this.exactColumnOrder = exactColumnOrder;
         this.orderSensitive = orderSensitive;
 

core/trino-main/src/test/java/io/trino/execution/scheduler/TestStageTaskSourceFactory.java

@@ -1047,7 +1047,7 @@ public TestingConnectorSplit(int id, OptionalInt bucket, Optional<List<HostAddre
         {
             this.id = id;
             this.bucket = requireNonNull(bucket, "bucket is null");
-            this.addresses = requireNonNull(addresses, "addresses is null").map(ImmutableList::copyOf);
+            this.addresses = addresses.map(ImmutableList::copyOf);
             this.weight = SplitWeight.fromRawValue(weight);
         }
 

core/trino-spi/src/main/java/io/trino/spi/connector/Constraint.java

@@ -80,7 +80,7 @@ private Constraint(
         this.expression = requireNonNull(expression, "expression is null");
         this.assignments = Map.copyOf(requireNonNull(assignments, "assignments is null"));
         this.predicate = requireNonNull(predicate, "predicate is null");
-        this.predicateColumns = requireNonNull(predicateColumns, "predicateColumns is null").map(Set::copyOf);
+        this.predicateColumns = predicateColumns.map(Set::copyOf);
 
         if (predicateColumns.isPresent() && predicate.isEmpty()) {
             throw new IllegalArgumentException("predicateColumns cannot be present when predicate is not present");

core/trino-spi/src/main/java/io/trino/spi/connector/FixedSplitSource.java

@@ -42,9 +42,8 @@ public FixedSplitSource(Iterable<? extends ConnectorSplit> splits, List<Object>
     private FixedSplitSource(Iterable<? extends ConnectorSplit> splits, Optional<List<Object>> tableExecuteSplitsInfo)
     {
         requireNonNull(splits, "splits is null");
-        requireNonNull(tableExecuteSplitsInfo, "tableExecuteSplitsInfo is null");
         this.splits = stream(splits.spliterator(), false).collect(toUnmodifiableList());
-        this.tableExecuteSplitsInfo = requireNonNull(tableExecuteSplitsInfo, "tableExecuteSplitsInfo is null").map(List::copyOf);
+        this.tableExecuteSplitsInfo = tableExecuteSplitsInfo.map(List::copyOf);
     }
 
     @SuppressWarnings("ObjectEquality")

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcOutputTableHandle.java

@@ -61,7 +61,6 @@ public JdbcOutputTableHandle(
         checkArgument(columnNames.size() == columnTypes.size(), "columnNames and columnTypes sizes don't match");
         this.columnNames = ImmutableList.copyOf(columnNames);
         this.columnTypes = ImmutableList.copyOf(columnTypes);
-        requireNonNull(jdbcColumnTypes, "jdbcColumnTypes is null");
         jdbcColumnTypes.ifPresent(jdbcTypeHandles -> checkArgument(jdbcTypeHandles.size() == columnNames.size(), "columnNames and jdbcColumnTypes sizes don't match"));
         this.jdbcColumnTypes = jdbcColumnTypes.map(ImmutableList::copyOf);
     }

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcTableHandle.java

@@ -94,13 +94,11 @@ public JdbcTableHandle(
         this.relationHandle = requireNonNull(relationHandle, "relationHandle is null");
         this.constraint = requireNonNull(constraint, "constraint is null");
         this.constraintExpressions = ImmutableList.copyOf(requireNonNull(constraintExpressions, "constraintExpressions is null"));
-        this.sortOrder = requireNonNull(sortOrder, "sortOrder is null")
-                .map(ImmutableList::copyOf);
+        this.sortOrder = sortOrder.map(ImmutableList::copyOf);
         this.limit = requireNonNull(limit, "limit is null");
 
-        requireNonNull(columns, "columns is null");
         this.columns = columns.map(ImmutableList::copyOf);
-        this.otherReferencedTables = requireNonNull(otherReferencedTables, "otherReferencedTables is null").map(ImmutableSet::copyOf);
+        this.otherReferencedTables = otherReferencedTables.map(ImmutableSet::copyOf);
         this.nextSyntheticColumnId = nextSyntheticColumnId;
     }
 

plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraTableHandle.java

@@ -50,7 +50,7 @@ public CassandraTableHandle(
     {
         this.schemaName = requireNonNull(schemaName, "schemaName is null");
         this.tableName = requireNonNull(tableName, "tableName is null");
-        this.partitions = requireNonNull(partitions, "partitions is null").map(ImmutableList::copyOf);
+        this.partitions = partitions.map(ImmutableList::copyOf);
         this.clusteringKeyPredicates = requireNonNull(clusteringKeyPredicates, "clusteringKeyPredicates is null");
     }
 

plugin/trino-hive/src/main/java/io/trino/plugin/hive/HivePartitionResult.java

@@ -52,7 +52,7 @@ public HivePartitionResult(
             Optional<HiveBucketFilter> bucketFilter)
     {
         this.partitionColumns = requireNonNull(partitionColumns, "partitionColumns is null");
-        this.partitionNames = requireNonNull(partitionNames, "partitionNames is null").map(ImmutableList::copyOf);
+        this.partitionNames = partitionNames.map(ImmutableList::copyOf);
         this.partitions = requireNonNull(partitions, "partitions is null");
         this.effectivePredicate = requireNonNull(effectivePredicate, "effectivePredicate is null");
         this.compactEffectivePredicate = requireNonNull(compactEffectivePredicate, "compactEffectivePredicate is null");

plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveTableHandle.java

@@ -142,16 +142,16 @@ public HiveTableHandle(
         checkState(partitionNames.isEmpty() || partitions.isEmpty(), "partition names and partitions list cannot be present at same time");
         this.schemaName = requireNonNull(schemaName, "schemaName is null");
         this.tableName = requireNonNull(tableName, "tableName is null");
-        this.tableParameters = requireNonNull(tableParameters, "tableParameters is null").map(ImmutableMap::copyOf);
+        this.tableParameters = tableParameters.map(ImmutableMap::copyOf);
         this.partitionColumns = ImmutableList.copyOf(requireNonNull(partitionColumns, "partitionColumns is null"));
         this.dataColumns = ImmutableList.copyOf(requireNonNull(dataColumns, "dataColumns is null"));
-        this.partitionNames = requireNonNull(partitionNames, "partitionNames is null").map(ImmutableList::copyOf);
-        this.partitions = requireNonNull(partitions, "partitions is null").map(ImmutableList::copyOf);
+        this.partitionNames = partitionNames.map(ImmutableList::copyOf);
+        this.partitions = partitions.map(ImmutableList::copyOf);
         this.compactEffectivePredicate = requireNonNull(compactEffectivePredicate, "compactEffectivePredicate is null");
         this.enforcedConstraint = requireNonNull(enforcedConstraint, "enforcedConstraint is null");
         this.bucketHandle = requireNonNull(bucketHandle, "bucketHandle is null");
         this.bucketFilter = requireNonNull(bucketFilter, "bucketFilter is null");
-        this.analyzePartitionValues = requireNonNull(analyzePartitionValues, "analyzePartitionValues is null").map(ImmutableList::copyOf);
+        this.analyzePartitionValues = analyzePartitionValues.map(ImmutableList::copyOf);
         this.constraintColumns = ImmutableSet.copyOf(requireNonNull(constraintColumns, "constraintColumns is null"));
         this.projectedColumns = ImmutableSet.copyOf(requireNonNull(projectedColumns, "projectedColumns is null"));
         this.transaction = requireNonNull(transaction, "transaction is null");

plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/RaptorTableHandle.java

@@ -74,7 +74,7 @@ public RaptorTableHandle(
         this.transactionId = requireNonNull(transactionId, "transactionId is null");
 
         this.constraint = requireNonNull(constraint, "constraint is null");
-        this.bucketAssignments = requireNonNull(bucketAssignments, "bucketAssignments is null").map(ImmutableList::copyOf);
+        this.bucketAssignments = bucketAssignments.map(ImmutableList::copyOf);
         this.delete = delete;
     }
 

plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/db/SelectorRecord.java

@@ -56,7 +56,7 @@ public SelectorRecord(
         this.userGroupRegex = requireNonNull(userGroupRegex, "userGroupRegex is null");
         this.sourceRegex = requireNonNull(sourceRegex, "sourceRegex is null");
         this.queryType = requireNonNull(queryType, "queryType is null");
-        this.clientTags = requireNonNull(clientTags, "clientTags is null").map(ImmutableList::copyOf);
+        this.clientTags = clientTags.map(ImmutableList::copyOf);
         this.selectorResourceEstimate = requireNonNull(selectorResourceEstimate, "selectorResourceEstimate is null");
     }