Make PemKeyStoreProvider an static inner class

2 files changed, 13 insertions, 20 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemKeyStoreProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemKeyStoreProvider.java
deleted file mode 100644
index c1fcf8c33bf..00000000000
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemKeyStoreProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.ssl.pem;
-
-import java.security.Provider;
-
-/**
- * @author Tony Vaagenes
- */
-public class PemKeyStoreProvider extends Provider {
-
-    public static final String name = "PEMKeyStoreProvider";
-    public static final double version = 1;
-    public static final String description = "Provides PEM keystore support";
-
-    public PemKeyStoreProvider() {
-        super(name, version, description);
-        putService(new Service(this, "KeyStore", "PEM", PemKeyStore. class.getName(), PemKeyStore.aliases, PemKeyStore.attributes));
-    }
-
-}
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java
index bf91f0eb259..bbb8232f78e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java
@@ -10,6 +10,7 @@ import java.io.IOException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
 import java.security.Security;
 import java.security.cert.CertificateException;
 
@@ -50,4 +51,16 @@ public class PemSslKeyStore extends SslKeyStore {
         return keyStore;
     }
 
+    private static class PemKeyStoreProvider extends Provider {
+
+        static final String NAME = "PEMKeyStoreProvider";
+        static final double VERSION = 1;
+        static final String DESCRIPTION = "Provides PEM keystore support";
+
+        PemKeyStoreProvider() {
+            super(NAME, VERSION, DESCRIPTION);
+            putService(new Service(this, "KeyStore", "PEM", PemKeyStore. class.getName(), PemKeyStore.aliases, PemKeyStore.attributes));
+        }
+
+    }
 }