Switch Apache transport to Airlift PemReader

drift-integration-tests/pom.xml

@@ -97,6 +97,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>security</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>stats</artifactId>

drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java

@@ -31,7 +31,6 @@
 import io.airlift.drift.integration.scribe.drift.DriftLogEntry;
 import io.airlift.drift.integration.scribe.drift.DriftResultCode;
 import io.airlift.drift.integration.scribe.drift.DriftScribe;
-import io.airlift.drift.transport.apache.client.PemReader;
 import io.airlift.drift.transport.netty.codec.Protocol;
 import io.airlift.drift.transport.netty.codec.Transport;
 import io.airlift.jmx.testing.TestingJmxModule;
@@ -55,7 +54,8 @@
 
 import static io.airlift.drift.client.guice.DriftClientBinder.driftClientBinder;
 import static io.airlift.drift.client.guice.MethodInvocationFilterBinder.staticFilterBinder;
-import static io.airlift.drift.transport.apache.client.PemReader.loadTrustStore;
+import static io.airlift.security.pem.PemReader.loadKeyStore;
+import static io.airlift.security.pem.PemReader.loadTrustStore;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
@@ -171,7 +171,7 @@ public static SSLContext getServerSslContext()
         trustManagerFactory.init(loadTrustStore(getCertificateChainFile()));
 
         KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-        keyManagerFactory.init(PemReader.loadKeyStore(getPrivateKeyFile(), getPrivateKeyFile(), Optional.empty()), new char[0]);
+        keyManagerFactory.init(loadKeyStore(getPrivateKeyFile(), getPrivateKeyFile(), Optional.empty()), new char[0]);
 
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);

drift-transport-apache/pom.xml

@@ -60,6 +60,11 @@
             <artifactId>concurrent</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>security</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>jmx</artifactId>

drift-transport-apache/src/main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java

@@ -20,6 +20,7 @@
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import io.airlift.drift.transport.client.MethodInvoker;
 import io.airlift.drift.transport.client.MethodInvokerFactory;
+import io.airlift.security.pem.PemReader;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;

pom.xml

@@ -149,6 +149,12 @@
                 <version>1.3</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.airlift</groupId>
+                <artifactId>security</artifactId>
+                <version>${dep.airlift.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.airlift</groupId>
                 <artifactId>stats</artifactId>