Skip to content

Commit 3c501bb

Browse files
supertophersuhomud
supertopher
authored and
suhomud
committed
Fixes Spotless and runs spotless (#13040)
zipped files with JSON extension made this task sad
1 parent 7a25d41 commit 3c501bb

File tree

95 files changed

+327
-333
lines changed

Some content is hidden

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

95 files changed

+327
-333
lines changed

‎airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) {
137137
config.get("username").asText(),
138138
config.has("password") ? config.get("password").asText() : null,
139139
ClickhouseDestination.DRIVER_CLASS,
140-
jdbcStr
141-
)
142-
);
140+
jdbcStr));
143141
}
144142

145143
@Override

‎airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import io.airbyte.integrations.base.JavaBaseConstants;
1616
import io.airbyte.integrations.destination.ExtendedNameTransformer;
1717
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
18+
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
1819
import java.sql.SQLException;
1920
import java.util.List;
2021
import java.util.stream.Collectors;
21-
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
2222
import org.junit.jupiter.api.Disabled;
2323
import org.testcontainers.containers.ClickHouseContainer;
2424

@@ -136,9 +136,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) {
136136
String.format(DatabaseDriver.CLICKHOUSE.getUrlFormatString(),
137137
config.get("host").asText(),
138138
config.get("port").asInt(),
139-
config.get("database").asText())
140-
)
141-
);
139+
config.get("database").asText())));
142140
}
143141

144142
@Override
@@ -197,4 +195,5 @@ public void testSyncWithNormalization(final String messagesFilename, final Strin
197195
public void specNormalizationValueShouldBeCorrect() throws Exception {
198196
super.specNormalizationValueShouldBeCorrect();
199197
}
198+
200199
}

‎airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseTestDataComparator.java

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1+
/*
2+
* Copyright (c) 2021 Airbyte, Inc., all rights reserved.
3+
*/
4+
15
package io.airbyte.integrations.destination.clickhouse;
26

37
import io.airbyte.integrations.destination.ExtendedNameTransformer;
48
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
5-
69
import java.util.ArrayList;
710
import java.util.List;
811

912
public class ClickhouseTestDataComparator extends AdvancedTestDataComparator {
1013

11-
private final ExtendedNameTransformer namingResolver = new ExtendedNameTransformer();
14+
private final ExtendedNameTransformer namingResolver = new ExtendedNameTransformer();
1215

13-
@Override
14-
protected List<String> resolveIdentifier(final String identifier) {
15-
final List<String> result = new ArrayList<>();
16-
final String resolved = namingResolver.getIdentifier(identifier);
17-
result.add(identifier);
18-
result.add(resolved);
19-
if (!resolved.startsWith("\"")) {
20-
result.add(resolved.toLowerCase());
21-
result.add(resolved.toUpperCase());
22-
}
23-
return result;
16+
@Override
17+
protected List<String> resolveIdentifier(final String identifier) {
18+
final List<String> result = new ArrayList<>();
19+
final String resolved = namingResolver.getIdentifier(identifier);
20+
result.add(identifier);
21+
result.add(resolved);
22+
if (!resolved.startsWith("\"")) {
23+
result.add(resolved.toLowerCase());
24+
result.add(resolved.toUpperCase());
2425
}
26+
return result;
27+
}
28+
2529
}

‎airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
import io.airbyte.integrations.base.ssh.SshTunnel;
1717
import io.airbyte.integrations.destination.ExtendedNameTransformer;
1818
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
19+
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
1920
import java.util.ArrayList;
2021
import java.util.List;
2122
import java.util.stream.Collectors;
22-
23-
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
2423
import org.junit.jupiter.api.Disabled;
2524
import org.testcontainers.containers.ClickHouseContainer;
2625

@@ -154,9 +153,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) {
154153
String.format(DatabaseDriver.CLICKHOUSE.getUrlFormatString(),
155154
config.get("host").asText(),
156155
config.get("port").asInt(),
157-
config.get("database").asText())
158-
)
159-
);
156+
config.get("database").asText())));
160157
}
161158

162159
@Override

‎airbyte-integrations/connectors/destination-clickhouse/src/test/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ void sanityTest() throws Exception {
134134
String.format("jdbc:clickhouse://%s:%s/%s",
135135
config.get("host").asText(),
136136
config.get("port").asText(),
137-
config.get("database").asText())
138-
)
139-
);
137+
config.get("database").asText())));
140138

141139
final List<JsonNode> actualRecords = database.bufferedResultSetQuery(
142140
connection -> connection.createStatement().executeQuery(

‎airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/GcsStorageOperations.java

+1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ protected void cleanUpObjects(final String bucket, final List<KeyVersion> keysTo
4949
protected Map<String, String> getMetadataMapping() {
5050
return new HashMap<>();
5151
}
52+
5253
}

‎airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/AbstractJdbcDestination.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ protected DataSource getDataSource(final JsonNode config) {
100100
jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null,
101101
driverClass,
102102
jdbcConfig.get("jdbc_url").asText(),
103-
getConnectionProperties(config)
104-
);
103+
getConnectionProperties(config));
105104
}
106105

107106
protected JdbcDatabase getDatabase(final DataSource dataSource) {
@@ -132,7 +131,8 @@ private void assertCustomParametersDontOverwriteDefaultParameters(final Map<Stri
132131
public AirbyteMessageConsumer getConsumer(final JsonNode config,
133132
final ConfiguredAirbyteCatalog catalog,
134133
final Consumer<AirbyteMessage> outputRecordCollector) {
135-
return JdbcBufferedConsumerFactory.create(outputRecordCollector, getDatabase(getDataSource(config)), sqlOperations, namingResolver, config, catalog);
134+
return JdbcBufferedConsumerFactory.create(outputRecordCollector, getDatabase(getDataSource(config)), sqlOperations, namingResolver, config,
135+
catalog);
136136
}
137137

138138
}

‎airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ private OnCloseFunction onCloseFunction(final JdbcDatabase database,
212212
}
213213
queryList.add(stagingOperations.copyTableQuery(database, schemaName, srcTableName, dstTableName));
214214
}
215-
stagingOperations.onDestinationCloseOperations(database, writeConfigs.stream().map(WriteConfig::getOutputSchemaName).collect(Collectors.toSet()));
215+
stagingOperations.onDestinationCloseOperations(database,
216+
writeConfigs.stream().map(WriteConfig::getOutputSchemaName).collect(Collectors.toSet()));
216217
LOGGER.info("Executing finalization of tables.");
217218
stagingOperations.executeTransaction(database, queryList);
218219
LOGGER.info("Finalizing tables in destination completed.");

‎airbyte-integrations/connectors/destination-jdbc/src/test/java/io/airbyte/integrations/destination/jdbc/SqlOperationsUtilsTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ void setup() {
5353
config.get("username").asText(),
5454
config.get("password").asText(),
5555
DatabaseDriver.POSTGRESQL.getDriverClassName(),
56-
config.get("jdbc_url").asText()
57-
)
58-
);
56+
config.get("jdbc_url").asText()));
5957

6058
uuidSupplier = mock(Supplier.class);
6159
}

‎airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) {
111111
String.format(DatabaseDriver.MARIADB.getUrlFormatString(),
112112
config.get("host").asText(),
113113
config.get("port").asInt(),
114-
config.get("database").asText())
115-
)
116-
);
114+
config.get("database").asText())));
117115
}
118116

119117
@Override

‎airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ private static Database getDatabaseFromConfig(final JsonNode config) {
111111
String.format(DatabaseDriver.MARIADB.getUrlFormatString(),
112112
config.get("host").asText(),
113113
config.get("port").asInt(),
114-
config.get("database").asText()), SQLDialect.MARIADB);
114+
config.get("database").asText()),
115+
SQLDialect.MARIADB);
115116
return new Database(dslContext);
116117
}
117118

‎airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.List;
2828
import java.util.stream.Collectors;
2929
import org.jooq.DSLContext;
30-
import org.jooq.SQLDialect;
3130
import org.junit.jupiter.api.AfterAll;
3231
import org.junit.jupiter.api.BeforeAll;
3332
import org.junit.jupiter.api.Test;
@@ -128,15 +127,15 @@ protected List<String> resolveIdentifier(final String identifier) {
128127
private List<JsonNode> retrieveRecordsFromTable(final String tableName, final String schemaName) throws SQLException {
129128
final DSLContext dslContext = DatabaseConnectionHelper.createDslContext(db, null);
130129
return new Database(dslContext).query(
131-
ctx -> {
132-
ctx.fetch(String.format("USE %s;", config.get("database")));
133-
return ctx
134-
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT))
135-
.stream()
136-
.map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat()))
137-
.map(Jsons::deserialize)
138-
.collect(Collectors.toList());
139-
});
130+
ctx -> {
131+
ctx.fetch(String.format("USE %s;", config.get("database")));
132+
return ctx
133+
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT))
134+
.stream()
135+
.map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat()))
136+
.map(Jsons::deserialize)
137+
.collect(Collectors.toList());
138+
});
140139
}
141140

142141
private static DSLContext getDslContext(final JsonNode config) {
@@ -146,7 +145,8 @@ private static DSLContext getDslContext(final JsonNode config) {
146145
DatabaseDriver.MSSQLSERVER.getDriverClassName(),
147146
String.format("jdbc:sqlserver://%s:%d",
148147
config.get("host").asText(),
149-
config.get("port").asInt()), null);
148+
config.get("port").asInt()),
149+
null);
150150
}
151151

152152
private static Database getDatabase(final DSLContext dslContext) {

‎airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import io.airbyte.commons.json.Jsons;
1111
import io.airbyte.commons.string.Strings;
1212
import io.airbyte.db.Database;
13+
import io.airbyte.db.factory.DSLContextFactory;
14+
import io.airbyte.db.factory.DatabaseDriver;
1315
import io.airbyte.integrations.base.JavaBaseConstants;
1416
import io.airbyte.integrations.destination.ExtendedNameTransformer;
1517
import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest;
1618
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
17-
import io.airbyte.db.factory.DSLContextFactory;
18-
import io.airbyte.db.factory.DatabaseDriver;
1919
import io.airbyte.test.utils.DatabaseConnectionHelper;
2020
import java.sql.SQLException;
2121
import java.util.List;
@@ -125,7 +125,8 @@ private static DSLContext getDslContext(final JsonNode config) {
125125
DatabaseDriver.MSSQLSERVER.getDriverClassName(),
126126
String.format("jdbc:sqlserver://%s:%d",
127127
config.get("host").asText(),
128-
config.get("port").asInt()), null);
128+
config.get("port").asInt()),
129+
null);
129130
}
130131

131132
private static Database getDatabase(final DSLContext dslContext) {

‎airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ protected List<String> resolveIdentifier(final String identifier) {
126126
private List<JsonNode> retrieveRecordsFromTable(final String tableName, final String schemaName) throws SQLException {
127127
final DSLContext dslContext = DatabaseConnectionHelper.createDslContext(db, SQLDialect.DEFAULT);
128128
return new Database(dslContext).query(
129-
ctx -> {
130-
ctx.fetch(String.format("USE %s;", config.get("database")));
131-
return ctx
132-
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT))
133-
.stream()
134-
.map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat()))
135-
.map(Jsons::deserialize)
136-
.collect(Collectors.toList());
137-
});
129+
ctx -> {
130+
ctx.fetch(String.format("USE %s;", config.get("database")));
131+
return ctx
132+
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT))
133+
.stream()
134+
.map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat()))
135+
.map(Jsons::deserialize)
136+
.collect(Collectors.toList());
137+
});
138138
}
139139

140140
@BeforeAll
@@ -151,7 +151,8 @@ private static DSLContext getDslContext(final JsonNode config) {
151151
DatabaseDriver.MSSQLSERVER.getDriverClassName(),
152152
String.format("jdbc:sqlserver://%s:%d",
153153
config.get("host").asText(),
154-
config.get("port").asInt()), null);
154+
config.get("port").asInt()),
155+
null);
155156
}
156157

157158
private static Database getDatabase(final DSLContext dslContext) {

‎airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.airbyte.commons.json.Jsons;
1212
import io.airbyte.db.Database;
1313
import io.airbyte.db.factory.DSLContextFactory;
14-
import io.airbyte.db.factory.DataSourceFactory;
1514
import io.airbyte.db.factory.DatabaseDriver;
1615
import io.airbyte.db.jdbc.JdbcUtils;
1716
import io.airbyte.integrations.base.JavaBaseConstants;
@@ -23,7 +22,6 @@
2322
import java.util.List;
2423
import java.util.Objects;
2524
import java.util.stream.Collectors;
26-
import javax.sql.DataSource;
2725
import org.apache.commons.lang3.RandomStringUtils;
2826
import org.jooq.DSLContext;
2927
import org.testcontainers.containers.JdbcDatabaseContainer;
@@ -130,7 +128,8 @@ private static Database getDatabaseFromConfig(final JsonNode config) {
130128
DatabaseDriver.MSSQLSERVER.getDriverClassName(),
131129
String.format("jdbc:sqlserver://%s:%s",
132130
config.get("host").asText(),
133-
config.get("port").asInt()), null);
131+
config.get("port").asInt()),
132+
null);
134133
return new Database(dslContext);
135134
}
136135

‎airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ private static DSLContext getDslContext(final JsonNode config) {
141141
String.format(DatabaseDriver.ORACLE.getUrlFormatString(),
142142
config.get("host").asText(),
143143
config.get("port").asInt(),
144-
config.get("sid").asText()), null);
144+
config.get("sid").asText()),
145+
null);
145146
}
146147

147148
@Override

‎airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/NneOracleDestinationAcceptanceTest.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ public void testEncryption() throws SQLException {
4141
config.get("host").asText(),
4242
config.get("port").asInt(),
4343
config.get("sid").asText()),
44-
getAdditionalProperties(algorithm)
45-
)
46-
);
44+
getAdditionalProperties(algorithm)));
4745

4846
final String networkServiceBanner =
4947
"select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)";
@@ -78,9 +76,7 @@ public void testCheckProtocol() throws SQLException {
7876
clone.get("host").asText(),
7977
clone.get("port").asInt(),
8078
clone.get("sid").asText()),
81-
getAdditionalProperties(algorithm)
82-
)
83-
);
79+
getAdditionalProperties(algorithm)));
8480

8581
final String networkServiceBanner = "SELECT sys_context('USERENV', 'NETWORK_PROTOCOL') as network_protocol FROM dual";
8682
final List<JsonNode> collect = database.queryJsons(networkServiceBanner);

‎airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ private Database getDatabaseFromConfig(final JsonNode config) {
162162
String.format(DatabaseDriver.ORACLE.getUrlFormatString(),
163163
config.get("host").asText(),
164164
config.get("port").asInt(),
165-
config.get("sid").asText()), null);
165+
config.get("sid").asText()),
166+
null);
166167
return new Database(dslContext);
167168
}
168169

‎airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ private List<JsonNode> retrieveRecordsFromTable(final String tableName, final St
124124
try (final DSLContext dslContext = getDSLContext(config)) {
125125
final List<org.jooq.Record> result = getDatabase(dslContext)
126126
.query(ctx -> ctx.fetch(
127-
String.format("SELECT * FROM %s.%s ORDER BY %s ASC", schemaName, tableName,
128-
OracleDestination.COLUMN_NAME_EMITTED_AT))
127+
String.format("SELECT * FROM %s.%s ORDER BY %s ASC", schemaName, tableName,
128+
OracleDestination.COLUMN_NAME_EMITTED_AT))
129129
.stream()
130130
.collect(Collectors.toList()));
131131
return result
@@ -142,7 +142,8 @@ private static DSLContext getDSLContext(final JsonNode config) {
142142
String.format(DatabaseDriver.ORACLE.getUrlFormatString(),
143143
config.get("host").asText(),
144144
config.get("port").asInt(),
145-
config.get("sid").asText()), null);
145+
config.get("sid").asText()),
146+
null);
146147
}
147148

148149
private static Database getDatabase(final DSLContext dslContext) {

‎airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ private static Database getDatabaseFromConfig(final JsonNode config) {
120120
config.get("host").asText(),
121121
config.get("port").asInt(),
122122
config.get("database").asText()),
123-
SQLDialect.POSTGRES
124-
)
125-
);
123+
SQLDialect.POSTGRES));
126124
}
127125

128126
private List<JsonNode> retrieveRecordsFromTable(final String tableName, final String schemaName) throws Exception {

‎airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftDestination.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* {@link RedshiftInsertDestination} for more detail. The second inserts via streaming the data to
2020
* an S3 bucket, and Cop-ing the date into Redshift. This is more efficient, and recommended for
2121
* production workloads, but does require users to set up an S3 bucket and pass in additional
22-
* credentials. See {@link RedshiftStagingS3Destination} for more detail. This class inspect the given
23-
* arguments to determine which strategy to use.
22+
* credentials. See {@link RedshiftStagingS3Destination} for more detail. This class inspect the
23+
* given arguments to determine which strategy to use.
2424
*/
2525
public class RedshiftDestination extends SwitchingDestination<RedshiftDestination.DestinationType> {
2626

0 commit comments

Comments
 (0)