Skip to content

Commit e801951

Browse files
snuyanzinsnuyanzin
committed
[FLINK-37376] Upgrade to flink-shaded 20.0
1 parent 25f0cf3 commit e801951

File tree

308 files changed

+402
-408
lines changed

Some content is hidden

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

308 files changed

+402
-408
lines changed

‎flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(or
232232
Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(org.apache.flink.table.types.logical.YearMonthIntervalType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.RandomGenerator.intGenerator(int, int)> in (RandomGeneratorVisitor.java:287)
233233
Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(org.apache.flink.table.types.logical.YearMonthIntervalType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.RandomGenerator.withNullRate(float)> in (RandomGeneratorVisitor.java:288)
234234
Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(org.apache.flink.table.types.logical.ZonedTimestampType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.RandomGenerator.withNullRate(float)> in (RandomGeneratorVisitor.java:326)
235-
Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor$2.next()> calls method <org.apache.flink.shaded.guava32.com.google.common.primitives.Longs.toByteArray(long)> in (SequenceGeneratorVisitor.java:221)
235+
Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor$2.next()> calls method <org.apache.flink.shaded.guava33.com.google.common.primitives.Longs.toByteArray(long)> in (SequenceGeneratorVisitor.java:221)
236236
Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor.getSequenceBytesGenerator(long, long)> has return type <org.apache.flink.streaming.api.functions.source.datagen.SequenceGenerator> in (SequenceGeneratorVisitor.java:0)
237237
Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor.getSequenceStringGenerator(long, long)> has return type <org.apache.flink.streaming.api.functions.source.datagen.SequenceGenerator> in (SequenceGeneratorVisitor.java:0)
238238
Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor.visit(org.apache.flink.table.types.logical.BigIntType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.SequenceGenerator.longGenerator(long, long)> in (SequenceGeneratorVisitor.java:172)
@@ -593,7 +593,7 @@ Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.com
593593
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.endInput()> calls method <org.apache.flink.streaming.api.functions.sink.filesystem.Buckets.onProcessingTime(long)> in (AbstractStreamingWriter.java:202)
594594
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.endInput()> calls method <org.apache.flink.streaming.api.functions.sink.filesystem.StreamingFileSinkHelper.snapshotState(long)> in (AbstractStreamingWriter.java:203)
595595
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.initializeState(org.apache.flink.runtime.state.StateInitializationContext)> calls constructor <org.apache.flink.streaming.api.functions.sink.filesystem.StreamingFileSinkHelper.<init>(org.apache.flink.streaming.api.functions.sink.filesystem.Buckets, boolean, org.apache.flink.api.common.state.OperatorStateStore, org.apache.flink.streaming.runtime.tasks.ProcessingTimeService, long)> in (AbstractStreamingWriter.java:141)
596-
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.initializeState(org.apache.flink.runtime.state.StateInitializationContext)> calls method <org.apache.flink.shaded.guava32.com.google.common.collect.Lists.newArrayList(java.lang.Iterable)> in (AbstractStreamingWriter.java:164)
596+
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.initializeState(org.apache.flink.runtime.state.StateInitializationContext)> calls method <org.apache.flink.shaded.guava33.com.google.common.collect.Lists.newArrayList(java.lang.Iterable)> in (AbstractStreamingWriter.java:164)
597597
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.initializeState(org.apache.flink.runtime.state.StateInitializationContext)> calls method <org.apache.flink.streaming.api.functions.sink.filesystem.Buckets.setBucketLifeCycleListener(org.apache.flink.streaming.api.functions.sink.filesystem.BucketLifeCycleListener)> in (AbstractStreamingWriter.java:120)
598598
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.initializeState(org.apache.flink.runtime.state.StateInitializationContext)> calls method <org.apache.flink.streaming.api.functions.sink.filesystem.Buckets.setFileLifeCycleListener(org.apache.flink.streaming.api.functions.sink.filesystem.FileLifeCycleListener)> in (AbstractStreamingWriter.java:134)
599599
Method <org.apache.flink.connector.file.table.stream.AbstractStreamingWriter.initializeState(org.apache.flink.runtime.state.StateInitializationContext)> calls method <org.apache.flink.streaming.api.functions.sink.filesystem.legacy.StreamingFileSink$BucketsBuilder.createBuckets(int)> in (AbstractStreamingWriter.java:116)

‎flink-clients/src/main/java/org/apache/flink/client/program/StreamContextEnvironment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import org.apache.flink.util.FlinkRuntimeException;
3737
import org.apache.flink.util.ShutdownHookUtil;
3838

39-
import org.apache.flink.shaded.guava32.com.google.common.collect.MapDifference;
40-
import org.apache.flink.shaded.guava32.com.google.common.collect.Maps;
39+
import org.apache.flink.shaded.guava33.com.google.common.collect.MapDifference;
40+
import org.apache.flink.shaded.guava33.com.google.common.collect.Maps;
4141

4242
import org.slf4j.Logger;
4343
import org.slf4j.LoggerFactory;

‎flink-clients/src/main/java/org/apache/flink/client/program/rest/UrlPrefixDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import java.util.Collection;
3232

33-
import static org.apache.flink.shaded.guava32.com.google.common.base.Preconditions.checkNotNull;
33+
import static org.apache.flink.shaded.guava33.com.google.common.base.Preconditions.checkNotNull;
3434

3535
/**
3636
* This class decorates the URL of the original message headers by adding a prefix. The purpose of

‎flink-clients/src/test/java/org/apache/flink/client/deployment/application/JarManifestParserTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.flink.client.program.PackagedProgram;
2222
import org.apache.flink.client.testjar.TestJob;
2323

24-
import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList;
25-
import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap;
24+
import org.apache.flink.shaded.guava33.com.google.common.collect.ImmutableList;
25+
import org.apache.flink.shaded.guava33.com.google.common.collect.ImmutableMap;
2626

2727
import org.junit.jupiter.api.Test;
2828
import org.junit.jupiter.api.io.TempDir;

‎flink-clients/src/test/java/org/apache/flink/client/program/PerJobMiniClusterFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.flink.runtime.testutils.CancelableInvokable;
3333
import org.apache.flink.runtime.testutils.WaitingCancelableInvokable;
3434

35-
import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap;
35+
import org.apache.flink.shaded.guava33.com.google.common.collect.ImmutableMap;
3636

3737
import org.junit.jupiter.api.AfterEach;
3838
import org.junit.jupiter.api.Test;

‎flink-clients/src/test/java/org/apache/flink/client/testjar/ForbidConfigurationJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
2424
import org.apache.flink.streaming.api.functions.sink.v2.DiscardingSink;
2525

26-
import org.apache.flink.shaded.guava32.com.google.common.collect.Lists;
26+
import org.apache.flink.shaded.guava33.com.google.common.collect.Lists;
2727

2828
/** Simulate a class setting a configuration. */
2929
public class ForbidConfigurationJob {

‎flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/AbstractStreamingWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.apache.flink.streaming.api.watermark.Watermark;
3636
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
3737

38-
import org.apache.flink.shaded.guava32.com.google.common.collect.Lists;
38+
import org.apache.flink.shaded.guava33.com.google.common.collect.Lists;
3939

4040
import java.util.List;
4141

‎flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/table/FileSystemOutputFormatTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.flink.types.Row;
2929
import org.apache.flink.types.RowUtils;
3030

31-
import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap;
31+
import org.apache.flink.shaded.guava33.com.google.common.collect.ImmutableMap;
3232

3333
import org.apache.commons.io.FileUtils;
3434
import org.junit.jupiter.api.AfterEach;

‎flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormatBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.flink.annotation.VisibleForTesting;
2323
import org.apache.flink.util.Preconditions;
2424

25-
import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.FutureCallback;
25+
import org.apache.flink.shaded.guava33.com.google.common.util.concurrent.FutureCallback;
2626

2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;

‎flink-core/src/main/java/org/apache/flink/api/common/io/ratelimiting/GuavaFlinkConnectorRateLimiter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.apache.flink.api.common.functions.RuntimeContext;
2222

23-
import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.RateLimiter;
23+
import org.apache.flink.shaded.guava33.com.google.common.util.concurrent.RateLimiter;
2424

2525
/**
2626
* An implementation of {@link FlinkConnectorRateLimiter} that uses Guava's RateLimiter for rate

0 commit comments

Comments
 (0)