You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/11/02 07:09:50 UTC
[flink] branch master updated (5d4a2b6674a -> 8c28fd3fc75)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from 5d4a2b6674a [hotfix][doc] `FlinkKafkaConsumer` is deprecated and will be removed with Flink 1.17 instead of 1.15 since Flink 1.16 release branch has code freeze and will be released soon.
new 5c68ef0e28c [hotfix][rest][tests] Cleanup JarUploadHandlerTest
new 59137cb7e07 [hotfix][tests] Remove deprecated Log4j API usages
new 39f616e23ad [hotfix] Remove deprecated testcontainers API usages
new 2df4f53a44a [hotfix] Remove deprecated Assertj API usages
new 8c28fd3fc75 [hotfix] Remove various deprecated API usages
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../client/program/rest/RestClusterClientTest.java | 4 ++--
.../kinesis/testutils/KinesaliteContainer.java | 2 +-
.../sink/throwable/FatalExceptionClassifierTest.java | 4 ++--
.../apache/flink/connectors/hive/HiveDialectITCase.java | 2 +-
.../flink/streaming/tests/PeriodicStreamingJob.java | 4 +++-
.../util/kafka/containers/SchemaRegistryContainer.java | 2 +-
.../apache/flink/fs/s3/common/MinioTestContainer.java | 2 +-
.../flink/metrics/util/MetricReporterTestUtils.java | 5 ++---
.../runtime/jobmanager/JMXJobManagerMetricTest.java | 13 +------------
.../webmonitor/handlers/JarUploadHandlerTest.java | 17 ++++++-----------
.../flink/table/codesplit/JavaCodeSplitterTest.java | 8 ++++----
.../apache/flink/table/utils/TypeMappingUtilsTest.java | 2 +-
.../testutils/logging/LoggerAuditingExtension.java | 3 ++-
.../flink/testutils/logging/TestLoggerResource.java | 7 ++++++-
.../flink/streaming/util/TestStreamEnvironment.java | 2 +-
.../test/java/org/apache/flink/yarn/YarnTestBase.java | 3 ++-
16 files changed, 36 insertions(+), 44 deletions(-)
[flink] 03/05: [hotfix] Remove deprecated testcontainers API usages
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 39f616e23ad4e3bf08be9cfe1aad5b5958d803e7
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 1 15:26:40 2022 +0100
[hotfix] Remove deprecated testcontainers API usages
---
.../apache/flink/connectors/kinesis/testutils/KinesaliteContainer.java | 2 +-
.../flink/tests/util/kafka/containers/SchemaRegistryContainer.java | 2 +-
.../src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-connectors/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connectors/kinesis/testutils/KinesaliteContainer.java b/flink-connectors/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connectors/kinesis/testutils/KinesaliteContainer.java
index 42593e559f4..b4044a52942 100644
--- a/flink-connectors/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connectors/kinesis/testutils/KinesaliteContainer.java
+++ b/flink-connectors/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connectors/kinesis/testutils/KinesaliteContainer.java
@@ -62,7 +62,7 @@ public class KinesaliteContainer extends GenericContainer<KinesaliteContainer> {
/** Returns the endpoint url to access the container from outside the docker network. */
public String getContainerEndpointUrl() {
- return String.format(URL_FORMAT, getContainerIpAddress(), getMappedPort(PORT));
+ return String.format(URL_FORMAT, getHost(), getMappedPort(PORT));
}
/** Returns the endpoint url to access the host from inside the docker network. */
diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/src/test/java/org/apache/flink/tests/util/kafka/containers/SchemaRegistryContainer.java b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/src/test/java/org/apache/flink/tests/util/kafka/containers/SchemaRegistryContainer.java
index 6bb6ac588f1..e71d7ac6687 100644
--- a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/src/test/java/org/apache/flink/tests/util/kafka/containers/SchemaRegistryContainer.java
+++ b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/src/test/java/org/apache/flink/tests/util/kafka/containers/SchemaRegistryContainer.java
@@ -46,6 +46,6 @@ public class SchemaRegistryContainer extends GenericContainer<SchemaRegistryCont
}
public String getSchemaRegistryUrl() {
- return "http://" + getContainerIpAddress() + ":" + getMappedPort(8082);
+ return "http://" + getHost() + ":" + getMappedPort(8082);
}
}
diff --git a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java
index c691ab9d716..f55075a7bfd 100644
--- a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java
+++ b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java
@@ -101,7 +101,7 @@ public class MinioTestContainer extends GenericContainer<MinioTestContainer> {
}
private String getHttpEndpoint() {
- return String.format("http://%s:%s", getContainerIpAddress(), getMappedPort(DEFAULT_PORT));
+ return String.format("http://%s:%s", getHost(), getMappedPort(DEFAULT_PORT));
}
/**
[flink] 05/05: [hotfix] Remove various deprecated API usages
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8c28fd3fc754ffa9572ee9ee6ba8b6d5dbf32cdc
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 1 15:28:48 2022 +0100
[hotfix] Remove various deprecated API usages
---
.../apache/flink/streaming/tests/PeriodicStreamingJob.java | 4 +++-
.../apache/flink/metrics/util/MetricReporterTestUtils.java | 5 ++---
.../flink/runtime/jobmanager/JMXJobManagerMetricTest.java | 13 +------------
.../apache/flink/streaming/util/TestStreamEnvironment.java | 2 +-
.../src/test/java/org/apache/flink/yarn/YarnTestBase.java | 3 ++-
5 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java b/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java
index 4bb64791245..4677b431627 100644
--- a/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java
+++ b/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java
@@ -65,7 +65,9 @@ public class PeriodicStreamingJob {
DataStream<Tuple> rows = sEnv.addSource(generator);
DataStream<Tuple> result =
- rows.keyBy(1).window(TumblingProcessingTimeWindows.of(Time.seconds(5))).sum(0);
+ rows.keyBy(tuple -> tuple.getField(1))
+ .window(TumblingProcessingTimeWindows.of(Time.seconds(5)))
+ .sum(0);
result.writeAsText(outputPath + "/result.txt", FileSystem.WriteMode.OVERWRITE)
.setParallelism(1);
diff --git a/flink-metrics/flink-metrics-core/src/test/java/org/apache/flink/metrics/util/MetricReporterTestUtils.java b/flink-metrics/flink-metrics-core/src/test/java/org/apache/flink/metrics/util/MetricReporterTestUtils.java
index 4b4533f4a2d..5705483becd 100644
--- a/flink-metrics/flink-metrics-core/src/test/java/org/apache/flink/metrics/util/MetricReporterTestUtils.java
+++ b/flink-metrics/flink-metrics-core/src/test/java/org/apache/flink/metrics/util/MetricReporterTestUtils.java
@@ -25,8 +25,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/** Test utils for metric reporters. */
public class MetricReporterTestUtils {
@@ -49,6 +48,6 @@ public class MetricReporterTestUtils {
false)
.map(MetricReporterFactory::getClass)
.collect(Collectors.toSet());
- assertThat(loadedFactories, hasItem(clazz));
+ assertThat(loadedFactories).contains(clazz);
}
}
diff --git a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
index ce7bba65dbf..667b6d1d5cc 100644
--- a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
+++ b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
@@ -26,7 +26,6 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.core.testutils.OneShotLatch;
import org.apache.flink.metrics.jmx.JMXReporterFactory;
-import org.apache.flink.runtime.checkpoint.CheckpointRetentionPolicy;
import org.apache.flink.runtime.execution.Environment;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobgraph.JobGraphBuilder;
@@ -98,17 +97,7 @@ class JMXJobManagerMetricTest {
final JobCheckpointingSettings jobCheckpointingSettings =
new JobCheckpointingSettings(
- new CheckpointCoordinatorConfiguration(
- 500,
- 500,
- 50,
- 5,
- CheckpointRetentionPolicy.NEVER_RETAIN_AFTER_TERMINATION,
- true,
- false,
- 0,
- 0),
- null);
+ CheckpointCoordinatorConfiguration.builder().build(), null);
final JobGraph jobGraph =
JobGraphBuilder.newStreamingJobGraphBuilder()
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java
index b56fdfe449c..86da4b2a66f 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/streaming/util/TestStreamEnvironment.java
@@ -114,7 +114,7 @@ public class TestStreamEnvironment extends StreamExecutionEnvironment {
randomize(conf, ExecutionCheckpointingOptions.ENABLE_UNALIGNED, true, false);
randomize(
conf,
- ExecutionCheckpointingOptions.ALIGNMENT_TIMEOUT,
+ ExecutionCheckpointingOptions.ALIGNED_CHECKPOINT_TIMEOUT,
Duration.ofSeconds(0),
Duration.ofMillis(100),
Duration.ofSeconds(2));
diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
index 6e25d4378ce..f540e96c9e9 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java
@@ -75,6 +75,7 @@ import java.io.InputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -235,7 +236,7 @@ public abstract class YarnTestBase {
File classPathFile =
TestUtils.findFile(start, (dir, name) -> name.equals("yarn.classpath"));
return FileUtils.readFileToString(
- classPathFile); // potential NPE is supposed to be fatal
+ classPathFile, StandardCharsets.UTF_8); // potential NPE is supposed to be fatal
} catch (Throwable t) {
LOG.error(
"Error while getting YARN classpath in {}",
[flink] 02/05: [hotfix][tests] Remove deprecated Log4j API usages
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 59137cb7e07c364b12c669cc9aae89fc7c5c4ae7
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 1 15:14:00 2022 +0100
[hotfix][tests] Remove deprecated Log4j API usages
---
.../apache/flink/testutils/logging/LoggerAuditingExtension.java | 3 ++-
.../org/apache/flink/testutils/logging/TestLoggerResource.java | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/LoggerAuditingExtension.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/LoggerAuditingExtension.java
index 8394e924589..8ca1b5cc1da 100644
--- a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/LoggerAuditingExtension.java
+++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/LoggerAuditingExtension.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.core.config.Property;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -62,7 +63,7 @@ public class LoggerAuditingExtension implements BeforeEachCallback, AfterEachCal
loggingEvents = new ConcurrentLinkedQueue<>();
Appender testAppender =
- new AbstractAppender("test-appender", null, null, false) {
+ new AbstractAppender("test-appender", null, null, false, Property.EMPTY_ARRAY) {
@Override
public void append(LogEvent event) {
loggingEvents.add(event.getMessage().getFormattedMessage());
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/TestLoggerResource.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/TestLoggerResource.java
index de9d4e103a0..75550a8ec7b 100644
--- a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/TestLoggerResource.java
+++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/logging/TestLoggerResource.java
@@ -26,6 +26,7 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
import org.junit.rules.ExternalResource;
@@ -101,7 +102,11 @@ public class TestLoggerResource extends ExternalResource {
final Appender testAppender =
new AbstractAppender(
- "test-appender-" + generateRandomString(), levelFilter, null, false) {
+ "test-appender-" + generateRandomString(),
+ levelFilter,
+ null,
+ false,
+ Property.EMPTY_ARRAY) {
@Override
public void append(LogEvent event) {
loggingEvents.add(event.getMessage().getFormattedMessage());
[flink] 04/05: [hotfix] Remove deprecated Assertj API usages
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 2df4f53a44abe80b246161b71dce2bbf997b0289
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 1 15:27:53 2022 +0100
[hotfix] Remove deprecated Assertj API usages
---
.../apache/flink/client/program/rest/RestClusterClientTest.java | 4 ++--
.../base/sink/throwable/FatalExceptionClassifierTest.java | 4 ++--
.../java/org/apache/flink/connectors/hive/HiveDialectITCase.java | 2 +-
.../org/apache/flink/table/codesplit/JavaCodeSplitterTest.java | 8 ++++----
.../java/org/apache/flink/table/utils/TypeMappingUtilsTest.java | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
index 9daa4e48f82..6c091ebf9a7 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
@@ -809,8 +809,8 @@ class RestClusterClientTest {
createRestClusterClient(serverAddress.getPort(), clientConfig)) {
assertThatThrownBy(() -> restClusterClient.submitJob(jobGraph).get())
.isInstanceOf(ExecutionException.class)
- .getCause()
- .getCause()
+ .cause()
+ .cause()
.isInstanceOf(FutureUtils.RetryException.class);
assertThat(failedRequest).hasValue(maxRetryAttempts + 1);
diff --git a/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/throwable/FatalExceptionClassifierTest.java b/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/throwable/FatalExceptionClassifierTest.java
index 60a856882c8..8e4350c8f64 100644
--- a/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/throwable/FatalExceptionClassifierTest.java
+++ b/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/throwable/FatalExceptionClassifierTest.java
@@ -101,7 +101,7 @@ public class FatalExceptionClassifierTest {
assertThat(caughtException.get())
.isInstanceOf(RuntimeException.class)
.hasMessage("Buffer manipulation calculations resulted in a reference exception")
- .getCause()
+ .cause()
.isInstanceOf(NullPointerException.class)
.hasMessage("Base NullPointerException");
}
@@ -131,7 +131,7 @@ public class FatalExceptionClassifierTest {
assertThat(caughtException)
.isInstanceOf(RuntimeException.class)
.hasMessage("Buffer manipulation calculations resulted in a calculation exception")
- .getCause()
+ .cause()
.isInstanceOf(ArithmeticException.class)
.hasMessage("Base arithmetic exception");
}
diff --git a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveDialectITCase.java b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveDialectITCase.java
index 32548dd731a..f88d4346fcc 100644
--- a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveDialectITCase.java
+++ b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveDialectITCase.java
@@ -1287,7 +1287,7 @@ public class HiveDialectITCase {
private void verifyUnsupportedOperation(String ddl) {
assertThatThrownBy(() -> tableEnv.executeSql(ddl))
.isInstanceOf(ValidationException.class)
- .getCause()
+ .cause()
.isInstanceOf(UnsupportedOperationException.class);
}
diff --git a/flink-table/flink-table-code-splitter/src/test/java/org/apache/flink/table/codesplit/JavaCodeSplitterTest.java b/flink-table/flink-table-code-splitter/src/test/java/org/apache/flink/table/codesplit/JavaCodeSplitterTest.java
index 4a8742ab119..0072c51f0a7 100644
--- a/flink-table/flink-table-code-splitter/src/test/java/org/apache/flink/table/codesplit/JavaCodeSplitterTest.java
+++ b/flink-table/flink-table-code-splitter/src/test/java/org/apache/flink/table/codesplit/JavaCodeSplitterTest.java
@@ -59,14 +59,14 @@ class JavaCodeSplitterTest {
@Test
public void testNullCode() {
assertThatThrownBy(() -> JavaCodeSplitter.split(null, 4000, 10000))
- .getCause()
+ .cause()
.hasMessage("code cannot be empty");
}
@Test
public void testEmptyCode() {
assertThatThrownBy(() -> JavaCodeSplitter.split("", 4000, 10000))
- .getCause()
+ .cause()
.hasMessage("code cannot be empty");
}
@@ -76,7 +76,7 @@ class JavaCodeSplitterTest {
() ->
JavaCodeSplitter.split(
"public interface DummyInterface {}", 0, 10000))
- .getCause()
+ .cause()
.hasMessage("maxMethodLength must be greater than 0");
}
@@ -84,7 +84,7 @@ class JavaCodeSplitterTest {
public void testWrongMaxClassMemberCount() {
assertThatThrownBy(
() -> JavaCodeSplitter.split("public interface DummyInterface {}", 10, 0))
- .getCause()
+ .cause()
.hasMessage("maxClassMemberCount must be greater than 0");
}
diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeMappingUtilsTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeMappingUtilsTest.java
index e6ac3e1bd25..c4a28ccb36b 100644
--- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeMappingUtilsTest.java
+++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/TypeMappingUtilsTest.java
@@ -160,7 +160,7 @@ class TypeMappingUtilsTest {
"Type DECIMAL(38, 10) of table field 'f0' does not match with the "
+ "physical type LEGACY('DECIMAL', 'DECIMAL') of the "
+ "'f0' field of the TableSource return type.")
- .getCause()
+ .cause()
.isInstanceOf(ValidationException.class)
.hasMessage("Legacy decimal type can only be mapped to DECIMAL(38, 18).");
}
[flink] 01/05: [hotfix][rest][tests] Cleanup JarUploadHandlerTest
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5c68ef0e28c7c974ec0492c1949ddcc8dd1d50a8
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Nov 1 15:11:29 2022 +0100
[hotfix][rest][tests] Cleanup JarUploadHandlerTest
---
.../webmonitor/handlers/JarUploadHandlerTest.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
index d16cc011f09..1344b376475 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
@@ -21,10 +21,10 @@ package org.apache.flink.runtime.webmonitor.handlers;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.runtime.dispatcher.DispatcherGateway;
import org.apache.flink.runtime.rest.handler.HandlerRequest;
-import org.apache.flink.runtime.rest.handler.HandlerRequestException;
import org.apache.flink.runtime.rest.handler.RestHandlerException;
import org.apache.flink.runtime.rest.messages.EmptyMessageParameters;
import org.apache.flink.runtime.rest.messages.EmptyRequestBody;
+import org.apache.flink.runtime.webmonitor.TestingDispatcherGateway;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.concurrent.Executors;
@@ -33,11 +33,8 @@ import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseSt
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import java.io.File;
-import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
@@ -51,14 +48,13 @@ class JarUploadHandlerTest {
private JarUploadHandler jarUploadHandler;
- @Mock private DispatcherGateway mockDispatcherGateway;
+ private final DispatcherGateway mockDispatcherGateway =
+ TestingDispatcherGateway.newBuilder().build();
private Path jarDir;
@BeforeEach
- void setUp(@TempDir File temporaryFolder) throws Exception {
- MockitoAnnotations.initMocks(this);
-
+ void setUp(@TempDir File temporaryFolder) {
jarDir = temporaryFolder.toPath();
jarUploadHandler =
new JarUploadHandler(
@@ -106,7 +102,7 @@ class JarUploadHandlerTest {
}
@Test
- void testFailedUpload() throws Exception {
+ void testFailedUpload() {
final Path uploadedFile = jarDir.resolve("FooBazzleExample.jar");
final HandlerRequest<EmptyRequestBody> request = createRequest(uploadedFile);
@@ -126,8 +122,7 @@ class JarUploadHandlerTest {
});
}
- private static HandlerRequest<EmptyRequestBody> createRequest(final Path uploadedFile)
- throws HandlerRequestException, IOException {
+ private static HandlerRequest<EmptyRequestBody> createRequest(final Path uploadedFile) {
return HandlerRequest.create(
EmptyRequestBody.getInstance(),
EmptyMessageParameters.getInstance(),