Skip to content

Commit b965472

Browse files
electrumelectrum
committed
Enable UnnecessarilyFullyQualified
1 parent 8b5d853 commit b965472

File tree

92 files changed

+380
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+380
-284
lines changed

‎client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import okhttp3.Interceptor;
2929
import okhttp3.JavaNetCookieJar;
3030
import okhttp3.OkHttpClient;
31+
import okhttp3.Request;
3132
import okhttp3.internal.tls.LegacyHostnameVerifier;
3233
import okhttp3.logging.HttpLoggingInterceptor;
3334
import okhttp3.logging.HttpLoggingInterceptor.Level;
@@ -123,7 +124,7 @@ public static Interceptor extraHeaders(Map<String, String> extraHeaders)
123124
requireNonNull(extraHeaders, "extraHeaders is null");
124125

125126
return chain -> {
126-
okhttp3.Request.Builder builder = chain.request().newBuilder();
127+
Request.Builder builder = chain.request().newBuilder();
127128
extraHeaders.forEach(builder::addHeader);
128129
return chain.proceed(builder.build());
129130
};

‎client/trino-client/src/main/java/io/trino/client/uri/TrinoUri.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ public Builder setExternalAuthentication(Boolean externalAuthentication)
951951
return setProperty(EXTERNAL_AUTHENTICATION, requireNonNull(externalAuthentication, "externalAuthentication is null"));
952952
}
953953

954-
public Builder setExternalAuthenticationTimeout(io.airlift.units.Duration externalAuthenticationTimeout)
954+
public Builder setExternalAuthenticationTimeout(Duration externalAuthenticationTimeout)
955955
{
956956
return setProperty(EXTERNAL_AUTHENTICATION_TIMEOUT, requireNonNull(externalAuthenticationTimeout, "externalAuthenticationTimeout is null"));
957957
}

‎client/trino-client/src/test/java/io/trino/client/TestDisallowLocalRedirectInterceptor.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
*/
1414
package io.trino.client;
1515

16+
import okhttp3.Call;
17+
import okhttp3.Connection;
1618
import okhttp3.Interceptor;
1719
import okhttp3.Protocol;
1820
import okhttp3.Request;
1921
import okhttp3.Response;
2022
import org.junit.jupiter.api.Test;
2123

2224
import java.io.IOException;
25+
import java.util.concurrent.TimeUnit;
2326

2427
import static org.assertj.core.api.Assertions.assertThat;
2528
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -115,7 +118,7 @@ public int connectTimeoutMillis()
115118
}
116119

117120
@Override
118-
public Interceptor.Chain withConnectTimeout(int timeout, java.util.concurrent.TimeUnit unit)
121+
public Interceptor.Chain withConnectTimeout(int timeout, TimeUnit unit)
119122
{
120123
throw new UnsupportedOperationException();
121124
}
@@ -127,7 +130,7 @@ public int readTimeoutMillis()
127130
}
128131

129132
@Override
130-
public Interceptor.Chain withReadTimeout(int timeout, java.util.concurrent.TimeUnit unit)
133+
public Interceptor.Chain withReadTimeout(int timeout, TimeUnit unit)
131134
{
132135
throw new UnsupportedOperationException();
133136
}
@@ -139,19 +142,19 @@ public int writeTimeoutMillis()
139142
}
140143

141144
@Override
142-
public Interceptor.Chain withWriteTimeout(int timeout, java.util.concurrent.TimeUnit unit)
145+
public Interceptor.Chain withWriteTimeout(int timeout, TimeUnit unit)
143146
{
144147
throw new UnsupportedOperationException();
145148
}
146149

147150
@Override
148-
public okhttp3.Connection connection()
151+
public Connection connection()
149152
{
150153
throw new UnsupportedOperationException();
151154
}
152155

153156
@Override
154-
public okhttp3.Call call()
157+
public Call call()
155158
{
156159
throw new UnsupportedOperationException();
157160
}

‎client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ abstract class AbstractTrinoResultSet
141141
static final Map<String, Class<?>> DEFAULT_OBJECT_REPRESENTATION = ImmutableMap.<String, Class<?>>builder()
142142
.put("decimal", BigDecimal.class)
143143
.put("number", Number.class)
144-
.put("date", java.sql.Date.class)
145-
.put("time", java.sql.Time.class)
146-
.put("time with time zone", java.sql.Time.class)
147-
.put("timestamp", java.sql.Timestamp.class)
148-
.put("timestamp with time zone", java.sql.Timestamp.class)
144+
.put("date", Date.class)
145+
.put("time", Time.class)
146+
.put("time with time zone", Time.class)
147+
.put("timestamp", Timestamp.class)
148+
.put("timestamp with time zone", Timestamp.class)
149149
.put("interval year to month", TrinoIntervalYearMonth.class)
150150
.put("interval day to second", TrinoIntervalDayTime.class)
151151
.put("map", Map.class)

‎client/trino-jdbc/src/main/java/io/trino/jdbc/ColumnInfo.java‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@
2020
import io.trino.client.ClientTypeSignature;
2121
import io.trino.client.ClientTypeSignatureParameter;
2222

23+
import java.math.BigDecimal;
24+
import java.sql.Array;
25+
import java.sql.Date;
26+
import java.sql.Time;
27+
import java.sql.Timestamp;
2328
import java.sql.Types;
2429
import java.util.List;
30+
import java.util.Map;
2531

2632
import static java.util.Objects.requireNonNull;
2733

@@ -235,10 +241,10 @@ private static TypeInfo typeInfo(ClientTypeSignature type)
235241
return new TypeInfo(Types.DOUBLE, Double.class);
236242

237243
case ClientStandardTypes.DECIMAL:
238-
return new TypeInfo(Types.DECIMAL, java.math.BigDecimal.class);
244+
return new TypeInfo(Types.DECIMAL, BigDecimal.class);
239245
case ClientStandardTypes.NUMBER:
240246
// NUMERIC/DECIMAL type could suggest clients to use ResultSet.getBigDecimal, but this will fail for some values. OTHER feel safer.
241-
return new TypeInfo(Types.OTHER, java.lang.Number.class);
247+
return new TypeInfo(Types.OTHER, Number.class);
242248

243249
case ClientStandardTypes.VARCHAR:
244250
return new TypeInfo(Types.VARCHAR, String.class);
@@ -248,22 +254,22 @@ private static TypeInfo typeInfo(ClientTypeSignature type)
248254
return new TypeInfo(Types.VARBINARY, byte[].class);
249255

250256
case ClientStandardTypes.DATE:
251-
return new TypeInfo(Types.DATE, java.sql.Date.class);
257+
return new TypeInfo(Types.DATE, Date.class);
252258
case ClientStandardTypes.TIME:
253-
return new TypeInfo(Types.TIME, java.sql.Time.class);
259+
return new TypeInfo(Types.TIME, Time.class);
254260
case ClientStandardTypes.TIME_WITH_TIME_ZONE:
255-
return new TypeInfo(Types.TIME_WITH_TIMEZONE, java.sql.Time.class);
261+
return new TypeInfo(Types.TIME_WITH_TIMEZONE, Time.class);
256262
case ClientStandardTypes.TIMESTAMP:
257-
return new TypeInfo(Types.TIMESTAMP, java.sql.Timestamp.class);
263+
return new TypeInfo(Types.TIMESTAMP, Timestamp.class);
258264
case ClientStandardTypes.TIMESTAMP_WITH_TIME_ZONE:
259-
return new TypeInfo(Types.TIMESTAMP_WITH_TIMEZONE, java.sql.Timestamp.class);
265+
return new TypeInfo(Types.TIMESTAMP_WITH_TIMEZONE, Timestamp.class);
260266

261267
case ClientStandardTypes.ARRAY:
262-
return new TypeInfo(Types.ARRAY, java.sql.Array.class);
268+
return new TypeInfo(Types.ARRAY, Array.class);
263269
case ClientStandardTypes.MAP:
264-
return new TypeInfo(Types.JAVA_OBJECT, java.util.Map.class);
270+
return new TypeInfo(Types.JAVA_OBJECT, Map.class);
265271
case ClientStandardTypes.ROW:
266-
return new TypeInfo(Types.JAVA_OBJECT, io.trino.jdbc.Row.class);
272+
return new TypeInfo(Types.JAVA_OBJECT, Row.class);
267273

268274
case ClientStandardTypes.JSON:
269275
case ClientStandardTypes.IPADDRESS:

‎core/trino-main/src/main/java/io/trino/execution/AddColumnTask.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
import io.trino.security.AccessControl;
2828
import io.trino.spi.TrinoException;
2929
import io.trino.spi.connector.ColumnMetadata;
30+
import io.trino.spi.connector.ColumnPosition.After;
31+
import io.trino.spi.connector.ColumnPosition.First;
32+
import io.trino.spi.connector.ColumnPosition.Last;
3033
import io.trino.spi.type.ArrayType;
3134
import io.trino.spi.type.RowType;
3235
import io.trino.spi.type.Type;
@@ -263,9 +266,9 @@ private Type getSupportedType(Session session, CatalogHandle catalogHandle, Map<
263266
private static io.trino.spi.connector.ColumnPosition toConnectorColumnPosition(ColumnPosition columnPosition)
264267
{
265268
return switch (columnPosition) {
266-
case ColumnPosition.First _ -> new io.trino.spi.connector.ColumnPosition.First();
267-
case ColumnPosition.After after -> new io.trino.spi.connector.ColumnPosition.After(after.column().getValue().toLowerCase(ENGLISH));
268-
case ColumnPosition.Last _ -> new io.trino.spi.connector.ColumnPosition.Last();
269+
case ColumnPosition.First _ -> new First();
270+
case ColumnPosition.After after -> new After(after.column().getValue().toLowerCase(ENGLISH));
271+
case ColumnPosition.Last _ -> new Last();
269272
};
270273
}
271274
}

‎core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@
231231
import io.trino.operator.scalar.timestamptz.TimestampWithTimeZoneToTimestampCast;
232232
import io.trino.operator.scalar.timestamptz.TimestampWithTimeZoneToTimestampWithTimeZoneCast;
233233
import io.trino.operator.scalar.timestamptz.TimestampWithTimeZoneToVarcharCast;
234+
import io.trino.operator.scalar.timestamptz.ToUnixTime;
234235
import io.trino.operator.scalar.timestamptz.VarcharToTimestampWithTimeZoneCast;
235236
import io.trino.operator.scalar.timetz.CurrentTime;
236237
import io.trino.operator.scalar.timetz.TimeWithTimeZoneOperators;
@@ -687,7 +688,7 @@ public static FunctionBundle create(FeaturesConfig featuresConfig, TypeOperators
687688
.scalar(io.trino.operator.scalar.timestamptz.DateDiff.class)
688689
.scalar(io.trino.operator.scalar.timestamptz.DateFormat.class)
689690
.scalar(io.trino.operator.scalar.timestamptz.FormatDateTime.class)
690-
.scalar(io.trino.operator.scalar.timestamptz.ToUnixTime.class)
691+
.scalar(ToUnixTime.class)
691692
.scalar(io.trino.operator.scalar.timestamptz.LastDayOfMonth.class)
692693
.scalar(AtTimeZone.class)
693694
.scalar(AtTimeZoneWithOffset.class)

‎core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private static void accelerateGeometry(OGCGeometry ogcGeometry, Operator relateO
179179
// Recurse into GeometryCollections
180180
GeometryCursor cursor = ogcGeometry.getEsriGeometryCursor();
181181
while (true) {
182-
com.esri.core.geometry.Geometry esriGeometry = cursor.next();
182+
Geometry esriGeometry = cursor.next();
183183
if (esriGeometry == null) {
184184
break;
185185
}

‎core/trino-main/src/main/java/io/trino/operator/aggregation/ApproximateDoublePercentileArrayAggregations.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import io.trino.spi.function.OutputFunction;
2828
import io.trino.spi.function.SqlType;
2929
import io.trino.spi.type.StandardTypes;
30+
import it.unimi.dsi.fastutil.Arrays;
3031

3132
import java.util.List;
3233

@@ -117,7 +118,7 @@ public static List<Double> valuesAtPercentiles(TDigest digest, List<Double> perc
117118
sortedPercentiles[i] = percentiles.get(i);
118119
}
119120

120-
it.unimi.dsi.fastutil.Arrays.quickSort(0, percentiles.size(), (a, b) -> Doubles.compare(sortedPercentiles[a], sortedPercentiles[b]), (a, b) -> {
121+
Arrays.quickSort(0, percentiles.size(), (a, b) -> Doubles.compare(sortedPercentiles[a], sortedPercentiles[b]), (a, b) -> {
121122
double tempPercentile = sortedPercentiles[a];
122123
sortedPercentiles[a] = sortedPercentiles[b];
123124
sortedPercentiles[b] = tempPercentile;

‎core/trino-main/src/main/java/io/trino/operator/unnest/UnnestOperator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.trino.spi.type.Type;
2929
import io.trino.sql.planner.plan.PlanNodeId;
3030

31+
import java.util.Arrays;
3132
import java.util.List;
3233
import java.util.Optional;
3334

@@ -356,7 +357,7 @@ public static int[] ensureCapacity(int[] buffer, int capacity, boolean forceRese
356357
}
357358

358359
if (forceReset) {
359-
java.util.Arrays.fill(buffer, 0);
360+
Arrays.fill(buffer, 0);
360361
}
361362

362363
return buffer;
@@ -370,7 +371,7 @@ public static boolean[] ensureCapacity(boolean[] buffer, int capacity, boolean f
370371
}
371372

372373
if (forceReset) {
373-
java.util.Arrays.fill(buffer, false);
374+
Arrays.fill(buffer, false);
374375
}
375376

376377
return buffer;

0 commit comments

Comments
 (0)