Remove PKIUtil.ECDSA_CURVES

This Map is only used to initialize a constant, remove that indirection.

Change-Id: Ifa2553dc54cd88fdaea38ac8cf25867973a5bcf0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-encrypt-service/api/src/main/java/org/opendaylight/aaa/encrypt/PKIUtil.java b/aaa-encrypt-service/api/src/main/java/org/opendaylight/aaa/encrypt/PKIUtil.java
index 128a84d9c20911aa1f5e872d920478078ec58218..563810c790ed5ddd5a3fa78ffa93c81c3d0b2468 100644 (file)
--- a/aaa-encrypt-service/api/src/main/java/org/opendaylight/aaa/encrypt/PKIUtil.java
+++ b/aaa-encrypt-service/api/src/main/java/org/opendaylight/aaa/encrypt/PKIUtil.java
@@ -32,8 +32,6 @@ import java.security.spec.ECPublicKeySpec;
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Arrays;
 import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
 import org.bouncycastle.jce.ECNamedCurveTable;
 import org.bouncycastle.jce.ECPointUtil;
@@ -83,16 +81,8 @@ public class PKIUtil {
         return () -> factory;
     }
 
-    private static final Map<String, String> ECDSA_CURVES = new HashMap<>();
-
-    static {
-        ECDSA_CURVES.put("nistp256", "secp256r1");
-        ECDSA_CURVES.put("nistp384", "secp384r1");
-        ECDSA_CURVES.put("nistp512", "secp512r1");
-    }
-
     private static final String ECDSA_SUPPORTED_CURVE_NAME = "nistp256";
-    private static final String ECDSA_SUPPORTED_CURVE_NAME_SPEC = ECDSA_CURVES.get(ECDSA_SUPPORTED_CURVE_NAME);
+    private static final String ECDSA_SUPPORTED_CURVE_NAME_SPEC = "secp256r1";
     private static final int ECDSA_THIRD_STR_LEN = 65;
     private static final int ECDSA_TOTAL_STR_LEN = 104;