From 961515d330ebfa8981cf87361006bc9257ccbcde Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@oath.com>
Date: Wed, 25 Oct 2017 14:52:47 +0200
Subject: Move code for generating PEM string to separate method

---
 .../AthenzInstanceProviderServiceTest.java         | 38 ++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'athenz-identity-provider-service/src')

diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzInstanceProviderServiceTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzInstanceProviderServiceTest.java
index 2d057875d24..e4d18e34928 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzInstanceProviderServiceTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzInstanceProviderServiceTest.java
@@ -64,7 +64,6 @@ import java.io.UncheckedIOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
-import java.security.Key;
 import java.security.KeyManagementException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -242,16 +241,8 @@ public class AthenzInstanceProviderServiceTest {
             KeyPairGenerator rsa = KeyPairGenerator.getInstance("RSA");
             rsa.initialize(2048);
             keyPair = rsa.genKeyPair();
-            publicKey = pemEncode(keyPair.getPublic());
-            privateKey = pemEncode(keyPair.getPrivate());
-        }
-
-        private static String pemEncode(Key key) throws IOException {
-            StringWriter stringWriter = new StringWriter();
-            JcaPEMWriter pemWriter = new JcaPEMWriter(stringWriter);
-            pemWriter.writeObject(key);
-            pemWriter.flush();
-            return stringWriter.toString();
+            publicKey = toPemString(keyPair.getPublic());
+            privateKey = toPemString(keyPair.getPrivate());
         }
 
         @Override
@@ -291,19 +282,26 @@ public class AthenzInstanceProviderServiceTest {
                         dnName, BigInteger.ONE, new Date(), endDate, dnName, keyPair.getPublic());
                 certBuilder.addExtension(new ASN1ObjectIdentifier("2.5.29.19"), true, new BasicConstraints(true));
 
-                X509Certificate certificate = new JcaX509CertificateConverter().setProvider(new BouncyCastleProvider())
+                X509Certificate certificate = new JcaX509CertificateConverter()
+                        .setProvider(new BouncyCastleProvider())
                         .getCertificate(certBuilder.build(contentSigner));
-                try (StringWriter stringWriter = new StringWriter();
-                     JcaPEMWriter pemWriter = new JcaPEMWriter(stringWriter)) {
-                    pemWriter.writeObject(certificate);
-                    pemWriter.flush();
-                    return stringWriter.toString();
-                }
+                return toPemString(certificate);
             } catch (CertificateException | CertIOException | OperatorCreationException e) {
                 throw new RuntimeException(e);
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
             }
         }
     }
+
+    private static String toPemString(Object keyOrCertificate) {
+        try (StringWriter stringWriter = new StringWriter();
+             JcaPEMWriter pemWriter = new JcaPEMWriter(stringWriter)) {
+            pemWriter.writeObject(keyOrCertificate);
+            pemWriter.flush();
+            return stringWriter.toString();
+        } catch (CertIOException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
 }
-- 
cgit v1.2.3