From 2157f30f50a0626e725c6398e534d10d845219e0 Mon Sep 17 00:00:00 2001
From: "David J. M. Karlsen" <david@davidkarlsen.com>
Date: Tue, 2 Apr 2019 09:29:23 +0200
Subject: [PATCH] fix test

---
 ...ovider.java => PrivateKeyProviderTestHelper.java} | 12 +++++++++---
 .../systest/jaxrs/security/httpsignature/server.xml  |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
 rename systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/{PrivateKeyProvider.java => PrivateKeyProviderTestHelper.java} (84%)

diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/PrivateKeyProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/PrivateKeyProviderTestHelper.java
similarity index 84%
rename from systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/PrivateKeyProvider.java
rename to systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/PrivateKeyProviderTestHelper.java
index cd699f0a285..4df1c0f9c0a 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/PrivateKeyProvider.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/httpsignature/PrivateKeyProviderTestHelper.java
@@ -28,13 +28,14 @@
 import java.security.cert.CertificateException;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.rs.security.httpsignature.provider.PrivateKeyProvider;
 
 /**
  * Just a test-class to provide a static method to easily load a PrivateKey in spring config.
  */
-public final class PrivateKeyProvider {
+public final class PrivateKeyProviderTestHelper implements PrivateKeyProvider {
 
-    private PrivateKeyProvider() {
+    private PrivateKeyProviderTestHelper() {
         // complete
     }
 
@@ -42,7 +43,7 @@ public static PrivateKey loadPrivateKey() {
         KeyStore keyStore;
         try {
             keyStore = KeyStore.getInstance("JKS");
-            keyStore.load(ClassLoaderUtils.getResourceAsStream("keys/bob.jks", PrivateKeyProvider.class),
+            keyStore.load(ClassLoaderUtils.getResourceAsStream("keys/bob.jks", PrivateKeyProviderTestHelper.class),
                           "password".toCharArray());
             return (PrivateKey)keyStore.getKey("bob", "password".toCharArray());
         } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException
@@ -51,4 +52,9 @@ public static PrivateKey loadPrivateKey() {
             return null;
         }
     }
+
+    @Override
+    public PrivateKey getKey(String keyId) {
+        return loadPrivateKey();
+    }
 }
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml
index 226ce4266d5..d3e819ecc0c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml
@@ -114,7 +114,7 @@ under the License.
     
     <bean id="messageSigner" class="org.apache.cxf.rs.security.httpsignature.MessageSigner">
         <constructor-arg>
-            <bean class="org.apache.cxf.systest.jaxrs.security.httpsignature.PrivateKeyProvider" factory-method="loadPrivateKey" />
+            <bean class="org.apache.cxf.systest.jaxrs.security.httpsignature.PrivateKeyProviderTestHelper" />
         </constructor-arg>
         <constructor-arg value="bob-key-id" />
     </bean>