Fix PM Mapper certficate handling1.3.1

Remove decoding of keystore files

Issue-ID: DCAEGEN2-2096
Signed-off-by: dfarrelly <david.farrelly@est.tech>
Change-Id: Ieccf3c6bb44a87fac2ec3d2f5883a7b0a914e712

18 files changed, 34 insertions, 34 deletions

diff --git a/src/test/resources/invalid_configs/empty_filter_object.json b/src/test/resources/invalid_configs/empty_filter_object.json
index 8c72b83..4aed8ef 100644
--- a/src/test/resources/invalid_configs/empty_filter_object.json
+++ b/src/test/resources/invalid_configs/empty_filter_object.json
@@ -1,8 +1,8 @@
 {
   "pm-mapper-filter": {},
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/invalid_filter_object.json b/src/test/resources/invalid_configs/invalid_filter_object.json
index 1b7b0e3..f36aa81 100644
--- a/src/test/resources/invalid_configs/invalid_filter_object.json
+++ b/src/test/resources/invalid_configs/invalid_filter_object.json
@@ -6,9 +6,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_aaf_identity.json b/src/test/resources/invalid_configs/null_aaf_identity.json
index 8f9c7ef..f0a6940 100644
--- a/src/test/resources/invalid_configs/null_aaf_identity.json
+++ b/src/test/resources/invalid_configs/null_aaf_identity.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_aaf_password.json b/src/test/resources/invalid_configs/null_aaf_password.json
index d54d825..f4fdba9 100644
--- a/src/test/resources/invalid_configs/null_aaf_password.json
+++ b/src/test/resources/invalid_configs/null_aaf_password.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_client_role.json b/src/test/resources/invalid_configs/null_client_role.json
index 40471de..ae17a1d 100644
--- a/src/test/resources/invalid_configs/null_client_role.json
+++ b/src/test/resources/invalid_configs/null_client_role.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json b/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json
index d86de5e..449cd58 100644
--- a/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json
+++ b/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": null,
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_dr_location.json b/src/test/resources/invalid_configs/null_dr_location.json
index 79bd05d..534ff4e 100644
--- a/src/test/resources/invalid_configs/null_dr_location.json
+++ b/src/test/resources/invalid_configs/null_dr_location.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_dr_password.json b/src/test/resources/invalid_configs/null_dr_password.json
index 365b328..e2f0f22 100644
--- a/src/test/resources/invalid_configs/null_dr_password.json
+++ b/src/test/resources/invalid_configs/null_dr_password.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_dr_subscriber_id.json b/src/test/resources/invalid_configs/null_dr_subscriber_id.json
index c6c2a45..9d18d87 100644
--- a/src/test/resources/invalid_configs/null_dr_subscriber_id.json
+++ b/src/test/resources/invalid_configs/null_dr_subscriber_id.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_dr_username.json b/src/test/resources/invalid_configs/null_dr_username.json
index 511dd35..9f5b384 100644
--- a/src/test/resources/invalid_configs/null_dr_username.json
+++ b/src/test/resources/invalid_configs/null_dr_username.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_filter.json b/src/test/resources/invalid_configs/null_filter.json
index 7eb6af0..dfffebf 100644
--- a/src/test/resources/invalid_configs/null_filter.json
+++ b/src/test/resources/invalid_configs/null_filter.json
@@ -1,8 +1,8 @@
 {
   "pm-mapper-filter": null,
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_filter_array.json b/src/test/resources/invalid_configs/null_filter_array.json
index 3d2df14..5f780b5 100644
--- a/src/test/resources/invalid_configs/null_filter_array.json
+++ b/src/test/resources/invalid_configs/null_filter_array.json
@@ -2,9 +2,9 @@
   "pm-mapper-filter": {
     "filters": null
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_key_store_pass_path.json b/src/test/resources/invalid_configs/null_key_store_pass_path.json
index 2145e01..94825f3 100644
--- a/src/test/resources/invalid_configs/null_key_store_pass_path.json
+++ b/src/test/resources/invalid_configs/null_key_store_pass_path.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": null,
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_key_store_path.json b/src/test/resources/invalid_configs/null_key_store_path.json
index 8f6f831..945ec2a 100644
--- a/src/test/resources/invalid_configs/null_key_store_path.json
+++ b/src/test/resources/invalid_configs/null_key_store_path.json
@@ -14,7 +14,7 @@
   },
   "key_store_path": null,
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_location.json b/src/test/resources/invalid_configs/null_location.json
index b7d9266..2f31be1 100644
--- a/src/test/resources/invalid_configs/null_location.json
+++ b/src/test/resources/invalid_configs/null_location.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_topic_url.json b/src/test/resources/invalid_configs/null_topic_url.json
index faea169..5f1d6f0 100644
--- a/src/test/resources/invalid_configs/null_topic_url.json
+++ b/src/test/resources/invalid_configs/null_topic_url.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": "src/test/resources/password",
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_trust_store_pass_path.json b/src/test/resources/invalid_configs/null_trust_store_pass_path.json
index c98274e..5ed846a 100644
--- a/src/test/resources/invalid_configs/null_trust_store_pass_path.json
+++ b/src/test/resources/invalid_configs/null_trust_store_pass_path.json
@@ -12,9 +12,9 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
-  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_path": "src/test/resources/testkeystore.jks",
   "trust_store_pass_path": null,
   "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
   "dmaap_dr_feed_name": "bulk_pm_feed",
diff --git a/src/test/resources/invalid_configs/null_trust_store_path.json b/src/test/resources/invalid_configs/null_trust_store_path.json
index 2673fb9..0c0f825 100644
--- a/src/test/resources/invalid_configs/null_trust_store_path.json
+++ b/src/test/resources/invalid_configs/null_trust_store_path.json
@@ -12,7 +12,7 @@
       }
     ]
   },
-  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_path": "src/test/resources/testkeystore.jks",
   "key_store_pass_path": "src/test/resources/password",
   "trust_store_path": null,
   "trust_store_pass_path": "src/test/resources/password",