embulk-output-ftp 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a88449e154fbbfecf92cd8485a113593f18a25
-  data.tar.gz: aa3623b5ecbf40b048c64d45048e4701ecaf0a2f
+  metadata.gz: 174e14d80670723ddaceb63c1a1e509c1470b00b
+  data.tar.gz: dd8e77c8aaf86c32fda61afd3fec7795ef97963a
 SHA512:
-  metadata.gz: fff7e207c69d760a2eaf7928c804719396a21d0d45895e9f35331304608d5c69294784ed601f7a64ac087abedb3923b9b5e5e154f43da35e7db04142757ddfa5
-  data.tar.gz: 8947a389dc42ca8a90b15b6b9856b3a4bb22b52307431cfb0916238830ba056d7c9853d902f9a45c1a6a9a0be7592d8a3cd17136be15a27136c6af224f37b712
+  metadata.gz: ac46b66aa680cf73dc5f171d14de403d45d375201ade7a950dc5983b6ee67cfcfd6662de15260e88234fdaa494ec08482cb3d419a7d3eb94f4b653269577e291
+  data.tar.gz: f387f775895d3f523f27ec4d8ef902e644960b98e9fdd0096705c1e7ef757e1742ec6731339418ab6086abceb7e040e97ed7c42c3994fe7a17c008ea27a47bd5

data/.travis.yml

@@ -2,8 +2,6 @@ language: java
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
-  - openjdk7
 
 script:
   - ./gradlew gem

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.8 - 2018-07-04
+* [maintenance] Only support Java8 [#16](https://github.com/embulk/embulk-output-ftp/pull/16)
+* [maintenance] Use embulk-util-ftp from Bintray [#15](https://github.com/embulk/embulk-output-ftp/pull/15)
+
 ## 0.1.7 - 2017-02-24
 
 * [maintenance] Don't retry when Code:550(Permission denied) error happens [#13](https://github.com/embulk/embulk-output-ftp/pull/13)

data/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.jfrog.bintray" version "1.1"
+    id "com.jfrog.bintray" version "1.7"
     id "com.github.jruby-gradle.base" version "0.1.5"
     id "java"
     id "checkstyle"
@@ -9,20 +9,24 @@ import com.github.jrubygradle.JRubyExec
 repositories {
     mavenCentral()
     jcenter()
+    maven {
+        url 'https://dl.bintray.com/embulk-input-ftp/maven'
+    }
 }
 configurations {
     provided
 }
 
-version = "0.1.7"
+version = "0.2.0"
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.9"
     provided "org.embulk:embulk-core:0.8.9"
     compile files("libs/ftp4j-1.7.2.jar")
+    compile 'org.embulk.input.ftp:embulk-util-ftp:0.1.6'
     compile "org.bouncycastle:bcpkix-jdk15on:1.52"
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-core:0.8.9:tests"

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 13 12:41:02 JST 2016
+#Sun Jan 08 00:35:58 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

data/src/main/java/org/embulk/output/ftp/FtpFileOutputPlugin.java

@@ -19,13 +19,14 @@ import org.embulk.config.Task;
 import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
 import org.embulk.config.UserDataException;
-import org.embulk.output.ftp.SSLPlugins.SSLPluginConfig;
 import org.embulk.spi.Buffer;
 import org.embulk.spi.Exec;
 import org.embulk.spi.FileOutputPlugin;
 import org.embulk.spi.TransactionalFileOutput;
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
 import org.embulk.spi.util.RetryExecutor.Retryable;
+import org.embulk.util.ftp.SSLPlugins;
+import org.embulk.util.ftp.SSLPlugins.SSLPluginConfig;
 import org.slf4j.Logger;
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
 

data/src/test/java/org/embulk/output/ftp/TestFtpFileOutputPlugin.java

@@ -20,6 +20,8 @@ import org.embulk.spi.OutputPlugin;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TransactionalFileOutput;
 import org.embulk.standards.CsvParserPlugin;
+import org.embulk.util.ftp.SSLPlugins;
+import org.embulk.util.ftp.SSLPlugins.SSLPluginConfig;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -60,15 +60,14 @@ files:
 - lib/embulk/output/ftp.rb
 - libs/ftp4j-1.7.2.jar
 - src/main/java/org/embulk/output/ftp/FtpFileOutputPlugin.java
-- src/main/java/org/embulk/output/ftp/SSLPlugins.java
-- src/main/java/org/embulk/output/ftp/TrustManagers.java
 - src/test/java/org/embulk/output/ftp/TestFtpFileOutputPlugin.java
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
 - classpath/bcpkix-jdk15on-1.52.jar
 - classpath/bcprov-jdk15on-1.52.jar
-- classpath/embulk-output-ftp-0.1.7.jar
 - classpath/ftp4j-1.7.2.jar
+- classpath/embulk-util-ftp-0.1.6.jar
+- classpath/embulk-output-ftp-0.2.0.jar
 homepage: https://github.com/embulk/embulk-output-ftp
 licenses:
 - Apache 2.0

data/src/main/java/org/embulk/output/ftp/SSLPlugins.java

@@ -1,260 +0,0 @@
-package org.embulk.output.ftp;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigException;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.X509TrustManager;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.security.GeneralSecurityException;
-import java.security.KeyManagementException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-public class SSLPlugins
-{
-    // SSLPlugins is only for SSL clients. SSL server implementation is out ouf scope.
-
-    private SSLPlugins()
-    {
-    }
-
-    public interface SSLPluginTask
-    {
-        @Config("ssl_verify")
-        @ConfigDefault("null")
-        Optional<Boolean> getSslVerify();
-
-        @Config("ssl_verify_hostname")
-        @ConfigDefault("true")
-        boolean getSslVerifyHostname();
-
-        @Config("ssl_trusted_ca_cert_file")
-        @ConfigDefault("null")
-        Optional<String> getSslTrustedCaCertFile();
-
-        @Config("ssl_trusted_ca_cert_data")
-        @ConfigDefault("null")
-        Optional<String> getSslTrustedCaCertData();
-    }
-
-    private static enum VerifyMode
-    {
-        NO_VERIFY,
-        CERTIFICATES,
-        JVM_DEFAULT;
-    }
-
-    public static class SSLPluginConfig
-    {
-        static SSLPluginConfig NO_VERIFY = new SSLPluginConfig(VerifyMode.NO_VERIFY, false, ImmutableList.<byte[]>of());
-
-        private final VerifyMode verifyMode;
-        private final boolean verifyHostname;
-        private final List<X509Certificate> certificates;
-
-        @JsonCreator
-        private SSLPluginConfig(
-            @JsonProperty("verifyMode") VerifyMode verifyMode,
-            @JsonProperty("verifyHostname") boolean verifyHostname,
-            @JsonProperty("certificates") List<byte[]> certificates)
-        {
-            this.verifyMode = verifyMode;
-            this.verifyHostname = verifyHostname;
-            this.certificates = ImmutableList.copyOf(
-                    Lists.transform(certificates, new Function<byte[], X509Certificate>() {
-                        public X509Certificate apply(byte[] data)
-                        {
-                            try (ByteArrayInputStream in = new ByteArrayInputStream(data)) {
-                                CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                                return (X509Certificate) cf.generateCertificate(in);
-                            }
-                            catch (IOException | CertificateException ex) {
-                                throw new RuntimeException(ex);
-                            }
-                        }
-                    })
-                );
-        }
-
-        SSLPluginConfig(List<X509Certificate> certificates, boolean verifyHostname)
-        {
-            this.verifyMode = VerifyMode.CERTIFICATES;
-            this.verifyHostname = verifyHostname;
-            this.certificates = certificates;
-        }
-
-        static SSLPluginConfig useJvmDefault(boolean verifyHostname)
-        {
-            return new SSLPluginConfig(VerifyMode.JVM_DEFAULT, verifyHostname, ImmutableList.<byte[]>of());
-        }
-
-        @JsonProperty("verifyMode")
-        private VerifyMode getVerifyMode()
-        {
-            return verifyMode;
-        }
-
-        @JsonProperty("verifyHostname")
-        private boolean getVerifyHostname()
-        {
-            return verifyHostname;
-        }
-
-        @JsonProperty("certificates")
-        private List<byte[]> getCertData()
-        {
-            return Lists.transform(certificates, new Function<X509Certificate, byte[]>() {
-                public byte[] apply(X509Certificate cert)
-                {
-                    try {
-                        return cert.getEncoded();
-                    }
-                    catch (CertificateEncodingException ex) {
-                        throw new RuntimeException(ex);
-                    }
-                }
-            });
-        }
-
-        @JsonIgnore
-        public X509TrustManager[] newTrustManager()
-        {
-            try {
-                switch (verifyMode) {
-                case NO_VERIFY:
-                    return new X509TrustManager[] { getNoVerifyTrustManager() };
-                case CERTIFICATES:
-                    return TrustManagers.newTrustManager(certificates);
-                default: // JVM_DEFAULT
-                    return TrustManagers.newDefaultJavaTrustManager();
-                }
-            }
-            catch (IOException | GeneralSecurityException ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-    }
-
-    public static enum DefaultVerifyMode
-    {
-        VERIFY_BY_JVM_TRUSTED_CA_CERTS,
-        NO_VERIFY;
-    }
-
-    public static SSLPluginConfig configure(SSLPluginTask task)
-    {
-        return configure(task, DefaultVerifyMode.VERIFY_BY_JVM_TRUSTED_CA_CERTS);
-    }
-
-    public static SSLPluginConfig configure(SSLPluginTask task, DefaultVerifyMode defaultVerifyMode)
-    {
-        boolean verify = task.getSslVerify().or(defaultVerifyMode != DefaultVerifyMode.NO_VERIFY);
-        if (verify) {
-            Optional<List<X509Certificate>> certs = readTrustedCertificates(task);
-            if (certs.isPresent()) {
-                return new SSLPluginConfig(certs.get(), task.getSslVerifyHostname());
-            }
-            else {
-                return SSLPluginConfig.useJvmDefault(task.getSslVerifyHostname());
-            }
-        }
-        else {
-            return SSLPluginConfig.NO_VERIFY;
-        }
-    }
-
-    private static Optional<List<X509Certificate>> readTrustedCertificates(SSLPluginTask task)
-    {
-        String optionName;
-        Reader reader;
-        if (task.getSslTrustedCaCertData().isPresent()) {
-            optionName = "ssl_trusted_ca_cert_data";
-            reader = new StringReader(task.getSslTrustedCaCertData().get());
-        }
-        else if (task.getSslTrustedCaCertFile().isPresent()) {
-            optionName = "ssl_trusted_ca_cert_file '" + task.getSslTrustedCaCertFile().get() + "'";
-            try {
-                reader = new FileReader(task.getSslTrustedCaCertFile().get());
-            }
-            catch (IOException ex) {
-                throw new ConfigException(String.format("Failed to open %s", optionName), ex);
-            }
-        }
-        else {
-            return Optional.absent();
-        }
-
-        List<X509Certificate> certs;
-        try (Reader r = reader) {
-            certs = TrustManagers.readPemEncodedX509Certificates(r);
-            if (certs.isEmpty()) {
-                throw new ConfigException(String.format("%s does not include valid X.509 PEM certificates", optionName));
-            }
-        }
-        catch (CertificateException | IOException ex) {
-            throw new ConfigException(String.format("Failed to read %s", optionName), ex);
-        }
-
-        return Optional.of(certs);
-    }
-
-    public static SSLSocketFactory newSSLSocketFactory(SSLPluginConfig config, String hostname)
-    {
-        try {
-            return TrustManagers.newSSLSocketFactory(
-                    null,  // TODO sending client certificate is not implemented yet
-                    config.newTrustManager(),
-                    config.getVerifyHostname() ? hostname : null);
-        }
-        catch (KeyManagementException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private static class NoVerifyTrustManager implements X509TrustManager
-    {
-        static final NoVerifyTrustManager INSTANCE = new NoVerifyTrustManager();
-
-        private NoVerifyTrustManager()
-        {
-        }
-
-        @Override
-        public X509Certificate[] getAcceptedIssuers()
-        {
-            return null;
-        }
-
-        @Override
-        public void checkClientTrusted(X509Certificate[] certs, String authType)
-        {
-        }
-
-        @Override
-        public void checkServerTrusted(X509Certificate[] certs, String authType)
-        {
-        }
-    }
-
-    private static X509TrustManager getNoVerifyTrustManager()
-    {
-        return NoVerifyTrustManager.INSTANCE;
-    }
-}

data/src/main/java/org/embulk/output/ftp/TrustManagers.java

@@ -1,285 +0,0 @@
-package org.embulk.output.ftp;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.openssl.PEMException;
-import org.bouncycastle.openssl.PEMParser;
-import sun.security.ssl.SSLSocketImpl;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.PKIXParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TrustManagers
-{
-    private TrustManagers()
-    {
-    }
-
-    public static KeyStore readDefaultJavaKeyStore()
-            throws IOException, KeyStoreException, CertificateException
-    {
-        String path = (System.getProperty("java.home") + "/lib/security/cacerts").replace('/', File.separatorChar);
-        try {
-            KeyStore keyStore = KeyStore.getInstance("JKS");
-            try (FileInputStream in = new FileInputStream(path)) {
-                keyStore.load(in, null);  // password=null because cacerts file is not encrypted
-            }
-            return keyStore;
-        }
-        catch (NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);  // TODO assertion exception?
-        }
-    }
-
-    public static List<X509Certificate> readDefaultJavaTrustedCertificates()
-            throws IOException, CertificateException, KeyStoreException, InvalidAlgorithmParameterException
-    {
-        KeyStore keyStore = readDefaultJavaKeyStore();
-        PKIXParameters params = new PKIXParameters(keyStore);
-        List<X509Certificate> certs = new ArrayList<>();
-        for (TrustAnchor trustAnchor : params.getTrustAnchors()) {
-            certs.add(trustAnchor.getTrustedCert());
-        }
-        return certs;
-    }
-
-    public static List<X509Certificate> readPemEncodedX509Certificates(Reader reader)
-            throws IOException, CertificateException
-    {
-        // this method abuses CertificateParsingException because its javadoc says
-        // CertificateParsingException is only for DER-encoded formats.
-
-        JcaX509CertificateConverter conv = new JcaX509CertificateConverter();
-        List<X509Certificate> certs = new ArrayList<>();
-
-        try {
-            PEMParser pemParser = new PEMParser(reader);
-            // PEMParser#close is unnecessary because it just closes underlying reader
-
-            while (true) {
-                Object pem = pemParser.readObject();
-
-                if (pem == null) {
-                    break;
-                }
-
-                if (pem instanceof X509CertificateHolder) {
-                    X509Certificate cert = conv.getCertificate((X509CertificateHolder) pem);
-                    certs.add(cert);
-                }
-            }
-        }
-        catch (PEMException ex) {
-            // throw when parsing PemObject to Object fails
-            throw new CertificateParsingException(ex);
-        }
-        catch (IOException ex) {
-            if (ex.getClass().equals(IOException.class)) {
-                String message = ex.getMessage();
-                if (message.startsWith("unrecognised object: ")) {
-                    // thrown at org.bouncycastle.openssl.PemParser.readObject when key type (header of a pem) is
-                    // unknown.
-                    throw new CertificateParsingException(ex);
-                }
-                else if (message.startsWith("-----END ") && message.endsWith(" not found")) {
-                    // thrown at org.bouncycastle.util.io.pem.PemReader.loadObject when a pem file format is invalid
-                    throw new CertificateParsingException(ex);
-                }
-            }
-            else {
-                throw ex;
-            }
-        }
-
-        return certs;
-    }
-
-    public static KeyStore buildKeyStoreFromTrustedCertificates(List<X509Certificate> certificates)
-            throws KeyStoreException
-    {
-        KeyStore keyStore = KeyStore.getInstance("JKS");
-        try {
-            keyStore.load(null);
-        }
-        catch (IOException | CertificateException | NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);
-        }
-        int i = 0;
-        for (X509Certificate cert : certificates) {
-            keyStore.setCertificateEntry("cert_" + i, cert);
-            i++;
-        }
-        return keyStore;
-    }
-
-    public static X509TrustManager[] newTrustManager(List<X509Certificate> trustedCertificates)
-            throws KeyStoreException
-    {
-        try {
-            TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            KeyStore keyStore = buildKeyStoreFromTrustedCertificates(trustedCertificates);
-            factory.init(keyStore);
-            List<X509TrustManager> tms = new ArrayList<>();
-            for (TrustManager tm : factory.getTrustManagers()) {
-                if (tm instanceof X509TrustManager) {
-                    tms.add((X509TrustManager) tm);
-                }
-            }
-            return tms.toArray(new X509TrustManager[tms.size()]);
-        }
-        catch (NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);  // TODO assertion exception?
-        }
-    }
-
-    public static X509TrustManager[] newDefaultJavaTrustManager()
-            throws IOException, CertificateException, KeyStoreException, InvalidAlgorithmParameterException
-    {
-        return newTrustManager(readDefaultJavaTrustedCertificates());
-    }
-
-    public static SSLContext newSSLContext(KeyManager[] keyManager, X509TrustManager[] trustManager)
-            throws KeyManagementException
-    {
-        try {
-            SSLContext context = SSLContext.getInstance("TLS");
-            context.init(
-                    keyManager,
-                    trustManager,
-                    new SecureRandom());
-            return context;
-        }
-        catch (NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public static SSLSocketFactory newSSLSocketFactory(KeyManager[] keyManager, X509TrustManager[] trustManager, String verifyHostname)
-            throws KeyManagementException
-    {
-        SSLContext context = newSSLContext(keyManager, trustManager);
-        SSLSocketFactory factory = context.getSocketFactory();
-        if (verifyHostname == null) {
-            return factory;
-        }
-        else {
-            return new VerifyHostNameSSLSocketFactory(factory, verifyHostname);
-        }
-    }
-
-    private static class VerifyHostNameSSLSocketFactory
-            extends SSLSocketFactory
-    {
-        private final SSLSocketFactory next;
-        private final String hostname;
-
-        public VerifyHostNameSSLSocketFactory(SSLSocketFactory next, String hostname)
-        {
-            this.next = next;
-            this.hostname = hostname;
-        }
-
-        @Override
-        public String[] getDefaultCipherSuites()
-        {
-            return next.getDefaultCipherSuites();
-        }
-
-        @Override
-        public String[] getSupportedCipherSuites()
-        {
-            return next.getSupportedCipherSuites();
-        }
-
-        @Override
-        public Socket createSocket(Socket s, String host, int port, boolean autoClose)
-                throws IOException
-        {
-            Socket sock = next.createSocket(s, host, port, autoClose);
-            setSSLParameters(sock, false);
-            return sock;
-        }
-
-        @Override
-        public Socket createSocket(String host, int port)
-                throws IOException, UnknownHostException
-        {
-            Socket sock = next.createSocket(host, port);
-            setSSLParameters(sock, false);
-            return sock;
-        }
-
-        @Override
-        public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
-                throws IOException, UnknownHostException
-        {
-            Socket sock = next.createSocket(host, port, localHost, localPort);
-            setSSLParameters(sock, false);
-            return sock;
-        }
-
-        @Override
-        public Socket createSocket(InetAddress host, int port)
-                throws IOException
-        {
-            Socket sock = next.createSocket(host, port);
-            setSSLParameters(sock, true);
-            return sock;
-        }
-
-        @Override
-        public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
-                throws IOException
-        {
-            Socket sock = next.createSocket(address, port, localAddress, localPort);
-            setSSLParameters(sock, true);
-            return sock;
-        }
-
-        private void setSSLParameters(Socket sock, boolean setHostname)
-        {
-            if (sock instanceof SSLSocket) {
-                SSLSocket s = (SSLSocket) sock;
-                String identAlgorithm = s.getSSLParameters().getEndpointIdentificationAlgorithm();
-                if (identAlgorithm != null && identAlgorithm.equalsIgnoreCase("HTTPS")) {
-                    // hostname verification is already configured.
-                } else {
-                    if (setHostname && s instanceof SSLSocketImpl) {
-                        ((SSLSocketImpl) s).setHost(hostname);
-                    }
-                    SSLParameters params = s.getSSLParameters();
-                    params.setEndpointIdentificationAlgorithm("HTTPS");
-                    s.setSSLParameters(params);
-                    // s.startHandshake
-                }
-            }
-        }
-    }
-}