Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FLINK-32194][connectors/elasticsearch] Remove the dependency on flink-shaded #65

Merged
merged 1 commit into from
May 29, 2023
Merged

[FLINK-32194][connectors/elasticsearch] Remove the dependency on flink-shaded #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ ij_java_doc_preserve_line_breaks = false
# ij_java_generate_final_locals = false
# ij_java_generate_final_parameters = false
# ij_java_if_brace_force = never
ij_java_imports_layout = org.apache.flink.**,|,org.apache.flink.shaded.**,|,*,|,javax.**,|,java.**,|,scala.**,|,$*
ij_java_imports_layout = org.apache.flink.**,|,*,|,javax.**,|,java.**,|,scala.**,|,$*
# ij_java_indent_case_from_switch = true
# ij_java_insert_inner_class_imports = false
# ij_java_insert_override_annotation = true
Expand Down
5 changes: 2 additions & 3 deletions .../test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import org.apache.flink.test.junit5.MiniClusterExtension;
import org.apache.flink.util.TestLoggerExtension;

import org.apache.flink.shaded.guava30.com.google.common.collect.Lists;

import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
Expand All @@ -51,6 +49,7 @@
import javax.annotation.Nullable;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.function.BiFunction;
Expand Down Expand Up @@ -206,7 +205,7 @@ public Tuple2<Integer, String> map(Long value) throws Exception {

private static List<BiFunction<String, String, ElasticsearchEmitter<Tuple2<Integer, String>>>>
elasticsearchEmitters() {
return Lists.newArrayList(TestEmitter::jsonEmitter, TestEmitter::smileEmitter);
return Arrays.asList(TestEmitter::jsonEmitter, TestEmitter::smileEmitter);
}

private static class FailingMapper implements MapFunction<Long, Long>, CheckpointListener {
Expand Down
7 changes: 0 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ under the License.

<properties>
<flink.version>1.17.0</flink.version>
<flink.shaded.version>16.1</flink.shaded.version>

<jackson-bom.version>2.13.4.20221013</jackson-bom.version>
<junit4.version>4.13.2</junit4.version>
Expand All @@ -72,12 +71,6 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-force-shading</artifactId>
<version>${flink.shaded.version}</version>
</dependency>

<!-- Root dependencies for all projects -->

<!-- Logging API -->
Expand Down
6 changes: 1 addition & 5 deletions tools/maven/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ This file is based on the checkstyle file of Apache Beam.
<!-- Checks for out of order import statements. -->
<property name="severity" value="error"/>
<property name="groups"
value="org.apache.flink,org.apache.flink.shaded,*,javax,java,scala"/>
value="org.apache.flink,*,javax,java,scala"/>
<property name="separated" value="true"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
<property name="option" value="bottom"/>
Expand Down Expand Up @@ -224,10 +224,6 @@ This file is based on the checkstyle file of Apache Beam.
<property name="illegalPkgs" value="io.netty"/>
<message key="import.illegal" value="{0}; Use flink-shaded-netty instead."/>
</module>
<module name="IllegalImport">
<property name="illegalPkgs" value="com.google.common"/>
<message key="import.illegal" value="{0}; Use flink-shaded-guava instead."/>
</module>

<module name="RedundantModifier">
<!-- Checks for redundant modifiers on various symbol definitions.
Expand Down
Loading