Replace deprecated method calls

Author: wendigo

core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BinPackingNodeAllocatorService.java

@@ -114,7 +114,7 @@ public class BinPackingNodeAllocatorService
     private final DataSize eagerSpeculativeTasksNodeMemoryOvercommit;
     private final Ticker ticker;
 
-    private final ConcurrentNavigableMap<QueryId, Deque<PendingAcquire>> pendingAcquires = new ConcurrentSkipListMap<>(Ordering.natural().onResultOf(QueryId::getId));
+    private final ConcurrentNavigableMap<QueryId, Deque<PendingAcquire>> pendingAcquires = new ConcurrentSkipListMap<>(Ordering.natural().onResultOf(QueryId::id));
     private final Set<BinPackingNodeLease> fulfilledAcquires = newConcurrentHashSet();
     private final Duration allowedNoMatchingNodePeriod;
     private final Duration exhaustedNodeWaitPeriod;

core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java

@@ -268,7 +268,7 @@ private SqlTask newSqlTask(QueryId queryId)
     {
         QueryContext queryContext = getOrCreateQueryContext(queryId);
 
-        TaskId taskId = new TaskId(new StageId(queryId.getId(), 0), idGenerator.incrementAndGet(), 0);
+        TaskId taskId = new TaskId(new StageId(queryId.id(), 0), idGenerator.incrementAndGet(), 0);
         URI location = URI.create("fake://task/" + taskId);
 
         return createSqlTask(

core/trino-main/src/test/java/io/trino/server/TestBasicQueryInfo.java

@@ -165,7 +165,7 @@ public void testConstructor()
                         false,
                         new NodeVersion("test")));
 
-        assertThat(basicInfo.getQueryId().getId()).isEqualTo("0");
+        assertThat(basicInfo.getQueryId().id()).isEqualTo("0");
         assertThat(basicInfo.getState()).isEqualTo(RUNNING);
         assertThat(basicInfo.isScheduled()).isTrue(); // from query stats
         assertThat(basicInfo.getQuery()).isEqualTo("SELECT 4");

core/trino-main/src/test/java/io/trino/server/remotetask/TestHttpRemoteTask.java

@@ -448,7 +448,7 @@ public void testOutboundDynamicFilters()
         // make sure initial dynamic filter is collected
         CompletableFuture<?> future = dynamicFilter.isBlocked();
         dynamicFilterService.addTaskDynamicFilters(
-                new TaskId(new StageId(queryId.getId(), 1), 1, 0),
+                new TaskId(new StageId(queryId.id(), 1), 1, 0),
                 ImmutableMap.of(filterId1, Domain.singleValue(BIGINT, 1L)));
         future.get();
         assertThat(dynamicFilter.getCurrentPredicate()).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.of(
@@ -474,7 +474,7 @@ public void testOutboundDynamicFilters()
 
         future = dynamicFilter.isBlocked();
         dynamicFilterService.addTaskDynamicFilters(
-                new TaskId(new StageId(queryId.getId(), 1), 1, 0),
+                new TaskId(new StageId(queryId.id(), 1), 1, 0),
                 ImmutableMap.of(filterId2, Domain.singleValue(BIGINT, 2L)));
         future.get();
         assertThat(dynamicFilter.getCurrentPredicate()).isEqualTo(TupleDomain.withColumnDomains(ImmutableMap.of(

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMaterializedViewTest.java

@@ -764,7 +764,7 @@ public void testMaterializedViewSnapshotSummariesHaveTrinoQueryId()
                     .executeWithPlan(getSession(), format("REFRESH MATERIALIZED VIEW %s", materializedViewName))
                     .queryId();
             String savedQueryId = getStorageTableMetadata(materializedViewName).currentSnapshot().summary().get("trino_query_id");
-            assertThat(savedQueryId).isEqualTo(refreshQueryId.getId());
+            assertThat(savedQueryId).isEqualTo(refreshQueryId.id());
         }
         finally {
             assertUpdate("DROP TABLE " + sourceTableName);

plugin/trino-ranger/src/main/java/io/trino/plugin/ranger/RangerSystemAccessControl.java

@@ -176,7 +176,7 @@ public void checkCanSetUser(Optional<Principal> principal, String userName)
     @Override
     public void checkCanExecuteQuery(Identity identity, QueryId queryId)
     {
-        if (!hasPermission(RangerTrinoResource.forQueryId(queryId.getId()), identity, queryId, EXECUTE, "ExecuteQuery")) {
+        if (!hasPermission(RangerTrinoResource.forQueryId(queryId.id()), identity, queryId, EXECUTE, "ExecuteQuery")) {
             denyExecuteQuery();
         }
     }
@@ -916,22 +916,22 @@ private RangerTrinoAccessRequest createAccessRequest(RangerTrinoResource resourc
 
     private Optional<String> getClientAddress(QueryId queryId)
     {
-        return queryId != null ? eventListener.getClientAddress(queryId.getId()) : Optional.empty();
+        return queryId != null ? eventListener.getClientAddress(queryId.id()) : Optional.empty();
     }
 
     private Optional<String> getClientType(QueryId queryId)
     {
-        return queryId != null ? eventListener.getClientType(queryId.getId()) : Optional.empty();
+        return queryId != null ? eventListener.getClientType(queryId.id()) : Optional.empty();
     }
 
     private Optional<String> getQueryText(QueryId queryId)
     {
-        return queryId != null ? eventListener.getQueryText(queryId.getId()) : Optional.empty();
+        return queryId != null ? eventListener.getQueryText(queryId.id()) : Optional.empty();
     }
 
     private Optional<Instant> getQueryTime(QueryId queryId)
     {
-        return queryId != null ? eventListener.getQueryTime(queryId.getId()) : Optional.empty();
+        return queryId != null ? eventListener.getQueryTime(queryId.id()) : Optional.empty();
     }
 
     private Optional<String> getClientAddress(SystemSecurityContext context)

testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java

@@ -613,12 +613,12 @@ private ExecutionResult execute(Session session, String query, Optional<String>
             String queryId = null;
             try {
                 resultWithPlan = getDistributedQueryRunner().executeWithPlan(withTraceToken(session, traceToken), resolveTableName(query, tableName));
-                queryId = resultWithPlan.queryId().getId();
+                queryId = resultWithPlan.queryId().id();
             }
             catch (RuntimeException e) {
                 failure = e;
                 if (e instanceof QueryFailedException queryFailedException) {
-                    queryId = queryFailedException.getQueryId().getId();
+                    queryId = queryFailedException.getQueryId().id();
                 }
             }
 

testing/trino-tests/src/test/java/io/trino/execution/TestQueryCompletedEvent.java

@@ -86,6 +86,6 @@ private static void assertQueryCompletedIssued(StandaloneQueryRunner queryRunner
         assertThat(query.getState()).isEqualTo(FINISHED);
         assertEventually(() -> assertThat(queryCompletedQueryIds)
                 .describedAs("query '%s'", sql)
-                .contains(result.queryId().getId()));
+                .contains(result.queryId().id()));
     }
 }

testing/trino-tests/src/test/java/io/trino/memory/TestClusterMemoryLeakDetector.java

@@ -50,15 +50,15 @@ public void testLeakDetector()
         assertThat(leakDetector.getNumberOfLeakedQueries()).isEqualTo(0);
 
         // the leak detector should report no leaked queries as the query is still running
-        leakDetector.checkForMemoryLeaks(() -> ImmutableList.of(createQueryInfo(testQuery.getId(), RUNNING)), ImmutableMap.of(testQuery, 1L));
+        leakDetector.checkForMemoryLeaks(() -> ImmutableList.of(createQueryInfo(testQuery.id(), RUNNING)), ImmutableMap.of(testQuery, 1L));
         assertThat(leakDetector.getNumberOfLeakedQueries()).isEqualTo(0);
 
         // the leak detector should report exactly one leaked query since the query is finished, and its end time is way in the past
-        leakDetector.checkForMemoryLeaks(() -> ImmutableList.of(createQueryInfo(testQuery.getId(), FINISHED)), ImmutableMap.of(testQuery, 1L));
+        leakDetector.checkForMemoryLeaks(() -> ImmutableList.of(createQueryInfo(testQuery.id(), FINISHED)), ImmutableMap.of(testQuery, 1L));
         assertThat(leakDetector.getNumberOfLeakedQueries()).isEqualTo(1);
 
         // the leak detector should report no leaked queries as the query doesn't have any memory reservation
-        leakDetector.checkForMemoryLeaks(() -> ImmutableList.of(createQueryInfo(testQuery.getId(), FINISHED)), ImmutableMap.of(testQuery, 0L));
+        leakDetector.checkForMemoryLeaks(() -> ImmutableList.of(createQueryInfo(testQuery.id(), FINISHED)), ImmutableMap.of(testQuery, 0L));
         assertThat(leakDetector.getNumberOfLeakedQueries()).isEqualTo(0);
 
         // the leak detector should report exactly one leaked query since the coordinator doesn't know of any query