Skip to content

Commit 9d951cf

Browse files
grzegorz8grzegorz8
committed
Runn spotless:apply
1 parent a399bd0 commit 9d951cf

File tree

11 files changed

+83
-84
lines changed

11 files changed

+83
-84
lines changed

‎flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/elasticsearch/dialect/ElasticsearchDialectFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
2222
import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
2323

24-
/**
25-
* Factory for {@link ElasticsearchDialect}.
26-
*/
24+
/** Factory for {@link ElasticsearchDialect}. */
2725
public class ElasticsearchDialectFactory implements JdbcDialectFactory {
2826

2927
@Override

‎flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/elasticsearch/dialect/ElasticsearchRowConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ protected JdbcDeserializationConverter createInternalConverter(LogicalType type)
4848
case FLOAT:
4949
return val -> val;
5050
case DATE:
51-
return val -> (int) (((Timestamp) val).toLocalDateTime().toLocalDate().toEpochDay());
51+
return val ->
52+
(int) (((Timestamp) val).toLocalDateTime().toLocalDate().toEpochDay());
5253
default:
5354
return super.createInternalConverter(type);
5455
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/elasticsearch/ElasticsearchTestBase.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
import org.junit.jupiter.api.extension.ExtendWith;
2626

27-
/**
28-
* Base class for Elasticsearch testing.
29-
*/
27+
/** Base class for Elasticsearch testing. */
3028
@ExtendWith(ElasticsearchDatabase.class)
3129
public interface ElasticsearchTestBase extends DatabaseTest {
3230

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/elasticsearch/dialect/ElasticsearchDialectTypeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ protected List<TestItem> testData() {
3131

3232
// Not valid data
3333
createTestItem("CHAR", "The Elasticsearch dialect doesn't support type: CHAR(1)."),
34-
createTestItem("BINARY", "The Elasticsearch dialect doesn't support type: BINARY(1)."),
34+
createTestItem(
35+
"BINARY", "The Elasticsearch dialect doesn't support type: BINARY(1)."),
3536
createTestItem("TIME", "The Elasticsearch dialect doesn't support type: TIME(0)."),
3637
createTestItem(
3738
"VARBINARY(10)",
@@ -40,5 +41,4 @@ protected List<TestItem> testData() {
4041
"DECIMAL(10, 4)",
4142
"The Elasticsearch dialect doesn't support type: DECIMAL(10, 4)."));
4243
}
43-
4444
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/elasticsearch/dialect/ElasticsearchPreparedStatementTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,24 @@
2525

2626
import static org.assertj.core.api.Assertions.assertThat;
2727

28-
/**
29-
* Tests for {@link ElasticsearchPreparedStatementTest}.
30-
*/
28+
/** Tests for {@link ElasticsearchPreparedStatementTest}. */
3129
public class ElasticsearchPreparedStatementTest {
3230

3331
private final JdbcDialect dialect =
3432
JdbcDialectLoader.load(
3533
"jdbc:elasticsearch://localhost:9200/test", getClass().getClassLoader());
3634

3735
private final String[] fieldNames =
38-
new String[]{"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
39-
private final String[] keyFields = new String[]{"id", "__field_3__"};
36+
new String[] {"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
37+
private final String[] keyFields = new String[] {"id", "__field_3__"};
4038
private final String tableName = "tbl";
4139

4240
@Test
4341
void testRowExistsStatement() {
4442
String rowExistStmt = dialect.getRowExistsStatement(tableName, keyFields);
4543
assertThat(rowExistStmt)
46-
.isEqualTo("SELECT 1 FROM \"tbl\" WHERE \"id\" = :id AND \"__field_3__\" = :__field_3__");
44+
.isEqualTo(
45+
"SELECT 1 FROM \"tbl\" WHERE \"id\" = :id AND \"__field_3__\" = :__field_3__");
4746
}
4847

4948
@Test
@@ -55,5 +54,4 @@ void testSelectStatement() {
5554
+ "FROM \"tbl\" "
5655
+ "WHERE \"id\" = :id AND \"__field_3__\" = :__field_3__");
5756
}
58-
5957
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/elasticsearch/table/ElasticsearchDynamicTableSourceITCase.java

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@
6060
import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.tableRow;
6161
import static org.assertj.core.api.Assertions.assertThat;
6262

63-
/**
64-
* The Table Source ITCase for {@link ElasticsearchDialect}.
65-
*/
66-
public class ElasticsearchDynamicTableSourceITCase extends AbstractTestBase implements ElasticsearchTestBase {
63+
/** The Table Source ITCase for {@link ElasticsearchDialect}. */
64+
public class ElasticsearchDynamicTableSourceITCase extends AbstractTestBase
65+
implements ElasticsearchTestBase {
6766

6867
private ElasticsearchRestClient client;
6968
private TableEnvironment tEnv;
@@ -188,52 +187,52 @@ public void testFilter() {
188187

189188
// test TIMESTAMP filter
190189
assertThat(
191-
executeQuery(
192-
"SELECT * FROM FAKE_TABLE WHERE timestamp6_col = TIMESTAMP '2020-01-01 15:35:00.123456'"))
190+
executeQuery(
191+
"SELECT * FROM FAKE_TABLE WHERE timestamp6_col = TIMESTAMP '2020-01-01 15:35:00.123456'"))
193192
.containsExactly(onlyRow1);
194193

195194
// test the IN operator
196195
assertThat(
197-
executeQuery(
198-
"SELECT * FROM FAKE_TABLE WHERE 1 = idx AND double_col IN (100.1234, 101.1234)"))
196+
executeQuery(
197+
"SELECT * FROM FAKE_TABLE WHERE 1 = idx AND double_col IN (100.1234, 101.1234)"))
199198
.containsExactly(onlyRow1);
200199

201200
// test mixing AND and OR operator
202201
assertThat(
203-
executeQuery(
204-
"SELECT * FROM FAKE_TABLE WHERE idx = 1 AND double_col = 100.1234 OR double_col = 101.1234"))
202+
executeQuery(
203+
"SELECT * FROM FAKE_TABLE WHERE idx = 1 AND double_col = 100.1234 OR double_col = 101.1234"))
205204
.containsExactlyInAnyOrderElementsOf(twoRows);
206205

207206
// test mixing AND/OR with parenthesis, and the swapping the operand of equal expression
208207
assertThat(
209-
executeQuery(
210-
"SELECT * FROM FAKE_TABLE WHERE (2 = idx AND double_col = 100.1234) OR double_col = 101.1234"))
208+
executeQuery(
209+
"SELECT * FROM FAKE_TABLE WHERE (2 = idx AND double_col = 100.1234) OR double_col = 101.1234"))
211210
.containsExactly(onlyRow2);
212211

213212
// test Greater than, just to make sure we didnt break anything that we cannot pushdown
214213
assertThat(
215-
executeQuery(
216-
"SELECT * FROM FAKE_TABLE WHERE idx = 2 AND double_col > 100 OR double_col = 101.123"))
214+
executeQuery(
215+
"SELECT * FROM FAKE_TABLE WHERE idx = 2 AND double_col > 100 OR double_col = 101.123"))
217216
.containsExactly(onlyRow2);
218217

219218
// One more test of parenthesis
220219
assertThat(
221-
executeQuery(
222-
"SELECT * FROM FAKE_TABLE WHERE 2 = idx AND (double_col = 100.1234 OR double_col = 102.1234)"))
220+
executeQuery(
221+
"SELECT * FROM FAKE_TABLE WHERE 2 = idx AND (double_col = 100.1234 OR double_col = 102.1234)"))
223222
.isEmpty();
224223

225224
assertThat(
226-
executeQuery(
227-
"SELECT * FROM "
228-
+ partitionedTable
229-
+ " WHERE id = 2 AND double_col > 100 OR double_col = 101.123"))
225+
executeQuery(
226+
"SELECT * FROM "
227+
+ partitionedTable
228+
+ " WHERE id = 2 AND double_col > 100 OR double_col = 101.123"))
230229
.isEmpty();
231230

232231
assertThat(
233-
executeQuery(
234-
"SELECT * FROM "
235-
+ partitionedTable
236-
+ " WHERE 1 = id AND double_col IN (100.1234, 101.1234)"))
232+
executeQuery(
233+
"SELECT * FROM "
234+
+ partitionedTable
235+
+ " WHERE 1 = id AND double_col IN (100.1234, 101.1234)"))
237236
.containsExactly(onlyRow1);
238237
}
239238

@@ -403,8 +402,6 @@ protected List<Row> getTestData() {
403402
-1_223_372_036_854_775_807L,
404403
-123.5f,
405404
"other-text",
406-
LocalDate.parse("2020-01-02"))
407-
);
405+
LocalDate.parse("2020-01-02")));
408406
}
409-
410407
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/elasticsearch/ElasticsearchBulkBuilder.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,22 @@
3434

3535
import static java.lang.String.format;
3636

37-
/**
38-
* Creates content for Elastic Bulk API call.
39-
*/
37+
/** Creates content for Elastic Bulk API call. */
4038
public class ElasticsearchBulkBuilder {
4139

42-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
43-
.registerModule(new JavaTimeModule())
44-
.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
40+
private static final ObjectMapper OBJECT_MAPPER =
41+
new ObjectMapper()
42+
.registerModule(new JavaTimeModule())
43+
.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
4544

46-
public static String createBulkContent(TableRow schema, List<Row> data) throws JsonProcessingException {
45+
public static String createBulkContent(TableRow schema, List<Row> data)
46+
throws JsonProcessingException {
4747
StringBuilder builder = new StringBuilder();
4848
for (int i = 0; i < data.size(); ++i) {
49-
builder.append(format("{\"create\":{\"_index\":\"%s\",\"_id\":\"%d\"}}\n", schema.getTableName(), i + 1));
49+
builder.append(
50+
format(
51+
"{\"create\":{\"_index\":\"%s\",\"_id\":\"%d\"}}\n",
52+
schema.getTableName(), i + 1));
5053
builder.append(rowToJson(schema, data.get(i))).append('\n');
5154
}
5255
return builder.toString();
@@ -71,5 +74,4 @@ private static Object adjustValueIfNeeded(Object object) {
7174
return object;
7275
}
7376
}
74-
7577
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/elasticsearch/ElasticsearchDatabase.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@
3030
import static org.apache.flink.connector.jdbc.testutils.databases.elasticsearch.ElasticsearchMetadata.PASSWORD;
3131
import static org.apache.flink.connector.jdbc.testutils.databases.elasticsearch.ElasticsearchMetadata.USERNAME;
3232

33-
/**
34-
* Elasticsearch database for testing.
35-
*/
33+
/** Elasticsearch database for testing. */
3634
public class ElasticsearchDatabase extends DatabaseExtension implements ElasticsearchImages {
3735

38-
private static final ElasticsearchContainer CONTAINER = new ElasticsearchContainer(ELASTICSEARCH_8)
39-
.waitingFor(
40-
Wait.forHttp("/")
41-
.withBasicCredentials(USERNAME, PASSWORD)
42-
.withReadTimeout(Duration.ofMinutes(2)));
36+
private static final ElasticsearchContainer CONTAINER =
37+
new ElasticsearchContainer(ELASTICSEARCH_8)
38+
.waitingFor(
39+
Wait.forHttp("/")
40+
.withBasicCredentials(USERNAME, PASSWORD)
41+
.withReadTimeout(Duration.ofMinutes(2)));
4342

4443
private static ElasticsearchMetadata metadata;
4544
private static ElasticsearchRestClient client;
@@ -85,5 +84,4 @@ protected void stopDatabase() throws Exception {
8584
metadata = null;
8685
client = null;
8786
}
88-
8987
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/elasticsearch/ElasticsearchImages.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@
2121
public interface ElasticsearchImages {
2222

2323
String ELASTICSEARCH_8 = "docker.elastic.co/elasticsearch/elasticsearch:8.8.1";
24-
2524
}

‎flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/elasticsearch/ElasticsearchIndexSchemaBuilder.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,27 @@
5959
import static java.util.Arrays.stream;
6060
import static java.util.stream.Collectors.joining;
6161

62-
/**
63-
* Creates content for Elastic Index API call.
64-
*/
62+
/** Creates content for Elastic Index API call. */
6563
public class ElasticsearchIndexSchemaBuilder {
6664

6765
private static final ElasticsearchDataTypeMapper MAPPER = new ElasticsearchDataTypeMapper();
6866

6967
public static String buildIndexSchema(TableRow tableRow) {
70-
String fields = stream(tableRow.getTableDataFields())
71-
.map(field -> format("\"%s\": %s", field.getName(), field.getDataType().accept(MAPPER)))
72-
.collect(joining(", "));
73-
return "{\"settings\": {\"number_of_shards\": 1}, \"mappings\": {\"properties\": {" + fields + "}}}";
68+
String fields =
69+
stream(tableRow.getTableDataFields())
70+
.map(
71+
field ->
72+
format(
73+
"\"%s\": %s",
74+
field.getName(),
75+
field.getDataType().accept(MAPPER)))
76+
.collect(joining(", "));
77+
return "{\"settings\": {\"number_of_shards\": 1}, \"mappings\": {\"properties\": {"
78+
+ fields
79+
+ "}}}";
7480
}
7581

76-
/**
77-
* Maps Flink types to Elasticsearch types.
78-
*/
82+
/** Maps Flink types to Elasticsearch types. */
7983
private static class ElasticsearchDataTypeMapper
8084
implements DataTypeVisitor<String>, LogicalTypeVisitor<String> {
8185

@@ -246,5 +250,4 @@ public String visit(LogicalType other) {
246250
return other.accept(this);
247251
}
248252
}
249-
250253
}

0 commit comments

Comments
 (0)