refactor(challenge): change ChallengeNonceStore type from abstract class to interface

WE2-608

Signed-off-by: Mart Somermaa <[email protected]>

Author: mrts

src/main/java/eu/webeid/security/challenge/ChallengeNonceStore.java

@@ -31,11 +31,13 @@
 /**
  * A store for storing generated challenge nonces and accessing their generation time.
  */
-public abstract class ChallengeNonceStore {
+public interface ChallengeNonceStore {
 
-    public abstract void put(ChallengeNonce challengeNonce);
+    void put(ChallengeNonce challengeNonce);
 
-    public final ChallengeNonce getAndRemove() throws AuthTokenException {
+    ChallengeNonce getAndRemoveImpl();
+
+    default ChallengeNonce getAndRemove() throws AuthTokenException {
         final ChallengeNonce challengeNonce = getAndRemoveImpl();
         if (challengeNonce == null) {
             throw new ChallengeNonceNotFoundException();
@@ -46,6 +48,4 @@ public final ChallengeNonce getAndRemove() throws AuthTokenException {
         return challengeNonce;
     }
 
-    protected abstract ChallengeNonce getAndRemoveImpl();
-
 }

src/main/java/eu/webeid/security/exceptions/AuthTokenSignatureValidationException.java

@@ -28,7 +28,7 @@
 public class AuthTokenSignatureValidationException extends AuthTokenException {
 
     public AuthTokenSignatureValidationException() {
-        super("Token signature validation has failed");
+        super("Token signature validation has failed. Check that the origin and nonce are correct.");
     }
 
 }

src/test/java/eu/webeid/security/challenge/InMemoryChallengeNonceStore.java

@@ -22,20 +22,20 @@
 
 package eu.webeid.security.challenge;
 
-public class InMemoryChallengeNonceStore extends ChallengeNonceStore {
+public class InMemoryChallengeNonceStore implements ChallengeNonceStore {
 
     private ChallengeNonce challengeNonce;
 
     @Override
-    protected ChallengeNonce getAndRemoveImpl() {
-        final ChallengeNonce result = challengeNonce;
-        challengeNonce = null;
-        return result;
+    public void put(ChallengeNonce challengeNonce) {
+        this.challengeNonce = challengeNonce;
     }
 
     @Override
-    public void put(ChallengeNonce challengeNonce) {
-        this.challengeNonce = challengeNonce;
+    public ChallengeNonce getAndRemoveImpl() {
+        final ChallengeNonce result = challengeNonce;
+        challengeNonce = null;
+        return result;
     }
 
 }