Merge pull request #1654 from mohanachandran-s/release-1.2.2

MOSIP-36480 - Removed the DSL specific properties from kernel and fixed issues
mosip · Oct 18, 2024 · 1ad81f2 · 1ad81f2
2 parents f5be0c7 + b66a51e
commit 1ad81f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java
@@ -2147,7 +2147,7 @@ protected Response getWithPathParamAndCookie(String url, String jsonInput, boole
 			map.remove(GlobalConstants.VERIFIEDTRANSACTIONID);
 		}
 
-		if (map.containsKey(GlobalConstants.IDV_TRANSACTION_ID)) {
+		if (map != null && map.containsKey(GlobalConstants.IDV_TRANSACTION_ID)) {
 			headerTransactionID = map.get(GlobalConstants.IDV_TRANSACTION_ID).toString();
 			cookiesMap.put(GlobalConstants.IDV_TRANSACTION_ID_KEY, headerTransactionID);
 			cookiesMap.put(GlobalConstants.XSRF_TOKEN, token);

diff --git a/apitest-commons/src/main/resources/config/Kernel.properties b/apitest-commons/src/main/resources/config/Kernel.properties
@@ -217,22 +217,6 @@ master_db_schema=master
 ida_db_schema=ida
 
 
-#------------------------- DSL specific proprties ------------------------#
-#------------------------- We need to see how to have DSL specific proprties file ------------------------#
-packetUtilityBaseUrl=http://localhost:8080
-mountPathForScenario=D:/centralized/mountvolume
-mountPath=/home/mosip/mountvolume
-# Add scenarios to skip from automation and server side
-# supported values "S-scnearioNumber" for server side and "A-scnearioNumber" for automation
-scenariosToSkip=
-# Add scenarios to include in the the execution list
-# Empty if we want to execute all the scenarios---
-scenariosToExecute=
-# supported values yes or no
-useExternalScenarioSheet=yes
-# supported values are 1 to 8
-threadCount=1
-
 #------------------------ Generic properties  ------------------------#
 enableDebug=yes
 preconfiguredOtp=111111