Skip to content

Commit 3816031

Browse files
Merge pull request #67 from trocco-io/fix-lint
fix lint
2 parents a0b186f + 431b203 commit 3816031

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

src/main/java/org/embulk/output/SnowflakeOutputPlugin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import org.embulk.config.ConfigException;
99
import org.embulk.config.TaskSource;
1010
import org.embulk.output.jdbc.*;
11+
import org.embulk.output.snowflake.PrivateKeyReader;
1112
import org.embulk.output.snowflake.SnowflakeCopyBatchInsert;
1213
import org.embulk.output.snowflake.SnowflakeOutputConnection;
1314
import org.embulk.output.snowflake.SnowflakeOutputConnector;
1415
import org.embulk.output.snowflake.StageIdentifier;
1516
import org.embulk.output.snowflake.StageIdentifierHolder;
16-
import org.embulk.output.snowflake.PrivateKeyReader;
1717
import org.embulk.spi.Column;
1818
import org.embulk.spi.ColumnVisitor;
1919
import org.embulk.spi.OutputPlugin;
@@ -104,7 +104,8 @@ protected JdbcOutputConnector getConnector(PluginTask task, boolean retryableMet
104104
try {
105105
props.put("privateKey", PrivateKeyReader.get(t.getPrivateKey()));
106106
} catch (IOException e) {
107-
// Because the source of newConnection definition does not assume IOException, change it to ConfigException.
107+
// Because the source of newConnection definition does not assume IOException, change it to
108+
// ConfigException.
108109
throw new ConfigException(e);
109110
}
110111
}
Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
package org.embulk.output.snowflake;
22

3-
import net.snowflake.client.jdbc.internal.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
4-
import net.snowflake.client.jdbc.internal.org.bouncycastle.jce.provider.BouncyCastleProvider;
5-
import net.snowflake.client.jdbc.internal.org.bouncycastle.openssl.PEMParser;
6-
import net.snowflake.client.jdbc.internal.org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
7-
83
import java.io.IOException;
94
import java.io.StringReader;
105
import java.security.PrivateKey;
116
import java.security.Security;
7+
import net.snowflake.client.jdbc.internal.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
8+
import net.snowflake.client.jdbc.internal.org.bouncycastle.jce.provider.BouncyCastleProvider;
9+
import net.snowflake.client.jdbc.internal.org.bouncycastle.openssl.PEMParser;
10+
import net.snowflake.client.jdbc.internal.org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
1211

13-
// ref: https://docs.snowflake.com/en/developer-guide/jdbc/jdbc-configure#privatekey-property-in-connection-properties
14-
public class PrivateKeyReader
15-
{
16-
public static PrivateKey get(String pemString) throws IOException {
17-
Security.addProvider(new BouncyCastleProvider());
18-
PEMParser pemParser = new PEMParser(new StringReader(pemString));
19-
Object pemObject = pemParser.readObject();
20-
pemParser.close();
12+
// ref:
13+
// https://docs.snowflake.com/en/developer-guide/jdbc/jdbc-configure#privatekey-property-in-connection-properties
14+
public class PrivateKeyReader {
15+
public static PrivateKey get(String pemString) throws IOException {
16+
Security.addProvider(new BouncyCastleProvider());
17+
PEMParser pemParser = new PEMParser(new StringReader(pemString));
18+
Object pemObject = pemParser.readObject();
19+
pemParser.close();
2120

22-
PrivateKeyInfo privateKeyInfo;
23-
if (pemObject instanceof PrivateKeyInfo) {
24-
privateKeyInfo = (PrivateKeyInfo) pemObject;
25-
} else {
26-
throw new IllegalArgumentException("Provided PEM does not contain a valid Private Key");
27-
}
28-
JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME);
29-
return converter.getPrivateKey(privateKeyInfo);
21+
PrivateKeyInfo privateKeyInfo;
22+
if (pemObject instanceof PrivateKeyInfo) {
23+
privateKeyInfo = (PrivateKeyInfo) pemObject;
24+
} else {
25+
throw new IllegalArgumentException("Provided PEM does not contain a valid Private Key");
3026
}
31-
27+
JcaPEMKeyConverter converter =
28+
new JcaPEMKeyConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME);
29+
return converter.getPrivateKey(privateKeyInfo);
30+
}
3231
}

0 commit comments

Comments
 (0)