This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push: new 31ae746 [hotfix][tests] Deduplicate ParameterProperty 31ae746 is described below commit 31ae7467ba846289c4e56118d96a3ae47d81bc68 Author: Chesnay Schepler <ches...@apache.org> AuthorDate: Wed Sep 14 11:13:42 2022 +0200 [hotfix][tests] Deduplicate ParameterProperty The class is already available part of the flink-test-utils. --- .../pom.xml | 6 +++ .../flink/test/parameters/ParameterProperty.java | 58 ---------------------- 2 files changed, 6 insertions(+), 58 deletions(-) diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml index b7b6e1d..deca450 100644 --- a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml +++ b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/pom.xml @@ -46,6 +46,12 @@ under the License. <version>${flink.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-test-utils</artifactId> + <version>${flink.version}</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-runtime</artifactId> diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/src/main/java/org/apache/flink/test/parameters/ParameterProperty.java b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/src/main/java/org/apache/flink/test/parameters/ParameterProperty.java deleted file mode 100644 index a2bcfdf..0000000 --- a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch-e2e-tests-common/src/main/java/org/apache/flink/test/parameters/ParameterProperty.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.flink.test.parameters; - -import java.util.Optional; -import java.util.function.Function; - -/** System-property based parameters for tests and resources. */ -public class ParameterProperty<V> { - - private final String propertyName; - private final Function<String, V> converter; - - public ParameterProperty(final String propertyName, final Function<String, V> converter) { - this.propertyName = propertyName; - this.converter = converter; - } - - public String getPropertyName() { - return propertyName; - } - - /** - * Retrieves the value of this property. - * - * @return Optional containing the value of this property - */ - public Optional<V> get() { - final String value = System.getProperty(propertyName); - return value == null ? Optional.empty() : Optional.of(converter.apply(value)); - } - - /** - * Retrieves the value of this property, or the given default if no value was set. - * - * @return the value of this property, or the given default if no value was set - */ - public V get(final V defaultValue) { - final String value = System.getProperty(propertyName); - return value == null ? defaultValue : converter.apply(value); - } -}