Remove unnecessary String.format and formatted wrapping

Author: chenjian2664

core/trino-main/src/test/java/io/trino/operator/unnest/TestingUnnesterUtil.java

@@ -34,7 +34,6 @@
 import static com.google.common.base.Verify.verify;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static java.lang.Math.max;
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -173,7 +172,7 @@ static Page mergePages(List<Type> types, List<Page> pages)
         PageBuilder pageBuilder = new PageBuilder(types);
         int totalPositionCount = 0;
         for (Page page : pages) {
-            verify(page.getChannelCount() == types.size(), format("Number of channels in page %d is not equal to number of types %d", page.getChannelCount(), types.size()));
+            verify(page.getChannelCount() == types.size(), "Number of channels in page %s is not equal to number of types %s", page.getChannelCount(), types.size());
 
             for (int i = 0; i < types.size(); i++) {
                 BlockBuilder blockBuilder = pageBuilder.getBlockBuilder(i);

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

@@ -639,7 +639,7 @@ public ConnectorSplitSource getSplits(ConnectorSession session, JdbcProcedureHan
     public Connection getConnection(ConnectorSession session, JdbcSplit split, JdbcTableHandle tableHandle)
             throws SQLException
     {
-        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(tableHandle));
+        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", tableHandle);
         return getConnection(session);
     }
 
@@ -673,7 +673,7 @@ public PreparedQuery prepareQuery(
             List<JdbcColumnHandle> columns,
             Map<String, ParameterizedExpression> columnExpressions)
     {
-        verify(table.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(table));
+        verify(table.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", table);
         try (Connection connection = connectionFactory.openConnection(session)) {
             return prepareQuery(session, connection, table, groupingSets, columns, columnExpressions, Optional.empty());
         }
@@ -965,7 +965,7 @@ public JdbcOutputTableHandle beginInsertTable(ConnectorSession session, JdbcTabl
         SchemaTableName schemaTableName = tableHandle.asPlainTable().getSchemaTableName();
         ConnectorIdentity identity = session.getIdentity();
 
-        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(tableHandle));
+        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", tableHandle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             RemoteIdentifiers remoteIdentifiers = getRemoteIdentifiers(connection);
@@ -1075,7 +1075,7 @@ public void commitCreateTable(ConnectorSession session, JdbcOutputTableHandle ha
     @Override
     public void renameTable(ConnectorSession session, JdbcTableHandle handle, SchemaTableName newTableName)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         RemoteTableName remoteTableName = handle.asPlainTable().getRemoteTableName();
         renameTable(session, remoteTableName.getCatalogName().orElse(null), remoteTableName.getSchemaName().orElse(null), remoteTableName.getTableName(), newTableName);
     }
@@ -1324,7 +1324,7 @@ protected String postProcessInsertTableNameClause(ConnectorSession session, Stri
     @Override
     public void addColumn(ConnectorSession session, JdbcTableHandle handle, ColumnMetadata column, ColumnPosition position)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
 
         switch (position) {
             case ColumnPosition.First _ -> throw new TrinoException(NOT_SUPPORTED, "This connector does not support adding columns with FIRST clause");
@@ -1364,7 +1364,7 @@ protected void addColumn(ConnectorSession session, Connection connection, Remote
     @Override
     public void renameColumn(ConnectorSession session, JdbcTableHandle handle, JdbcColumnHandle jdbcColumn, String newColumnName)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             String newRemoteColumnName = identifierMapping.toRemoteColumnName(getRemoteIdentifiers(connection), newColumnName);
@@ -1389,7 +1389,7 @@ protected void renameColumn(ConnectorSession session, Connection connection, Rem
     @Override
     public void dropColumn(ConnectorSession session, JdbcTableHandle handle, JdbcColumnHandle column)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             String remoteColumnName = identifierMapping.toRemoteColumnName(getRemoteIdentifiers(connection), column.getColumnName());
@@ -1442,7 +1442,7 @@ public void dropNotNullConstraint(ConnectorSession session, JdbcTableHandle hand
     @Override
     public void dropTable(ConnectorSession session, JdbcTableHandle handle)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         dropTable(session, handle.asPlainTable().getRemoteTableName(), false);
     }
 
@@ -1537,7 +1537,7 @@ protected String getTableSchemaName(ResultSet resultSet)
     @Override
     public TableStatistics getTableStatistics(ConnectorSession session, JdbcTableHandle handle)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         return TableStatistics.empty();
     }
 
@@ -1728,7 +1728,7 @@ public String quoted(RemoteTableName remoteTableName)
     @Override
     public Map<String, Object> getTableProperties(ConnectorSession session, JdbcTableHandle tableHandle)
     {
-        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(tableHandle));
+        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", tableHandle);
         return emptyMap();
     }
 
@@ -1739,7 +1739,7 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
         checkArgument(handle.getLimit().isEmpty(), "Unable to delete when limit is set: %s", handle);
         checkArgument(handle.getSortOrder().isEmpty(), "Unable to delete when sort order is set: %s", handle);
         checkArgument(handle.getUpdateAssignments().isEmpty(), "Unable to delete when update assignments are set: %s", handle);
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             PreparedQuery preparedQuery = queryBuilder.prepareDeleteQuery(
@@ -1765,7 +1765,7 @@ public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
         checkArgument(handle.getLimit().isEmpty(), "Unable to update when limit is set: %s", handle);
         checkArgument(handle.getSortOrder().isEmpty(), "Unable to update when sort order is set: %s", handle);
         checkArgument(!handle.getUpdateAssignments().isEmpty(), "Unable to update when update assignments are not set: %s", handle);
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         try (Connection connection = connectionFactory.openConnection(session)) {
             verify(connection.getAutoCommit());
             PreparedQuery preparedQuery = queryBuilder.prepareUpdateQuery(
@@ -1788,7 +1788,7 @@ public OptionalLong update(ConnectorSession session, JdbcTableHandle handle)
     @Override
     public void truncateTable(ConnectorSession session, JdbcTableHandle handle)
     {
-        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(handle));
+        verify(handle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", handle);
         String sql = "TRUNCATE TABLE " + quoted(handle.asPlainTable().getRemoteTableName());
         execute(session, sql);
     }

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

@@ -38,7 +38,7 @@ static List<JdbcColumnHandle> getColumns(ConnectorSession session, JdbcClient jd
             return tableHandle.getColumns().get();
         }
         checkArgument(tableHandle.isNamedRelation(), "Cannot get columns for %s", tableHandle);
-        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s".formatted(tableHandle));
+        verify(tableHandle.getAuthorization().isEmpty(), "Unexpected authorization is required for table: %s", tableHandle);
         SchemaTableName schemaTableName = tableHandle.getRequiredNamedRelation().getSchemaTableName();
         RemoteTableName remoteTableName = tableHandle.getRequiredNamedRelation().getRemoteTableName();
         return jdbcClient.getColumns(session, schemaTableName, remoteTableName);

plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeParquetSchemas.java

@@ -206,7 +206,7 @@ private static org.apache.parquet.schema.Type buildPrimitiveType(
         Type trinoType;
         if (primitiveType.startsWith(StandardTypes.DECIMAL)) {
             trinoType = typeManager.fromSqlType(primitiveType);
-            verify(trinoType instanceof DecimalType, "type %s does not map to Trino decimal".formatted(primitiveType));
+            verify(trinoType instanceof DecimalType, "type %s does not map to Trino decimal", primitiveType);
             DecimalType trinoDecimalType = (DecimalType) trinoType;
             if (trinoDecimalType.getPrecision() <= 9) {
                 typeBuilder = Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, repetition);

plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java

@@ -783,7 +783,7 @@ private static List<Integer> applyProjection(ColumnHandle expectedColumnHandle,
     private static Integer getIcebergFieldId(OrcColumn column)
     {
         String icebergId = column.getAttributes().get(ORC_ICEBERG_ID_KEY);
-        verify(icebergId != null, format("column %s does not have %s property", column, ORC_ICEBERG_ID_KEY));
+        verify(icebergId != null, "column %s does not have %s property", column, ORC_ICEBERG_ID_KEY);
         return Integer.valueOf(icebergId);
     }