Merge branch 'master' of gitlab.ext.cyber.ee:cdoc2/cdoc2-java-ref-impl into master_gh_open-eid

Author: jann0k

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/KeyLabelTools.java

@@ -323,11 +323,11 @@ private static String extractKeyLabelByType(
      * @param data key label data
      * @return data URL scheme String
      */
-    private static String toDataUrlScheme(String data) {
+    public static String toDataUrlScheme(String data) {
         StringBuilder sb = new StringBuilder();
         sb.append(DATA);
 
-        if (isEncoded(data)) {
+        if (isBase64Encoded(data)) {
             sb.append(BASE_64_DELIMITER + "base64");
         }
         sb.append(DATA_DELIMITER);
@@ -367,27 +367,26 @@ public static boolean isFormatted(String keyLabel) {
         return  keyLabel.startsWith(DATA);
     }
 
-
     private static String decodeFromBase64(String data) {
         if (data.contains("base64")) {
             String dataAfterDelimiter = StringUtils.substringAfter(data, DATA_DELIMITER);
-            if (isEncoded(dataAfterDelimiter)) {
+            if (isBase64Encoded(dataAfterDelimiter)) {
                 return new String(Base64.getDecoder().decode(dataAfterDelimiter));
             }
             return dataAfterDelimiter;
         }
         return data;
     }
 
-    private static String urlDecodeValue(String encodedDataFieldValue) {
+    public static String urlDecodeValue(String encodedDataFieldValue) {
         return URLDecoder.decode(encodedDataFieldValue, StandardCharsets.UTF_8);
     }
 
-    private static boolean isEncoded(String data) {
+    private static boolean isBase64Encoded(String data) {
         return BASE64_PATTERN.matcher(data).matches();
     }
 
-    private static String convertKeyLabelParamsMapToString(Map<String, String> map) {
+    public static String convertKeyLabelParamsMapToString(Map<String, String> map) {
         return map.keySet().stream()
             .map(key -> key + DATA_PARAMETERS_KEY_VALUE_DELIMITER + map.get(key))
             .collect(Collectors.joining(DATA_PARAMETERS_DELIMITER));