Skip to content

Commit f1a0f2a

Browse files
committed
Use static import for JsonCodec factory methods
1 parent e6c6239 commit f1a0f2a

File tree

45 files changed

+108
-66
lines changed

Some content is hidden

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

45 files changed

+108
-66
lines changed

core/trino-main/src/main/java/io/trino/operator/scalar/FailureFunction.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323
import io.trino.spi.function.SqlType;
2424
import io.trino.spi.type.StandardTypes;
2525

26+
import static io.airlift.json.JsonCodec.jsonCodec;
27+
2628
public final class FailureFunction
2729
{
28-
private static final JsonCodec<FailureInfo> JSON_CODEC = JsonCodec.jsonCodec(FailureInfo.class);
30+
private static final JsonCodec<FailureInfo> JSON_CODEC = jsonCodec(FailureInfo.class);
2931

3032
private FailureFunction() {}
3133

core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpooledMetadataBlockSerde.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.Optional;
2828

2929
import static com.google.common.base.Verify.verify;
30+
import static io.airlift.json.JsonCodec.jsonCodec;
3031
import static io.airlift.json.JsonCodec.listJsonCodec;
3132
import static io.airlift.json.JsonCodec.mapJsonCodec;
3233
import static io.airlift.slice.Slices.utf8Slice;
@@ -44,7 +45,7 @@
4445
public class SpooledMetadataBlockSerde
4546
{
4647
private static final JsonCodec<Map<String, List<String>>> HEADERS_CODEC = mapJsonCodec(String.class, listJsonCodec(String.class));
47-
private static final JsonCodec<DataAttributes> ATTRIBUTES_CODEC = JsonCodec.jsonCodec(DataAttributes.class);
48+
private static final JsonCodec<DataAttributes> ATTRIBUTES_CODEC = jsonCodec(DataAttributes.class);
4849

4950
private static final RowType SPOOLING_METADATA_TYPE = RowType.from(List.of(
5051
new RowType.Field(Optional.empty(), VARCHAR),

core/trino-main/src/main/java/io/trino/server/security/jwt/JwkDecoder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
import java.util.function.Function;
3535

3636
import static com.google.common.collect.ImmutableMap.toImmutableMap;
37+
import static io.airlift.json.JsonCodec.jsonCodec;
3738
import static java.util.Base64.getUrlDecoder;
3839
import static java.util.Objects.requireNonNull;
3940

4041
public final class JwkDecoder
4142
{
4243
private static final Logger log = Logger.get(JwkDecoder.class);
43-
private static final JsonCodec<Keys> KEYS_CODEC = JsonCodec.jsonCodec(Keys.class);
44+
private static final JsonCodec<Keys> KEYS_CODEC = jsonCodec(Keys.class);
4445

4546
private JwkDecoder() {}
4647

core/trino-main/src/main/java/io/trino/sql/planner/planprinter/JsonRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@
2525
import java.util.Optional;
2626

2727
import static com.google.common.collect.ImmutableList.toImmutableList;
28+
import static io.airlift.json.JsonCodec.jsonCodec;
2829
import static java.util.Objects.requireNonNull;
2930

3031
public class JsonRenderer
3132
implements Renderer<String>
3233
{
33-
private static final JsonCodec<JsonRenderedNode> CODEC = JsonCodec.jsonCodec(JsonRenderedNode.class);
34+
private static final JsonCodec<JsonRenderedNode> CODEC = jsonCodec(JsonRenderedNode.class);
3435

3536
@Override
3637
public String render(PlanRepresentation plan)

core/trino-main/src/test/java/io/trino/dispatcher/TestLocalDispatchQuery.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.google.common.util.concurrent.Futures;
1919
import com.google.common.util.concurrent.ListenableFuture;
2020
import io.airlift.configuration.secrets.SecretsResolver;
21-
import io.airlift.json.JsonCodec;
2221
import io.airlift.node.NodeInfo;
2322
import io.airlift.units.Duration;
2423
import io.trino.connector.CatalogHandle;
@@ -75,6 +74,7 @@
7574

7675
import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
7776
import static io.airlift.concurrent.Threads.daemonThreadsNamed;
77+
import static io.airlift.json.JsonCodec.jsonCodec;
7878
import static io.airlift.tracing.Tracing.noopTracer;
7979
import static io.opentelemetry.api.OpenTelemetry.noop;
8080
import static io.trino.SessionTestUtils.TEST_SESSION;
@@ -127,10 +127,10 @@ public void testSubmittedForDispatchedQuery()
127127
Optional.empty(),
128128
new NodeVersion("test"));
129129
QueryMonitor queryMonitor = new QueryMonitor(
130-
JsonCodec.jsonCodec(StagesInfo.class),
131-
JsonCodec.jsonCodec(OperatorStats.class),
132-
JsonCodec.jsonCodec(ExecutionFailureInfo.class),
133-
JsonCodec.jsonCodec(StatsAndCosts.class),
130+
jsonCodec(StagesInfo.class),
131+
jsonCodec(OperatorStats.class),
132+
jsonCodec(ExecutionFailureInfo.class),
133+
jsonCodec(StatsAndCosts.class),
134134
new EventListenerManager(new EventListenerConfig(), new SecretsResolver(ImmutableMap.of()), noop(), noopTracer(), new NodeVersion("test")),
135135
new NodeInfo("node"),
136136
new NodeVersion("version"),

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
import io.airlift.json.JsonCodec;
1717
import org.junit.jupiter.api.Test;
1818

19+
import static io.airlift.json.JsonCodec.jsonCodec;
1920
import static org.assertj.core.api.Assertions.assertThat;
2021

2122
public class TestColumn
2223
{
23-
private static final JsonCodec<Column> codec = JsonCodec.jsonCodec(Column.class);
24+
private static final JsonCodec<Column> codec = jsonCodec(Column.class);
2425

2526
@Test
2627
public void testRoundTrip()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222

2323
import java.util.Optional;
2424

25+
import static io.airlift.json.JsonCodec.jsonCodec;
2526
import static org.assertj.core.api.Assertions.assertThat;
2627

2728
public class TestInput
2829
{
29-
private static final JsonCodec<Input> codec = JsonCodec.jsonCodec(Input.class);
30+
private static final JsonCodec<Input> codec = jsonCodec(Input.class);
3031

3132
@Test
3233
public void testRoundTrip()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.Optional;
3434
import java.util.OptionalDouble;
3535

36+
import static io.airlift.json.JsonCodec.jsonCodec;
3637
import static io.airlift.units.DataSize.succinctBytes;
3738
import static io.trino.server.DynamicFilterService.DynamicFiltersStats;
3839
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -279,7 +280,7 @@ public class TestQueryStats
279280
@Test
280281
public void testJson()
281282
{
282-
JsonCodec<QueryStats> codec = JsonCodec.jsonCodec(QueryStats.class);
283+
JsonCodec<QueryStats> codec = jsonCodec(QueryStats.class);
283284

284285
String json = codec.toJson(EXPECTED);
285286
QueryStats actual = codec.fromJson(json);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.time.Instant;
3333
import java.util.Optional;
3434

35+
import static io.airlift.json.JsonCodec.jsonCodec;
3536
import static java.util.concurrent.TimeUnit.NANOSECONDS;
3637
import static org.assertj.core.api.Assertions.assertThat;
3738

@@ -119,7 +120,7 @@ public class TestStageStats
119120
@Test
120121
public void testJson()
121122
{
122-
JsonCodec<StageStats> codec = JsonCodec.jsonCodec(StageStats.class);
123+
JsonCodec<StageStats> codec = jsonCodec(StageStats.class);
123124

124125
String json = codec.toJson(EXPECTED);
125126
StageStats actual = codec.fromJson(json);

core/trino-main/src/test/java/io/trino/metadata/TestQualifiedObjectName.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
import io.airlift.json.JsonCodec;
1717
import org.junit.jupiter.api.Test;
1818

19+
import static io.airlift.json.JsonCodec.jsonCodec;
1920
import static org.assertj.core.api.Assertions.assertThat;
2021
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2122

2223
public class TestQualifiedObjectName
2324
{
24-
private final JsonCodec<QualifiedObjectName> codec = JsonCodec.jsonCodec(QualifiedObjectName.class);
25+
private final JsonCodec<QualifiedObjectName> codec = jsonCodec(QualifiedObjectName.class);
2526

2627
@Test
2728
public void testJsonSerializationRoundTrip()

0 commit comments

Comments
 (0)