From bd91ebd8e51d88c846eff277e6c5a691bde5446a Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sun, 18 Apr 2021 22:47:45 -0500
Subject: [PATCH 01/29] Execution of multiple testplan in parallel

---
 .../generator/ExcelToCollectionGenerator.java |  51 ++-
 samples/idaithalam-excel-apitesting/pom.xml   |   7 +-
 .../test/APITestWithExcelAsRunManager.java    |  26 ++
 .../test/resources/get_response_empty.json    |   4 +-
 .../virtualan_collection_pet_empty.xlsx       | Bin 0 -> 5657 bytes
 samples/idaithalam-openapi-contract/pom.xml   |   6 +-
 .../conf/feature/virtualan-contract.0.feature | 400 +++++++++---------
 7 files changed, 272 insertions(+), 222 deletions(-)
 create mode 100644 samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_empty.xlsx

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index c4f89236..2b4d774f 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -146,24 +146,40 @@ public static void createCollection(String basePath, List<String> generatedTestC
   private static void getAsSingleFile(int sheet, List<String> generatedTestCaseList,
       String generatedPath,
       Map<String, String> cucumblanMap, JSONArray virtualanArray) {
-    for (int rowIndex = 0; rowIndex < virtualanArray.length(); rowIndex++) {
-      JSONObject object = virtualanArray.getJSONObject(rowIndex);
-      if (byEachTestCase(generatedTestCaseList, object)) {
-        JSONArray virtualanSingle = new JSONArray();
-        virtualanSingle.put(object);
+    Map<String, JSONArray> arrayMap = buildByMiniCategory(virtualanArray);
+    for (Map.Entry<String, JSONArray> entry : arrayMap.entrySet()) {
+      JSONArray virtualanSingle = entry.getValue();
+      String scenarioId = virtualanSingle.getJSONObject(0).getString("scenarioId").split("-")[0];
+      if (byEachTestCase(generatedTestCaseList, scenarioId)) {
         CreateFileInfo createFileInfo = new CreateFileInfo();
         createFileInfo.setGeneratedPath(generatedPath);
         createFileInfo.setCucumblanMap(cucumblanMap);
         createFileInfo.setVirtualanArray(virtualanSingle);
         createFileInfo
             .setTestcaseName(
-                "Virtualan_" + sheet + "_" + object.optString("scenarioId") + "_" + rowIndex);
-        createFileInfo.setScenario(object.optString("scenario"));
+                "Virtualan_" + sheet + "_" + scenarioId);
+        createFileInfo.setScenario(scenarioId);
         createIdaithalamProcessingFile(createFileInfo);
       }
     }
   }
 
+  private static Map<String, JSONArray> buildByMiniCategory(JSONArray virtualanArray) {
+    Map<String, JSONArray> arrayMap = new HashMap<>();
+    for (int i = 0; i < virtualanArray.length(); i++) {
+      String scenarioId = virtualanArray.getJSONObject(i).getString("scenarioId").split("-")[0];
+      JSONArray array = null;
+      if (arrayMap.containsKey(scenarioId)) {
+        array = arrayMap.get(scenarioId);
+      } else {
+        array = new JSONArray();
+      }
+      array.put(virtualanArray.getJSONObject(i));
+      arrayMap.put(scenarioId, array);
+    }
+    return arrayMap;
+  }
+
   private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
       SheetObject sheetObject)
       throws MalformedURLException {
@@ -190,12 +206,14 @@ private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
     return virtualanArray;
   }
 
+
   private static boolean byEachTestCase(List<String> generatedTestCaseList,
-      JSONObject row) {
+      String scenarioId) {
     return (!IdaithalamConfiguration.isWorkFlow()
         && (generatedTestCaseList == null || generatedTestCaseList.isEmpty()
         || generatedTestCaseList
-        .contains(row.optString("scenarioId"))));
+        .contains(scenarioId)));
+
   }
 
   /**
@@ -233,7 +251,8 @@ public static InputStream getInputStream(String basePath, String fileNameWithSub
     }
     if (stream == null) {
       log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-      throw new UnableToProcessException(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+      throw new UnableToProcessException(
+          " File is missing(" + basePath + ") : " + fileNameWithSubCategory);
     }
     return stream;
   }
@@ -385,16 +404,18 @@ private static String buildObjectResponse(String basePath, Map<String, String> r
       String body = null;
       if (responseFile.get("ResponseContent") != null) {
         body = responseFile.get("ResponseContent");
-      } else if(responseFile.get("ResponseFile") != null) {
+      } else if (responseFile.get("ResponseFile") != null) {
         body = getFileAsString(basePath, responseFile.get("ResponseFile"));
       }
       if (body != null) {
         return body.trim();
       } else {
-        log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > " + responseFile.get("ResponseContent"));
+        log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
+            + responseFile.get("ResponseContent"));
       }
     } catch (IOException e) {
-      log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > " + responseFile.get("ResponseContent"));
+      log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
+          + responseFile.get("ResponseContent"));
     }
     return null;
   }
@@ -404,7 +425,7 @@ private static String buildObjectRequest(String basePath, Map<String, String> re
       String body = null;
       if (requestFile.get("RequestContent") != null) {
         body = requestFile.get("RequestContent");
-      } else if(requestFile.get("RequestFile") != null) {
+      } else if (requestFile.get("RequestFile") != null) {
         body = getFileAsString(basePath, requestFile.get("RequestFile"));
       }
       if (body != null) {
@@ -607,7 +628,7 @@ private void createCollections(List<String> generatedTestCaseList, int sheet, Sh
         throws MalformedURLException {
       JSONArray virtualanArray = getObjectSheet(generatedTestCaseList, sheetObject);
       log.info(virtualanArray.toString());
-      if (IdaithalamConfiguration.isWorkFlow()) {
+      if (IdaithalamConfiguration.isWorkFlow() && virtualanArray.length() > 0) {
         CreateFileInfo createFileInfo = new CreateFileInfo();
         createFileInfo.setGeneratedPath(generatedPath);
         createFileInfo.setCucumblanMap(cucumblanMap);
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index 4125a9de..e350937b 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.2-SNAPSHOT</idaithalam.version>
+		<idaithalam.version>1.2.4-SNAPSHOT</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -51,6 +51,11 @@
 			<artifactId>slf4j-simple</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.12.0</version>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
index 98bb8ef7..458a479c 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
@@ -228,4 +228,30 @@ public void executeApiTests_6() {
     }
   }
 
+  @Test
+  public void executeApiTests_empty_7() {
+    int status =0 ;
+    try {
+      IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\\r\\\\\\\\n");
+      int testPlanIndex = 7;
+      File f  = new File(System.getProperty("user.dir") +"/target/"+testPlanIndex);
+      if(!f.exists())
+        f.mkdir();
+      ExcelToCollectionGenerator.createCollection(null, "virtualan_collection_pet_empty.xlsx",
+          System.getProperty("user.dir") +"/target/"+testPlanIndex);
+      //Generate feature and summary page html report for the selected testcase from the excel
+      status = IdaithalamExecutor.validateContract("Scriptlet testcase execution version 5", System.getProperty("user.dir") +"/target/"+testPlanIndex);
+      System.out.println(status);
+      if(status != 0) {
+        Assert.assertTrue(false);
+      }
+      Assert.assertTrue   (true);
+    }catch (Exception e){
+      System.out.println(e.getMessage());
+      Assert.assertTrue(false);
+    }
+  }
+
+
+
 }
\ No newline at end of file
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json b/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json
index e96abafe..d495bee2 100644
--- a/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json
+++ b/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json
@@ -8,11 +8,11 @@
   "photoUrls": [
     "string"
   ],
-  "status": "available",
+  "status": "available \r\n Testing \r\n again ",
   "tags": [
     {
       "id": 201,
-      "name": "grey"
+      "name": "red"
     }
   ]
 }
\ No newline at end of file
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_empty.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_empty.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..272328a756a434b7854f764ff1c3e051536831f6
GIT binary patch
literal 5657
zcmai21z3}R*CwR9L%O>eEieRWNkJN9bV(y2(#=3Xx|yURjf8~cBt)f48b(j2An^@-
z-%tL2@9TGVUE8zk+Bw_q-+iCwK1W9b{RTM-Ha0d&Lr|(7%C(?IUi-TU+Im|1Il9?<
z{rf^#z~9v+Z`|CiM+hJ5kZhOGaM96(noNn@Vq9B@aGBlhW=irfVaa^Rdv$<gAS#0^
zRQ}{(#Lc_u`)wPtAl98aQjA9w4M*mzga_{R>0FXwQ&!;vDrVq5w;v5O;x%LK&sp{Y
zEuPnr1Sj;GsNa*5UKYXM`p`hI#so=~uD}^p^Sw7(wWEBjfSn!qwxxh$Wv3fG8+{di
zp*0oJB#!${F^}$4k~xCX<`m<b-EwsW)(c%Zoio(_$6=yzXwiTSo)#GQj4JS47Dw`e
z_Upo+Ugz*9%fSWm0aW_Cy?m`oj|QV(aaeRd1*!P$KWTPAr+)$+Y?1uFy6}o;2++vI
z>+;HCvF2SpOS7ep1{OA!jbk_lDhdh~Itq%;{|BX?yQj040|?~pCHV8@7nB(@o;gC~
zQ3ZtuT^{e%1kqHM8v$9fNzV31wz7_aHK8t|m}}}i(7A85nW1ml@)xK1mM&q3j8DYc
zWt5A2nG&$X7`8LsPl%HSek58MQN8>s-L|()OC^bTsQN%;Vk`pYxBu*ON*(<YDT|m;
z%!%p}?kmPjj&DtDJ@bWuq`i6KAQDQCVF1UHXxO<Xc_fEZqqJQ_xbYZ0<}NMKYYQxf
zEIq+kRX$HL6(C<>P$vQ6Y=tt9yp8LSdfl5JKUpP`%wRcdZ7rp`(4wYrunkg-U2k6Z
z1_LT*a6}pLMAF_T9T1(8U+b^qKc4|A%|=a-m%RNM<JSFAA0J+8#7IcZ>C;aa@|;y5
zlMLH+EAe<3w8vtb+}vK@w=|PwU#LFFdLPWef^T!&BbI-g_#!|P_=s*>=wUowl~p~(
zHpU0~>@oqF@AP2SmvqkCVj(5o&+_@svdf1@>!NxyEqX8#H`o|^Cd3P>ACku55M18q
zobC}H@Yp>*jbqSgarK_7=(wYle@^K}RrEp`wLKjB;)wf)Jf+{GsCDvTyF_z`T|cd6
zcviW7jC2{cl*-hp&If+61;0es!i#8HD9`O}#Ujtsf=U4?<8l+r7b0-{`bEuGUHjno
zCH;Eh#t<y|u4sEVV!7xltY&dBqKXEleyJxs5r&)`l~|Qz`suZ>w;k$|J~j~2J?SHT
zc4;4*d@|q2t;yKPo%dB_M3r~mXv<bIWRUOZqqCHqRwq4BdnIra{LM^j%V);J06<s4
zs-c#gGW(EwM=eRx@b>VdSs^evq8c@2B42_@Z=Q&XEyuqmgBf&QZo<?`uZlyewr31z
zDcq>u6LB{EqzVt24^`dEoK~Mybs8}6NvZF2r&isWM&_Gs5X78?OfxpGR&)b*w(3w*
z>H)lr;>rCXU^iEf%$EviO(5D!=%93ttwObtnyT2t#ok3eNG)L>8l~nf!iVkQBjCp-
zo6zhgdsI-Z#83g#LN^<;Z^8aEiI-J<@Dcpr9|#}T&R!++eMQ}@Kt!u6*IRlwYh%o+
zqa>pwaR9cJYSZCose1L#Wg<6Gy-{~}ODr1UG`Ao`rgc(!ZZZpxuk<$&$HFg-)ZS~{
zzv++lS1Y@wKTA)L%XJkBT)khI7*R(TCdNACJfsKib1dMpOe{ne1BonbgF~6KMxr+2
z+05JA4`K}Xzbtn@eWoDtP7oeF^X1OLbVBPiwaH=(g*~;wM?hxA8^XI&e!1zmisA97
zrkz%wgZ&x<6tU7D4cqElM?_2<S4?^ff^^9qaj|gV8_+yJ=xk>vY8E1_bY2)$nPxqv
zZI=<9(QcMK@a~<dWjjlxA9&9b6tlA|{1MM`Ft&8pWtt3k#_HS_uXS{k%Pt3oN>`@L
z7#U{)tP`>3_iRvfe}<~L%}ZZ1)RLRFS?<_1@Su;b>tTS@(CHFe>j{)iy7wmkoF5^x
zw!3AY3h@u&L|N0eefldnPaX~yULe8hMEe_@WWV6_b^y781b;sN>|`TGb8hoY#OGlb
z=qnxFQytuGx^+2*j3$OVO*^8mj>@{H(EyGYoz#J@K^nz&tRPFYRncfs(JnBw>J1GB
zQAE6$y|aU*F)=aan)UFC_}N#l%K+3T;LOO(jfCpYWF&`9@NLqUwm=cIG#N79_Ndsj
zK3rxJE>TLV0L9Ex%5~XZJ*|KQU=kyRt4hj)`=V)|)4FF1-t@~S7mG2q$x7Nq48=u|
z#g(NBq&5%}3*~YrMn@2HFK@6NXQWOjrA37vD;1^_)qd_UzaWwAoYNy@5HeTNxMZ3&
zE5=k<CvKj4Lu-WI6S&EK>-oyfl}ACeq2UV3!e(<`loyLtuQ1DL30vJ?%1wQh@eg03
zcWP~&F)<Hm?h8b3hnWioHHUvQX_qI3x!BLpw=b>O_xjsQwCz=gPZdT$c0)p&T$h&I
zoW0RwJx|v`{_(*6(TcOI+}S%c7f<0GXj?0ldqbf?JgO1sk!>5?5Oz5W5?ME*x0&=`
zW9rj7KJf4hi=cn9wqGcJ17ocyNzzj%I*v_!3Dh8!((3IH*@^XaN;PA1G8UZb?xTYV
zFSnlM4X=Thf&33(6gIm018C%}I?*`Vp0HB7diMZ-9@zFgHx{31+q#5rI`IB|dpH6N
z`0|JnPe1gfnx$ZmaW!ubJ&CZNC1+35Xqk;vv5mF-b2J)5T`Y{{I_K{eW!Nz&`lJ~?
zm1lQ9$pw}@Pn{u{qrq|C&a0WAC+YWv#R)Z8hbc`+6tqr4*ZnK<bZOvyfgfoJ4lsvb
ziyoGb=E8WhQK+1$D`1)g^}r(>N~KW8Y6i|H)nw=L5*po+^VTT_Lgy86@*3=)Lm^qS
zFgqG9=f;`Q`O}t_jL88g-40dOZ4#Wdh_bv&cZ#8{DTy$sT8Ke0k=l3c{jHSCE*{;B
zc>ywN2oNxXukYrv4~Xx8Ro;qY6_h;>Em97HCD~YPP?#m(lv1HHag^r~%jjwIf1LE<
zN1gt`M6Lr9e8_b7JiEPUnBHhTdC><N`8DX7f1r|3DSv-i>*@sL(EttOjegJi*mkL>
zpMoApY#o@`w)1|i{&sh6sO|*oN@$>xC)QlZzEwl`H=&XL5}KETwI|3{-`n%bhyAo)
z2CnWoLc|vsKZpjG;-6~gK`0z#CJj;`1mfGB28L^0k^Uk8IKA%n%cYc3L#$n8rRkM@
zsiizdd5+iq)ta^F$+I)Yn!T~uT^ldPn-cmKJbjNXZm14Z4ol*_azO1<KIQ<HhCVY%
z=*uX-U}E1eEhmq9fe9V#KT#*i=}a>Y)WL8=Ef+cV775_wEvv!yoHCB<o6{!|yLaip
zBqz<m605^W!mgp9PSHbUsK~}0YrDy4Q-A`$72@}!^*}w3y|%#xrr2b<j0v`zO;9kF
zi9h7zg9~8Y=5XUXG1PwNu@rconFCpFu!_6Y#H36Bc|pBq0)`)&A##pQY6zAKZFIM^
zewg~B2CRxVqH7yU#f*fyg`O^wa<vR^pb9&-!z``G+$Xg}Ib^4~$>OD8!^NU;X<)U6
zjTD*Hpk=5JpI!a-mt8(B8SDZ=UPvCpjGO;pu(Y~#BQtbli#|eTuR=F!9VZ>n%Sg@8
z`96Blyn|_wOWT4O@!g{$xl7ADEyUQ8blavhks!!|q-<w)%ghH2y!5afjl*+2d7w3{
z5(1#ZYiqSYn74ljAc3vq%D>hiHq9SxB~Ke|t{ROis2NY1XL6H52#qhYZ{i8Gh0~`1
zH=_2lg9C;62HqZyJqKhU-ZJj5b8!xYqWhJQ%uMx#0ycI-?k@D=J&felIFDl(l5bh#
zyyB7(dxIw~vSBk|{EbTl|KgH&fD7m+iTVt++~<Vw&ygew+fQ6+n3?VIeGh_<Lwy}^
zcX{SKSqvDXO1%*w=UlwnyX;E!#md38?0P{5Da6~~At`8b!Vg;S;UsbBCuH(?4}Ie4
zCW7wnlCr|ec`C-^*jqr9OQno9Fq7{6sRXGT*uxzDduG8}G5nL7dNS|D^_MFeQa*N1
zR>#y3l$3o{)C13WpQfk|QxIZLX?ZKgqtgxHmDIeLFC9<as$9X4x&4~OD1uThRW?G3
z<&GY_rD6=F36ivF<}u}4=|O8`A{CF@p)1f0uVGHybN_N1<D(;PB#Wb&LlJ>Um2CHY
zz#fD9J%c)r!$}XG_ShSthlJLIX^P4v`Ygvvbx`!W$b0wjoG#-yl)wZuwj}gJEO8s~
zJ{$ZXEQ#W9U+>U`V7^c<X5U8Xfo^cWj=?~}uvK^y3}mX*gDapHx;-lAWpemwHdwSl
zPVPq9@dV76KPoG7pm*)k6O6i%RP#e2zZJkPre5F}5%`p7Ub-k#GbV6}PQL2>dkFCJ
zJM%27EfJzw!J?$Ove`jR#7&c_;*Ll(t|2r{A&~U0>;YH+Oys{QxawL-hEXcKmp3TE
zhM&loUy0Y`-1})&&wkz~kXj^(>Oy*bR*GNv6y(rhtF?(}75k*-S<(#tL3imgCjY}d
zq|4u2JlrYwjhDE<Vrqel;FrQ06|KhleaG{U>W6;vn;0r5QFsG}hl!^cLQuQ;;<D$v
zoEz~f?>6sRmh?SiWwkqyl(s>5m3~-WDooyeT(`}5MLrXkJ5@j=`6{sfMn0ln<hwFp
zHtz1uKYLiJhFiE0an#*$8K#5SBK0bAjAC`eGM7re33N$2?0aVl4AH4`en1rN5lo-;
z%^>*D#Z=DdRyjuU@Jw!5e1x)98E?AW#%|yx%}e75#c4eUduDqog(mL&N%_$N!qGgI
z%I3^^=?IQhIuL=%a*w#xcB$uLjDp7FwP}B1_DPg(hl^acm-E=5nMCl36uyz6dQbFI
zdvw4&6GH>GZE~ZNM`_kRs(soQLURhriL58LF;kT|i>OQ%aA>3k2C*MYO9(UHtdr!b
z=_&h`E#x{nx@d>anlJW3oaXD8Nyz}z{B`c;`C+E}+1_ZUhULW_b+UX2(z70Yr-U~~
z<f_^+*qx>@v-FWS=WX`A-dq*3_&~#zSp)PL?_%M_=U?)h^CzO_8X#YW^|`8@*rkk-
zYn?Tji2#pM41r~QX_f{F4T6yw!GgDZ1wv4-PQnZ&CRhtOit_$-6s7%j62JWK_4D}Y
zfNN3}oqC0cm63-MGc#59R8KuNSBuMb4uVBIF)i|nomp%46p;s5mL>*LS;SuUon4MQ
z)SuHnI(owG*UeiVM|$HCnaidr#zFM6ADqNl4b88K7$_1ltxcC)EnZE%6`k=B#v?qs
z|AaMeOwVrBW4slcL~copnIPL3a!<uI>9ukz5A;sf291uTZCr;T7}13Gkec;^Q$|e7
z-h=9$qrzPy9=0Ps&q8hf)G*5cKvh_;f`z>?{}9-5_k@5mroPkgjYY%ab_61kRM1~r
zxY@m1mJbI`Ga)Q<`xHH^n$h4Eq;D{u(daSy6=E4Q-TFI7JX-(icJYv(_yyNbh!V#X
z3B!blF~-UKqwNrS9@Ys(wZa@O1Pp~uO3Vt+9jkiw_Vg0*o;^K*hd`>I1=tXMv1Z~e
z9Q3qupxExFMV&&l%c0=un(%Yhaar}D_%w10N)BbZ0p(k|NNvJHZ>jjL$(A$N(};LF
ze1NdZLo-#}Tb??lVV($#eVc!CQztmH`aN1u37*y7&LLyYYd0N#7N3Im{frcrv1}Ud
zLb%2p7i{v2G5vf+T~(=%WsN(KdkHM;QuiXJI^-YWLK5V^?<uZ~y{VGBn>WbK+tMJw
z1LS3XCDlfKs5X)nXJ{A9#}wjjQcMxqh^|#^)ifgGU9AV71OpbPmg?0^*eaQxe6(n9
z8jul%H9m*u)%RhNWi9gxa}N|NybJ?`+>cG}gKue*r*%8mc0XW8sM_3W%N9V8R4m)x
zO?U82`lgraG>)3iTx?%TIHb4%G8x8p!q7;QSUsvS=(hh7kY-9KoO8>Dz&R&AI^<2+
ziyLnp62sngvOSGmaU8I6uQ!LvuerA05*C%F<|don#~0_A_*#Kd@{y<gc!aIw$da_^
zMIw;?<LpCqHDP84C*u10bwH`1#DVw{(>j%hCXe5}kZ`s(A#S4d{3R@Lu+E#!w}}vD
zL3zU557FASpi$-#^xFeN?69%G_})mrL8)}n$9Qz9JE0-%4pmYagb9~>Bf(L%(mT+7
z`?1cSsJq5A=!hc`r@3*3Iw~4D%I{U%_07@Ms_mcg-xhCwR=Ga^{<De(@_Uh0uFbr^
zcTRs+xjyz?&C0(6iu~pOtnwcx=RXTxx3^cM`W>{GKMVdjJN{YVx~I8v!M`IM=VyWc
z<B9*QaQ((~<$Zp~7*f&5|K#<*PUz3n>z(xK&h<Mqk#_xGaQyo|_Gj|-rgGJ6f5#-U
z7Bcz2wBA4KTvzN>3;G?{B>!kge<ofh-9NF1BNP9Fymd4%kcWbTf{T1)BU_>4&#eCe
D#d~Nr

literal 0
HcmV?d00001

diff --git a/samples/idaithalam-openapi-contract/pom.xml b/samples/idaithalam-openapi-contract/pom.xml
index 27f4bca4..88cec2ed 100644
--- a/samples/idaithalam-openapi-contract/pom.xml
+++ b/samples/idaithalam-openapi-contract/pom.xml
@@ -8,11 +8,11 @@
 	<name>idaithalam-opeapi-contract</name>
 	<version>1.0.0-SNAPSHOT</version>
 	<properties>
-		<idaithalam.version>1.2.1</idaithalam.version>
+		<idaithalam.version>1.2.3</idaithalam.version>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<virtualan.version>1.0.6</virtualan.version>
+		<virtualan.version>2.1.10</virtualan.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
 		<spring.boot.version>2.4.3</spring.boot.version>
 		<springfox.version>2.9.2</springfox.version>
@@ -127,7 +127,7 @@
 		<!-- START Virtual Service API support -->
 		<dependency>
 			<groupId>io.virtualan</groupId>
-			<artifactId>virtualization</artifactId>
+			<artifactId>virtualan-plugin</artifactId>
 			<version>${virtualan.version}</version>
 			<exclusions>
 				<exclusion>
diff --git a/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature b/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature
index e38d7c78..25b66cc3 100644
--- a/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature
+++ b/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature
@@ -1,214 +1,212 @@
 Feature: idaithalan.postman_collection.json - API Contract validation status
+    Scenario: Load initial set of data
+      Given Provided all the feature level parameters from file
+    @api
+    Scenario: read pet2 api - GET api call
+      Given a user perform a api action
+      When a user get application/json in /api/pets/200 resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/200 api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Butch                          |
+        | id                 |  i~201                          |
+        | category.name                 |  Bulldog                          |
+        | category.id                 |  i~200                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  grey                          |
+        | tags[0].id                 |  i~201                          |
 
-  Scenario: Load initial set of data
-    Given Provided all the feature level parameters from file
+    @api
+    Scenario: read pet1 api - GET api call
+      Given a user perform a api action
+      When a user get application/json in /api/pets/100 resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/100 api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Rocky                          |
+        | id                 |  i~101                          |
+        | category.name                 |  german shepherd                          |
+        | category.id                 |  i~100                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  brown                          |
+        | tags[0].id                 |  i~101                          |
 
-  @api
-  Scenario: read pet2 api - GET api call
-    Given a user perform a api action
-    When a user get application/json in /api/pets/200 resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/200 api includes following in the response
-      | photoUrls[0]  | string    |
-      | name          | Butch     |
-      | id            | i~201     |
-      | category.name | Bulldog   |
-      | category.id   | i~200     |
-      | status        | available |
-      | tags[0].name  | grey      |
-      | tags[0].id    | i~201     |
+    @api
+    Scenario: update pet1 api - PUT api call
+      Given a user perform a api action
+      And add request with given header params
+        | Content-Type                   | application/json                         |
+      And Update api with given input
+        | photoUrls[0]                   |  string                        |
+        | name                   |  Rocky                        |
+        | id                   |  i~101                        |
+        | category.name                   |  german shepherd                        |
+        | category.id                   |  i~100                        |
+        | status                   |  available                        |
+        | tags[0].name                   |  brown                        |
+        | tags[0].id                   |  i~101                        |
+      When a user put application/json in /api/pets/100 resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/100 api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Rocky                          |
+        | id                 |  i~101                          |
+        | category.name                 |  german shepherd                          |
+        | category.id                 |  i~100                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  brown                          |
+        | tags[0].id                 |  i~101                          |
 
-  @api
-  Scenario: read pet1 api - GET api call
-    Given a user perform a api action
-    When a user get application/json in /api/pets/100 resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/100 api includes following in the response
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | german shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
+    @api
+    Scenario: update pet2 api - PUT api call
+      Given a user perform a api action
+      And add request with given header params
+        | Content-Type                   | application/json                         |
+      And Update api with given input
+        | photoUrls[0]                   |  string                        |
+        | name                   |  Butch                        |
+        | id                   |  i~201                        |
+        | category.name                   |  Bulldog                        |
+        | category.id                   |  i~200                        |
+        | status                   |  available                        |
+        | tags[0].name                   |  white gray                        |
+        | tags[0].id                   |  i~201                        |
+      When a user put application/json in /api/pets/200 resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/200 api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Butch                          |
+        | id                 |  i~201                          |
+        | category.name                 |  Bulldog                          |
+        | category.id                 |  i~200                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  white gray                          |
+        | tags[0].id                 |  i~201                          |
 
-  @api
-  Scenario: update pet1 api - PUT api call
-    Given a user perform a api action
-    And add request with given header params
-      | Content-Type | application/json |
-    And Update api with given input
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | german shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
-    When a user put application/json in /api/pets/100 resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/100 api includes following in the response
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | german shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
+    @api
+    Scenario: create pet1 api - POST api call
+      Given a user perform a api action
+      And add request with given header params
+        | Content-Type                   | application/json                         |
+      And Create api with given input
+        | photoUrls[0]                   |  string                        |
+        | name                   |  Rocky                        |
+        | id                   |  i~101                        |
+        | category.name                   |  German Shepherd                        |
+        | category.id                   |  i~100                        |
+        | status                   |  available                        |
+        | tags[0].name                   |  brown                        |
+        | tags[0].id                   |  i~101                        |
+      When a user post application/json in /api/pets resource on api
+      Then Verify the status code is 201
+      And Verify-all /api/pets api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Rocky                          |
+        | id                 |  i~101                          |
+        | category.name                 |  German Shepherd                          |
+        | category.id                 |  i~100                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  brown                          |
+        | tags[0].id                 |  i~101                          |
 
-  @api
-  Scenario: update pet2 api - PUT api call
-    Given a user perform a api action
-    And add request with given header params
-      | Content-Type | application/json |
-    And Update api with given input
-      | photoUrls[0]  | string     |
-      | name          | Butch      |
-      | id            | i~201      |
-      | category.name | Bulldog    |
-      | category.id   | i~200      |
-      | status        | available  |
-      | tags[0].name  | white gray |
-      | tags[0].id    | i~201      |
-    When a user put application/json in /api/pets/200 resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/200 api includes following in the response
-      | photoUrls[0]  | string     |
-      | name          | Butch      |
-      | id            | i~201      |
-      | category.name | Bulldog    |
-      | category.id   | i~200      |
-      | status        | available  |
-      | tags[0].name  | white gray |
-      | tags[0].id    | i~201      |
+    @api
+    Scenario: create pet2 api - POST api call
+      Given a user perform a api action
+      And add request with given header params
+        | Content-Type                   | application/json                         |
+      And Create api with given input
+        | photoUrls[0]                   |  string                        |
+        | name                   |  Butch                        |
+        | id                   |  i~201                        |
+        | category.name                   |  Bulldog                        |
+        | category.id                   |  i~200                        |
+        | status                   |  available                        |
+        | tags[0].name                   |  grey                        |
+        | tags[0].id                   |  i~201                        |
+      When a user post application/json in /api/pets resource on api
+      Then Verify the status code is 201
+      And Verify-all /api/pets api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Butch                          |
+        | id                 |  i~201                          |
+        | category.name                 |  Bulldog                          |
+        | category.id                 |  i~200                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  grey                          |
+        | tags[0].id                 |  i~201                          |
 
-  @api
-  Scenario: create pet1 api - POST api call
-    Given a user perform a api action
-    And add request with given header params
-      | Content-Type | application/json |
-    And Create api with given input
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | German Shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
-    When a user post application/json in /api/pets resource on api
-    Then Verify the status code is 201
-    And Verify-all /api/pets api includes following in the response
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | German Shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
+    @api
+    Scenario: delete pet1 - DELETE api call
+      Given a user perform a api action
+      When a user delete application/json in /api/pets/100 resource on api
+      Then Verify the status code is 200
 
-  @api
-  Scenario: create pet2 api - POST api call
-    Given a user perform a api action
-    And add request with given header params
-      | Content-Type | application/json |
-    And Create api with given input
-      | photoUrls[0]  | string    |
-      | name          | Butch     |
-      | id            | i~201     |
-      | category.name | Bulldog   |
-      | category.id   | i~200     |
-      | status        | available |
-      | tags[0].name  | grey      |
-      | tags[0].id    | i~201     |
-    When a user post application/json in /api/pets resource on api
-    Then Verify the status code is 201
-    And Verify-all /api/pets api includes following in the response
-      | photoUrls[0]  | string    |
-      | name          | Butch     |
-      | id            | i~201     |
-      | category.name | Bulldog   |
-      | category.id   | i~200     |
-      | status        | available |
-      | tags[0].name  | grey      |
-      | tags[0].id    | i~201     |
+    @api
+    Scenario: delete pet2 - DELETE api call
+      Given a user perform a api action
+      When a user delete application/json in /api/pets/200 resource on api
+      Then Verify the status code is 200
 
-  @api
-  Scenario: delete pet1 - DELETE api call
-    Given a user perform a api action
-    When a user delete application/json in /api/pets/100 resource on api
-    Then Verify the status code is 200
+    @api
+    Scenario: get pet2 by tags - GET api call
+      Given a user perform a api action
+      And add request with given query params
+        | tags                   | grey                         |
+      When a user get application/json in /api/pets/findByTags resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/findByTags api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Butch                          |
+        | id                 |  i~201                          |
+        | category.name                 |  Bulldog                          |
+        | category.id                 |  i~200                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  grey                          |
+        | tags[0].id                 |  i~201                          |
 
-  @api
-  Scenario: delete pet2 - DELETE api call
-    Given a user perform a api action
-    When a user delete application/json in /api/pets/200 resource on api
-    Then Verify the status code is 200
+    @api
+    Scenario: get pet1 by tags - GET api call
+      Given a user perform a api action
+      And add request with given query params
+        | tags                   | brown                         |
+      When a user get application/json in /api/pets/findByTags resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/findByTags api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Rocky                          |
+        | id                 |  i~101                          |
+        | category.name                 |  german shepherd                          |
+        | category.id                 |  i~100                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  brown                          |
+        | tags[0].id                 |  i~101                          |
 
-  @api
-  Scenario: get pet2 by tags - GET api call
-    Given a user perform a api action
-    And add request with given query params
-      | tags | grey |
-    When a user get application/json in /api/pets/findByTags resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/findByTags api includes following in the response
-      | photoUrls[0]  | string    |
-      | name          | Butch     |
-      | id            | i~201     |
-      | category.name | Bulldog   |
-      | category.id   | i~200     |
-      | status        | available |
-      | tags[0].name  | grey      |
-      | tags[0].id    | i~201     |
+    @api
+    Scenario: get pet by status - GET api call
+      Given a user perform a api action
+      And add request with given query params
+        | status                   | available                         |
+      When a user get application/json in /api/pets/findByStatus resource on api
+      Then Verify the status code is 200
+      And Verify-all /api/pets/findByStatus api includes following in the response
+        | photoUrls[0]                 |  string                          |
+        | name                 |  Rocky                          |
+        | id                 |  i~101                          |
+        | category.name                 |  german shepherd                          |
+        | category.id                 |  i~100                          |
+        | status                 |  available                          |
+        | tags[0].name                 |  brown                          |
+        | tags[0].id                 |  i~101                          |
 
-  @api
-  Scenario: get pet1 by tags - GET api call
-    Given a user perform a api action
-    And add request with given query params
-      | tags | brown |
-    When a user get application/json in /api/pets/findByTags resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/findByTags api includes following in the response
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | german shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
-
-  @api
-  Scenario: get pet by status - GET api call
-    Given a user perform a api action
-    And add request with given query params
-      | status | available |
-    When a user get application/json in /api/pets/findByStatus resource on api
-    Then Verify the status code is 200
-    And Verify-all /api/pets/findByStatus api includes following in the response
-      | photoUrls[0]  | string          |
-      | name          | Rocky           |
-      | id            | i~101           |
-      | category.name | german shepherd |
-      | category.id   | i~100           |
-      | status        | available       |
-      | tags[0].name  | brown           |
-      | tags[0].id    | i~101           |
-
-  @api
-  Scenario: risk calculations - POST api call
-    Given a user perform a api action
-    And add request with given header params
-      | Content-Type | application/json |
-    And Create api with given input
-      | birthday   | 1978-10-24 |
-      | postalCode | 60563      |
-    When a user post application/json in /api/riskfactor/compute resource on api
-    Then Verify the status code is 200
-    And Verify api response with 40 includes in the response
+    @api
+    Scenario: risk calculations - POST api call
+      Given a user perform a api action
+      And add request with given header params
+        | Content-Type                   | application/json                         |
+      And Create api with given input
+        | birthday                   |  1978-10-24                        |
+        | postalCode                   |  60563                        |
+      When a user post application/json in /api/riskfactor/compute resource on api
+      Then Verify the status code is 200
+      And Verify api response with 40 includes in the response
 

From 800239674f65721c9a9cf8cbfe7c94ccf3c7df00 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sun, 18 Apr 2021 22:54:55 -0500
Subject: [PATCH 02/29] Open api contract validation

---
 .../conf/feature/virtualan-contract.0.feature | 46 +++++++++----------
 .../conf/virtualan-provider.json              | 29 +++++++++++-
 samples/idaithalam-openapi-contract/pom.xml   | 19 ++++----
 3 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature b/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
index 9a7ff760..0fb339f7 100644
--- a/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
+++ b/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
@@ -1,24 +1,24 @@
 Feature: Sample.yaml - API Contract validation status
-    Scenario: Load initial set of data
-      Given Provided all the feature level parameters from file
-    @sample
-    Scenario: Create a new sample object. - POST api call
-      Given a user perform a api action
-      And Create api with given input
-        | filename                   |  Sample.yaml                        |
-        | name                   |  Sample                        |
-        | version                   |  0.0.1                        |
-      When a user post application/json in /sample resource on sample
-      Then Verify the status code is 201
-    @sample
-    Scenario: Sample path - GET api call
-      Given a user perform a api action
-      And add request with given path params
-        | sampleId                   | sampleId                         |
-      When a user get application/json in /sample/validate/{sampleId} resource on sample
-      Then Verify the status code is 200
-      And Verify-all /sample/validate/{sampleId} api includes following in the response
-        | sample1                 |  one                          |
-        | id                 |  i~1                          |
-        | sample3                 |  three                          |
-        | sample2                 |  two                          |
+  Scenario: Load initial set of data
+    Given Provided all the feature level parameters from file
+  @sample
+  Scenario: Create a new sample object. - POST api call
+    Given a user perform a api action
+    And Create api with given input
+      | filename                   |  Sample.yaml                        |
+      | name                   |  Sample                        |
+      | version                   |  0.0.1                        |
+    When a user post application/json in /sample resource on sample
+    Then Verify the status code is 201
+  @sample
+  Scenario: Sample path - GET api call
+    Given a user perform a api action
+    And add request with given path params
+      | sampleId                   | sampleId                         |
+    When a user get application/json in /sample/validate/{sampleId} resource on sample
+    Then Verify the status code is 200
+    And Verify-all /sample/validate/{sampleId} api includes following in the response
+      | sample1                 |  one                          |
+      | id                 |  i~1                          |
+      | sample3                 |  three                          |
+      | sample2                 |  two                          |
diff --git a/samples/idaithalam-openapi-contract/conf/virtualan-provider.json b/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
index 425a51d3..2a05d1d3 100644
--- a/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
+++ b/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
@@ -1 +1,28 @@
-[{"input":"{\r\n  \"filename\" : \"Sample.yaml\",\r\n  \"name\" : \"Sample\",\r\n  \"version\" : \"0.0.1\"\r\n}","method":"POST","scenario":"Create a new sample object.","resource":"sample","availableParams":[],"type":"Response","url":"/sample","httpStatusCode":"201"},{"output":"{\r\n  \"sample1\" : \"one\",\r\n  \"id\" : 1,\r\n  \"sample3\" : \"three\",\r\n  \"sample2\" : \"two\"\r\n}","method":"GET","scenario":"Sample path","resource":"sample","availableParams":[{"parameterType":"PATH_PARAM","value":"sampleId","key":"sampleId"}],"type":"Response","url":"/sample/validate/{sampleId}","httpStatusCode":"200"}]
\ No newline at end of file
+[
+  {
+    "input": "{\r\n  \"filename\" : \"Sample.yaml\",\r\n  \"name\" : \"Sample\",\r\n  \"version\" : \"0.0.1\"\r\n}",
+    "method": "POST",
+    "scenario": "Create a new sample object.",
+    "resource": "sample",
+    "availableParams": [],
+    "type": "Response",
+    "url": "/sample",
+    "httpStatusCode": "201"
+  },
+  {
+    "output": "{\r\n  \"sample1\" : \"one\",\r\n  \"id\" : 1,\r\n  \"sample3\" : \"three\",\r\n  \"sample2\" : \"two\"\r\n}",
+    "method": "GET",
+    "scenario": "Sample path",
+    "resource": "sample",
+    "availableParams": [
+      {
+        "parameterType": "PATH_PARAM",
+        "value": "sampleId",
+        "key": "sampleId"
+      }
+    ],
+    "type": "Response",
+    "url": "/sample/validate/{sampleId}",
+    "httpStatusCode": "200"
+  }
+]
\ No newline at end of file
diff --git a/samples/idaithalam-openapi-contract/pom.xml b/samples/idaithalam-openapi-contract/pom.xml
index 88cec2ed..cff4860f 100644
--- a/samples/idaithalam-openapi-contract/pom.xml
+++ b/samples/idaithalam-openapi-contract/pom.xml
@@ -12,9 +12,9 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<virtualan.version>2.1.10</virtualan.version>
+		<virtualan.version>1.0.7</virtualan.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
-		<spring.boot.version>2.4.3</spring.boot.version>
+		<spring.boot.version>2.3.0.RELEASE</spring.boot.version>
 		<springfox.version>2.9.2</springfox.version>
 		<groovy.version>2.4.7</groovy.version>
 		<json.version>20190722</json.version>
@@ -118,16 +118,11 @@
 			<version>2.10.5.1</version>
 		</dependency>
 
-		<dependency>
-			<groupId>io.virtualan</groupId>
-			<artifactId>idaithalam</artifactId>
-			<version>${idaithalam.version}</version>
-		</dependency>
 
 		<!-- START Virtual Service API support -->
 		<dependency>
 			<groupId>io.virtualan</groupId>
-			<artifactId>virtualan-plugin</artifactId>
+			<artifactId>virtualization</artifactId>
 			<version>${virtualan.version}</version>
 			<exclusions>
 				<exclusion>
@@ -149,6 +144,14 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>io.virtualan</groupId>
+			<artifactId>idaithalam</artifactId>
+			<version>${idaithalam.version}</version>
+		</dependency>
+
+		<!-- START Virtual Service API support -->
+
 		<!-- HyperSQL DB -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>

From 4aff09b2b9f78f91b7b24ebe5f18f6bccb433115 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sun, 18 Apr 2021 23:38:56 -0500
Subject: [PATCH 03/29] Open api contract validation

---
 modules/idaithalam/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 20d480e6..2d1cbc51 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -6,7 +6,7 @@
   <name>idaithalam-platform-testing</name>
   <version>1.2.4-SNAPSHOT</version>
   <properties>
-    <cucumblan-api.version>1.1.11-SNAPSHOT</cucumblan-api.version>
+    <cucumblan-api.version>1.1.11</cucumblan-api.version>
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>

From 44438e8c5bbba05c939526af9d5e1380f847c423 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sun, 18 Apr 2021 23:43:08 -0500
Subject: [PATCH 04/29] Open api contract validation

---
 samples/idaithalam-openapi-contract/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/idaithalam-openapi-contract/pom.xml b/samples/idaithalam-openapi-contract/pom.xml
index cff4860f..33ce62cb 100644
--- a/samples/idaithalam-openapi-contract/pom.xml
+++ b/samples/idaithalam-openapi-contract/pom.xml
@@ -8,7 +8,7 @@
 	<name>idaithalam-opeapi-contract</name>
 	<version>1.0.0-SNAPSHOT</version>
 	<properties>
-		<idaithalam.version>1.2.3</idaithalam.version>
+		<idaithalam.version>1.1.5</idaithalam.version>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>

From fe9ce2d3d0f7bafe7679ea90de77ecf545f712f7 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sun, 18 Apr 2021 23:44:20 -0500
Subject: [PATCH 05/29] [maven-release-plugin] prepare release
 idaithalam-project-1.2.4

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 2d1cbc51..2c336e67 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <properties>
     <cucumblan-api.version>1.1.11</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.4</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index 0521765f..9254f788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.4</tag>
   </scm>
   <developers>
     <developer>

From d1c34735e024b949595a99e6d2341c7d3f62d3a2 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sun, 18 Apr 2021 23:44:21 -0500
Subject: [PATCH 06/29] [maven-release-plugin] prepare for next development
 iteration

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 2c336e67..6cb794c9 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <properties>
     <cucumblan-api.version>1.1.11</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.4</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index 9254f788..2398a929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.4</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <developer>

From c8057870ade34434ea99dcfddeb9f54b83e1c4d6 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Mon, 19 Apr 2021 20:57:59 -0500
Subject: [PATCH 07/29] Updated Security for Mini api flow

---
 modules/idaithalam/pom.xml                    |   2 +-
 .../generator/ExcelToCollectionGenerator.java |  14 ++++++--------
 samples/idaithalam-excel-apitesting/pom.xml   |   2 +-
 .../test/APITestWithExcelAsRunManager.java    |  12 +++++++++++-
 .../virtualan_collection_pet_empty.xlsx       | Bin 5657 -> 5896 bytes
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 6cb794c9..feb02fa6 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -6,7 +6,7 @@
   <name>idaithalam-platform-testing</name>
   <version>1.2.5-SNAPSHOT</version>
   <properties>
-    <cucumblan-api.version>1.1.11</cucumblan-api.version>
+    <cucumblan-api.version>1.1.12-SNAPSHOT</cucumblan-api.version>
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index 2b4d774f..137503ea 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -183,20 +183,19 @@ private static Map<String, JSONArray> buildByMiniCategory(JSONArray virtualanArr
   private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
       SheetObject sheetObject)
       throws MalformedURLException {
-    Map<String, String> row;
     Map<Integer, String> headers = new HashMap<>();
     JSONArray virtualanArray = new JSONArray();
     for (Row nextRow : sheetObject.getFirstSheet()) {
       if (headers.isEmpty()) {
         headers = getHeader(nextRow);
       } else {
-        row = getRow(nextRow, headers);
+        Map<String, String> finalRow = getRow(nextRow, headers);
         if (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
-            generatedTestCaseList.contains(row.get("TestCaseName"))) {
-          if (row.get("Type") == null || "REST".equalsIgnoreCase(row.get("Type"))) {
+            generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x))) {
+          if (finalRow.get("Type") == null || "REST".equalsIgnoreCase(finalRow.get("Type"))) {
             JSONObject object = buildRESTVirtualanCollection(sheetObject.getBasePath(),
-                row);
-            populateConfigMaps(row, sheetObject.getCucumblanMap(),
+                finalRow);
+            populateConfigMaps(finalRow, sheetObject.getCucumblanMap(),
                 sheetObject.getExcludeResponseMap());
             virtualanArray.put(object);
           }
@@ -211,8 +210,7 @@ private static boolean byEachTestCase(List<String> generatedTestCaseList,
       String scenarioId) {
     return (!IdaithalamConfiguration.isWorkFlow()
         && (generatedTestCaseList == null || generatedTestCaseList.isEmpty()
-        || generatedTestCaseList
-        .contains(scenarioId)));
+        || generatedTestCaseList.stream().anyMatch(x -> scenarioId.contains(x))));
 
   }
 
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index e350937b..24ed633c 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.4-SNAPSHOT</idaithalam.version>
+		<idaithalam.version>1.2.5-SNAPSHOT</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
index 458a479c..709cce39 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
@@ -233,11 +233,21 @@ public void executeApiTests_empty_7() {
     int status =0 ;
     try {
       IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\\r\\\\\\\\n");
+      //pass the spreadsheet that you want to pass to the user
+      IdaithalamConfiguration.setProperty("workflow","Disabled");
+      List<String> list = new ArrayList<>();
+      //Add the testcaseName that List of testcases to be executed from the excel
+      //for the test selected execution
+      //list.add("PetPost");
+      list.add("PetGet");  // uncomment and test again see the summary report
+      //list.add("PetGet-Test");  // uncomment and test again see the summary report
+
+
       int testPlanIndex = 7;
       File f  = new File(System.getProperty("user.dir") +"/target/"+testPlanIndex);
       if(!f.exists())
         f.mkdir();
-      ExcelToCollectionGenerator.createCollection(null, "virtualan_collection_pet_empty.xlsx",
+      ExcelToCollectionGenerator.createCollection(list, "virtualan_collection_pet_empty.xlsx",
           System.getProperty("user.dir") +"/target/"+testPlanIndex);
       //Generate feature and summary page html report for the selected testcase from the excel
       status = IdaithalamExecutor.validateContract("Scriptlet testcase execution version 5", System.getProperty("user.dir") +"/target/"+testPlanIndex);
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_empty.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_empty.xlsx
index 272328a756a434b7854f764ff1c3e051536831f6..00b8f9b6157a11fa873bb0e27fc55e760de3a1d1 100644
GIT binary patch
delta 2982
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

delta 2753
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
E1NaxiUjP6A


From 378b2c1690f505a23640d578afcfa26b6226efba Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Mon, 19 Apr 2021 22:00:41 -0500
Subject: [PATCH 08/29] Updated Security for Mini api flow

---
 modules/idaithalam/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index feb02fa6..1b63d129 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -6,7 +6,7 @@
   <name>idaithalam-platform-testing</name>
   <version>1.2.5-SNAPSHOT</version>
   <properties>
-    <cucumblan-api.version>1.1.12-SNAPSHOT</cucumblan-api.version>
+    <cucumblan-api.version>1.1.12</cucumblan-api.version>
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>

From 2e3e7e1ee5673edce5bf4472157da92cc300d983 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Mon, 19 Apr 2021 22:01:51 -0500
Subject: [PATCH 09/29] [maven-release-plugin] prepare release
 idaithalam-project-1.2.5

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 1b63d129..7ab6b3df 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <properties>
     <cucumblan-api.version>1.1.12</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.5</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index 2398a929..cb66c3eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.5</tag>
   </scm>
   <developers>
     <developer>

From 51447810b8046db36c2bcb088c2379c953b68633 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Mon, 19 Apr 2021 22:01:51 -0500
Subject: [PATCH 10/29] [maven-release-plugin] prepare for next development
 iteration

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 7ab6b3df..a30af8f3 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <properties>
     <cucumblan-api.version>1.1.12</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.5</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index cb66c3eb..21a7aa2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.5</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <developer>

From cead3ebf5b42385e30978137e2d1e3585d3f2eb7 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Tue, 20 Apr 2021 18:42:14 -0500
Subject: [PATCH 11/29] Updated Workflow disable feature to enable all
 testcases

---
 .../generator/ExcelToCollectionGenerator.java |  27 +++++-----
 samples/idaithalam-excel-apitesting/pom.xml   |   2 +-
 .../test/APITestWithExcelAsRunManager.java    |  46 ++++++++++++++++--
 .../virtualan_collection_pet_sheet_2.xlsx     | Bin 0 -> 7988 bytes
 4 files changed, 58 insertions(+), 17 deletions(-)
 create mode 100644 samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_sheet_2.xlsx

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index 137503ea..42ff1958 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -626,18 +626,21 @@ private void createCollections(List<String> generatedTestCaseList, int sheet, Sh
         throws MalformedURLException {
       JSONArray virtualanArray = getObjectSheet(generatedTestCaseList, sheetObject);
       log.info(virtualanArray.toString());
-      if (IdaithalamConfiguration.isWorkFlow() && virtualanArray.length() > 0) {
-        CreateFileInfo createFileInfo = new CreateFileInfo();
-        createFileInfo.setGeneratedPath(generatedPath);
-        createFileInfo.setCucumblanMap(cucumblanMap);
-        createFileInfo.setVirtualanArray(virtualanArray);
-        createFileInfo.setTestcaseName(
-            "Virtualan_" + sheet + "_" + firstSheet.getSheetName().replaceAll(" ", "_")
-                + "_WORKFLOW_" + sheet);
-        createFileInfo.setScenario("WORKFLOW:" + firstSheet.getSheetName());
-        createIdaithalamProcessingFile(createFileInfo);
-      } else {
-        getAsSingleFile(sheet, generatedTestCaseList, generatedPath, cucumblanMap, virtualanArray);
+      if(virtualanArray.length() > 0) {
+        if (IdaithalamConfiguration.isWorkFlow()) {
+          CreateFileInfo createFileInfo = new CreateFileInfo();
+          createFileInfo.setGeneratedPath(generatedPath);
+          createFileInfo.setCucumblanMap(cucumblanMap);
+          createFileInfo.setVirtualanArray(virtualanArray);
+          createFileInfo.setTestcaseName(
+              "Virtualan_" + sheet + "_" + firstSheet.getSheetName().replaceAll(" ", "_")
+                  + "_WORKFLOW_" + sheet);
+          createFileInfo.setScenario("WORKFLOW:" + firstSheet.getSheetName());
+          createIdaithalamProcessingFile(createFileInfo);
+        } else {
+          getAsSingleFile(sheet, generatedTestCaseList, generatedPath, cucumblanMap,
+              virtualanArray);
+        }
       }
     }
   }
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index 24ed633c..91fc5cb6 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.5-SNAPSHOT</idaithalam.version>
+		<idaithalam.version>1.2.6-SNAPSHOT</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
index 709cce39..51da4a9c 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
@@ -32,12 +32,13 @@ public  void testAfterClass(){
     public void executeApiTests_1(){
         int status =0 ;
         try {
-            int testcase =1;
+          IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\\r\\\\\\\\n");
+          int testcase =1;
             List<String> list = new ArrayList<>();
             //Add the testcaseName that List of testcases to be executed from the excel
             //for the test selected execution
-            //list.add("PetPost");
-            //list.add("PetGet");  // uncomment and test again see the summary report
+            list.add("PetPost");
+            list.add("PetGet");  // uncomment and test again see the summary report
             File f  = new File(System.getProperty("user.dir") +"/target/"+testcase);
             if(!f.exists())
                 f.mkdir();
@@ -239,7 +240,7 @@ public void executeApiTests_empty_7() {
       //Add the testcaseName that List of testcases to be executed from the excel
       //for the test selected execution
       //list.add("PetPost");
-      list.add("PetGet");  // uncomment and test again see the summary report
+      //list.add("PetGet");  // uncomment and test again see the summary report
       //list.add("PetGet-Test");  // uncomment and test again see the summary report
 
 
@@ -264,4 +265,41 @@ public void executeApiTests_empty_7() {
 
 
 
+  @Test
+  public void executeApiTests_multiplesheet_8() {
+    int status =0 ;
+    try {
+      IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\\r\\\\\\\\n");
+      //pass the spreadsheet that you want to pass to the user
+      IdaithalamConfiguration.setProperty("workflow","Disabled");
+      List<String> list = new ArrayList<>();
+      //Add the testcaseName that List of testcases to be executed from the excel
+      //for the test selected execution
+      list.add("EDI271_1");
+      list.add("EDI271");
+      list.add("PetPost_3");
+      //list.add("PetGet");  // uncomment and test again see the summary report
+      //list.add("PetGet-Test");  // uncomment and test again see the summary report
+
+
+      int testPlanIndex = 8;
+      File f  = new File(System.getProperty("user.dir") +"/target/"+testPlanIndex);
+      if(!f.exists())
+        f.mkdir();
+      ExcelToCollectionGenerator.createCollection(list, "virtualan_collection_pet_sheet_2.xlsx",
+          System.getProperty("user.dir") +"/target/"+testPlanIndex);
+      //Generate feature and summary page html report for the selected testcase from the excel
+      status = IdaithalamExecutor.validateContract("Scriptlet testcase execution version 5", System.getProperty("user.dir") +"/target/"+testPlanIndex);
+      System.out.println(status);
+      if(status != 0) {
+        Assert.assertTrue(false);
+      }
+      Assert.assertTrue   (true);
+    }catch (Exception e){
+      System.out.println(e.getMessage());
+      Assert.assertTrue(false);
+    }
+  }
+
+
 }
\ No newline at end of file
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_sheet_2.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_pet_sheet_2.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8d17aba617f65f0dc1ff6f2d1a034ea63078e0ca
GIT binary patch
literal 7988
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
V{9W=vL80G$-0v8_gyjD0{{R)UT}S``

literal 0
HcmV?d00001


From c460408f52770d75ed094612fcf4ef73e0ed4aa2 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Tue, 20 Apr 2021 18:43:42 -0500
Subject: [PATCH 12/29] [maven-release-plugin] prepare release
 idaithalam-project-1.2.6

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index a30af8f3..ecf7ff18 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <properties>
     <cucumblan-api.version>1.1.12</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.6</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index 21a7aa2f..f74bc51c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.6</tag>
   </scm>
   <developers>
     <developer>

From 3512d7aa97b76ba05314a8889f8e6ae3d4968725 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Tue, 20 Apr 2021 18:43:43 -0500
Subject: [PATCH 13/29] [maven-release-plugin] prepare for next development
 iteration

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index ecf7ff18..2411ab8b 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <properties>
     <cucumblan-api.version>1.1.12</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.6</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index f74bc51c..e991aea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.6</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <developer>

From e07751aa370ee24b7aa5451777b53e4099b36a7c Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Thu, 22 Apr 2021 12:22:50 -0500
Subject: [PATCH 14/29] Updated Workflow disable feature to enable all
 testcases

---
 .../io/virtualan/idaithalam/core/api/MassApiExecutor.java  | 2 +-
 .../core/generator/ExcelToCollectionGenerator.java         | 7 ++++---
 samples/idaithalam-excel-apitesting/pom.xml                | 2 +-
 .../io/virtualan/test/APITestWithExcelAsRunManager.java    | 2 +-
 .../src/test/resources/get_response_empty.json             | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/api/MassApiExecutor.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/api/MassApiExecutor.java
index 7558a4f6..1da5902a 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/api/MassApiExecutor.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/api/MassApiExecutor.java
@@ -25,7 +25,7 @@ public static boolean invoke(String configMapper) throws InterruptedException {
         .getResourceAsStream(configMapper);
     ExecutionPlanner executionPlanner = yaml.load(inputStream);
     ExecutorService executor = Executors
-        .newFixedThreadPool(executionPlanner.getApiExecutor().size());
+        .newFixedThreadPool(executionPlanner.getParallelExecution());
     List<Future<Integer>> futures = new ArrayList<>();
     executionPlanner.getApiExecutor().stream().forEach(
         x -> {
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index 42ff1958..52b3f864 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -185,13 +185,14 @@ private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
       throws MalformedURLException {
     Map<Integer, String> headers = new HashMap<>();
     JSONArray virtualanArray = new JSONArray();
-    for (Row nextRow : sheetObject.getFirstSheet()) {
+    for (int i =0; i<sheetObject.getFirstSheet().getPhysicalNumberOfRows(); i++) {
+      Row nextRow = sheetObject.getFirstSheet().getRow(i);
       if (headers.isEmpty()) {
         headers = getHeader(nextRow);
       } else {
         Map<String, String> finalRow = getRow(nextRow, headers);
-        if (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
-            generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x))) {
+        if (!finalRow.isEmpty() && (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
+            generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x)))) {
           if (finalRow.get("Type") == null || "REST".equalsIgnoreCase(finalRow.get("Type"))) {
             JSONObject object = buildRESTVirtualanCollection(sheetObject.getBasePath(),
                 finalRow);
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index 91fc5cb6..dd936c7b 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.6-SNAPSHOT</idaithalam.version>
+		<idaithalam.version>1.2.6</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
index 51da4a9c..4a02274c 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
@@ -233,7 +233,7 @@ public void executeApiTests_6() {
   public void executeApiTests_empty_7() {
     int status =0 ;
     try {
-      IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\\r\\\\\\\\n");
+      IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\r\\\\\\\\n");
       //pass the spreadsheet that you want to pass to the user
       IdaithalamConfiguration.setProperty("workflow","Disabled");
       List<String> list = new ArrayList<>();
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json b/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json
index d495bee2..5f91e416 100644
--- a/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json
+++ b/samples/idaithalam-excel-apitesting/src/test/resources/get_response_empty.json
@@ -1,14 +1,14 @@
 {
   "category": {
     "id": 200,
-    "name": "Bulldog"
+    "name": "Bulldog  \r\n Testing \r\n again"
   },
   "id": 201,
   "name": "",
   "photoUrls": [
     "string"
   ],
-  "status": "available \r\n Testing \r\n again ",
+  "status": "available",
   "tags": [
     {
       "id": 201,

From 23061824389957743fef53dba083b0aa3f835a56 Mon Sep 17 00:00:00 2001
From: elanj <elans3.java@gmail.com>
Date: Thu, 22 Apr 2021 15:03:10 -0500
Subject: [PATCH 15/29] Updated with Integration changes

---
 .../generator/ExcelToCollectionGenerator.java | 1220 +++++++++--------
 1 file changed, 617 insertions(+), 603 deletions(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index 52b3f864..a57ffffa 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -4,6 +4,7 @@
 import io.virtualan.idaithalam.core.UnableToProcessException;
 import io.virtualan.idaithalam.core.domain.CreateFileInfo;
 import io.virtualan.idaithalam.core.domain.SheetObject;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
@@ -37,612 +39,624 @@
 @Slf4j
 public class ExcelToCollectionGenerator {
 
-  private ExcelToCollectionGenerator() {
-  }
-
-
-  public static String convertStreamToString(InputStream is) throws IOException {
-    if (is != null) {
-      StringBuilder sb = new StringBuilder();
-
-      try {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-
-        String line;
-        while ((line = reader.readLine()) != null) {
-          if (!line.trim().equalsIgnoreCase("")) {
-            sb.append(line).append("\n");
-          }
-        }
-      } finally {
-        is.close();
-      }
-
-      return sb.toString();
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Create collection.
-   *
-   * @param generatedTestCaseList the generated test case list
-   * @param excelFilePath         the excel file path
-   * @param generatedPath         the generated path
-   * @throws IOException the io exception
-   */
-  public static void createCollection(List<String> generatedTestCaseList,
-      String excelFilePath,
-      String generatedPath)
-      throws IOException, UnableToProcessException {
-    createCollection(null, generatedTestCaseList,
-        excelFilePath,
-        generatedPath);
-
-  }
-
-  private static Map<Integer, String> getHeader(Row nextRow) {
-    Map<Integer, String> headers = new HashMap<>();
-    int headerIndex = 0;
-    for (Cell cell : nextRow) {
-      headers.put(headerIndex++, getCellValue(cell));
-
-    }
-    return headers;
-  }
-
-  private static Map<String, String> getRow(Row nextRow, Map<Integer, String> headers) {
-    Map<String, String> dataMap = new HashMap<>();
-    for (Cell cell : nextRow) {
-      String key = headers.get(cell.getColumnIndex());
-      dataMap.put(key, getCellValue(cell));
-    }
-    return dataMap;
-  }
-
-  /**
-   * Create collection.
-   *
-   * @param basePath              the base path
-   * @param generatedTestCaseList the generated test case list
-   * @param excelFilePath         the excel file path
-   * @param generatedPath         the generated path
-   * @throws IOException the io exception
-   */
-  public static void createCollection(String basePath, List<String> generatedTestCaseList,
-      String excelFilePath,
-      String generatedPath)
-      throws IOException, UnableToProcessException {
-    InputStream stream = getInputStream(basePath, excelFilePath);
-    try {
-      if (stream != null) {
-        BuildCollections buildCollections = new BuildCollections(basePath, generatedTestCaseList,
-            generatedPath, stream).createCollection();
-        Map<String, String> excludeResponseMap = buildCollections.getExcludeResponseMap();
-        Map<String, String> cucumblanMap = buildCollections.getCucumblanMap();
-        createPrpos(generatedPath, cucumblanMap, "cucumblan.properties");
-        InputStream streamEnv = Thread.currentThread().getContextClassLoader()
-            .getResourceAsStream("cucumblan-env.properties");
-        if (streamEnv != null) {
-          createPrpos(generatedPath, streamEnv, "cucumblan-env.properties");
-        }
-        if (!excludeResponseMap.isEmpty()) {
-          createPrpos(generatedPath, excludeResponseMap, "exclude-response.properties");
-        }
-        stream.close();
-      } else {
-        log.error(
-            "Unable to create collection for the given excel file " + excelFilePath + " <<< ");
-      }
-    } catch (Exception e) {
-      log.error(
-          "Unable to create collection for the given excel file " + excelFilePath + " >>> " + e
-              .getMessage());
-    }
-
-  }
-
-  private static void getAsSingleFile(int sheet, List<String> generatedTestCaseList,
-      String generatedPath,
-      Map<String, String> cucumblanMap, JSONArray virtualanArray) {
-    Map<String, JSONArray> arrayMap = buildByMiniCategory(virtualanArray);
-    for (Map.Entry<String, JSONArray> entry : arrayMap.entrySet()) {
-      JSONArray virtualanSingle = entry.getValue();
-      String scenarioId = virtualanSingle.getJSONObject(0).getString("scenarioId").split("-")[0];
-      if (byEachTestCase(generatedTestCaseList, scenarioId)) {
-        CreateFileInfo createFileInfo = new CreateFileInfo();
-        createFileInfo.setGeneratedPath(generatedPath);
-        createFileInfo.setCucumblanMap(cucumblanMap);
-        createFileInfo.setVirtualanArray(virtualanSingle);
-        createFileInfo
-            .setTestcaseName(
-                "Virtualan_" + sheet + "_" + scenarioId);
-        createFileInfo.setScenario(scenarioId);
-        createIdaithalamProcessingFile(createFileInfo);
-      }
-    }
-  }
-
-  private static Map<String, JSONArray> buildByMiniCategory(JSONArray virtualanArray) {
-    Map<String, JSONArray> arrayMap = new HashMap<>();
-    for (int i = 0; i < virtualanArray.length(); i++) {
-      String scenarioId = virtualanArray.getJSONObject(i).getString("scenarioId").split("-")[0];
-      JSONArray array = null;
-      if (arrayMap.containsKey(scenarioId)) {
-        array = arrayMap.get(scenarioId);
-      } else {
-        array = new JSONArray();
-      }
-      array.put(virtualanArray.getJSONObject(i));
-      arrayMap.put(scenarioId, array);
-    }
-    return arrayMap;
-  }
-
-  private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
-      SheetObject sheetObject)
-      throws MalformedURLException {
-    Map<Integer, String> headers = new HashMap<>();
-    JSONArray virtualanArray = new JSONArray();
-    for (int i =0; i<sheetObject.getFirstSheet().getPhysicalNumberOfRows(); i++) {
-      Row nextRow = sheetObject.getFirstSheet().getRow(i);
-      if (headers.isEmpty()) {
-        headers = getHeader(nextRow);
-      } else {
-        Map<String, String> finalRow = getRow(nextRow, headers);
-        if (!finalRow.isEmpty() && (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
-            generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x)))) {
-          if (finalRow.get("Type") == null || "REST".equalsIgnoreCase(finalRow.get("Type"))) {
-            JSONObject object = buildRESTVirtualanCollection(sheetObject.getBasePath(),
-                finalRow);
-            populateConfigMaps(finalRow, sheetObject.getCucumblanMap(),
-                sheetObject.getExcludeResponseMap());
-            virtualanArray.put(object);
-          }
-        }
-      }
-    }
-    return virtualanArray;
-  }
-
-
-  private static boolean byEachTestCase(List<String> generatedTestCaseList,
-      String scenarioId) {
-    return (!IdaithalamConfiguration.isWorkFlow()
-        && (generatedTestCaseList == null || generatedTestCaseList.isEmpty()
-        || generatedTestCaseList.stream().anyMatch(x -> scenarioId.contains(x))));
-
-  }
-
-  /**
-   * Gets input stream.
-   *
-   * @param basePath                the base path
-   * @param fileNameWithSubCategory the file name with sub category
-   * @return the input stream
-   * @throws FileNotFoundException the file not found exception
-   */
-  public static InputStream getInputStream(String basePath, String fileNameWithSubCategory)
-      throws FileNotFoundException, UnableToProcessException {
-    InputStream stream = null;
-    String filePath = basePath + File.separator + fileNameWithSubCategory;
-    File file = new File(filePath);
-    File fileSub = new File(fileNameWithSubCategory);
-    if (file.exists()) {
-      stream = new FileInputStream(file);
-    } else if (fileSub.exists()) {
-      stream = new FileInputStream(fileSub);
-    }
-    if (stream == null) {
-      stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
-      if (stream == null) {
-        stream = Thread.currentThread().getContextClassLoader()
-            .getResourceAsStream(fileNameWithSubCategory);
-      }
-    }
-    if (stream == null) {
-      stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
-      if (stream == null) {
-        stream = ExcelToCollectionGenerator.class.getClassLoader()
-            .getResourceAsStream(fileNameWithSubCategory);
-      }
-    }
-    if (stream == null) {
-      log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-      throw new UnableToProcessException(
-          " File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-    }
-    return stream;
-  }
-
-  /**
-   * Gets file as string.
-   *
-   * @param basePath                the base path
-   * @param fileNameWithSubCategory the file name with sub category
-   * @return the file as string
-   * @throws IOException the io exception
-   */
-  public static String getFileAsString(String basePath, String fileNameWithSubCategory)
-      throws IOException {
-    InputStream stream = null;
-    String filePath = basePath + File.separator + fileNameWithSubCategory;
-    File file = new File(filePath);
-    File fileSub = new File(fileNameWithSubCategory);
-    if (file.exists()) {
-      stream = new FileInputStream(file);
-    } else if (fileSub.exists()) {
-      stream = new FileInputStream(fileSub);
-    }
-    stream = getInputStream(fileNameWithSubCategory, stream, filePath);
-    if (stream == null) {
-      stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
-      if (stream == null) {
-        stream = ExcelToCollectionGenerator.class.getClassLoader()
-            .getResourceAsStream(fileNameWithSubCategory);
-      }
-    }
-    if (stream == null) {
-      log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-      System.exit(-1);
-    }
-    return convertStreamToString(stream);
-  }
-
-  private static InputStream getInputStream(String fileNameWithSubCategory,
-      InputStream stream,
-      String filePath) {
-    if (stream == null) {
-      stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
-      if (stream == null) {
-        stream = Thread.currentThread().getContextClassLoader()
-            .getResourceAsStream(fileNameWithSubCategory);
-      }
-    }
-    return stream;
-  }
-
-  private static Map<String, String> getCucumblan() {
-    Map<String, String> cucumblanMap = new HashMap<>();
-    cucumblanMap.put("virtualan.data.load", "");
-    cucumblanMap.put("virtualan.data.heading", "");
-    cucumblanMap.put("virtualan.data.type", "VIRTUALAN");
-    return cucumblanMap;
-  }
-
-  private static JSONObject buildRESTVirtualanCollection(String basePath,
-      Map<String, String> dataMap) throws MalformedURLException {
-    JSONObject virtualanObj = new JSONObject();
-    JSONArray paramsArray = new JSONArray();
-    getMultiRunValue(dataMap, virtualanObj, paramsArray);
-    virtualanObj.put("contentType", dataMap.get("ContentType"));
-    buildParam("contentType", dataMap.get("ContentType"), paramsArray, "HEADER_PARAM");
-    createProcessingType(dataMap, paramsArray, "FormParams", "FORM_PARAM");
-    createProcessingType(dataMap, paramsArray, "RequestHeaders", "HEADER_PARAM");
-    createProcessingType(dataMap, paramsArray, "ResponseProcessingType", "HEADER_PARAM");
-    virtualanObj.put("scenarioId", dataMap.get("TestCaseName"));
-    virtualanObj.put("scenario", dataMap.get("TestCaseNameDesc"));
-    createProcessingType(dataMap, paramsArray, "StoreResponseVariables", "STORAGE_PARAM");
-    createProcessingType(dataMap, paramsArray, "AddifyVariables", "ADDIFY_PARAM");
-    createProcessingType(dataMap, paramsArray, "CookieVariables", "COOKIE_PARAM");
-    getValue("Tags", dataMap, virtualanObj);
-    getValue("SkipScenario", dataMap, virtualanObj);
-    getSecurityValue(dataMap, virtualanObj);
-    if (dataMap.get("Action") != null) {
-      virtualanObj.put("method",
-          dataMap.get("Action").toUpperCase());
-    } else {
-      log.error("HTTP ACTION IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
-    }
-    if (dataMap.get("URL") != null) {
-      URL aURL = new URL(dataMap.get("URL"));
-      String resource = getResource(aURL.getPath());
-      virtualanObj.put("url", aURL.getPath());
-      virtualanObj.put("resource", resource);
-      createQueryParam(aURL.getQuery(), paramsArray);
-    } else {
-      log.error("URL IS MANDATORY!!! for " + dataMap.get("TestCaseName"));
-    }
-    if (dataMap.get("RequestFile") != null || dataMap.get("RequestContent") != null) {
-      virtualanObj.put("input", buildObjectRequest(basePath, dataMap));
-    }
-    if (dataMap.get("ResponseByFields") != null) {
-      virtualanObj.put("outputFields", dataMap.get("ResponseByFields"));
-    } else if (dataMap.get("ResponseFile") != null || dataMap.get("ResponseContent") != null) {
-      if (dataMap.get("IncludesByPath") != null) {
-        virtualanObj.put("outputPaths", dataMap.get("IncludesByPath"));
-      }
-      virtualanObj.put("output", buildObjectResponse(basePath, dataMap));
-    }
-    builHttpStausCode(dataMap, virtualanObj);
-    if (paramsArray.length() > 0) {
-      virtualanObj.put("availableParams", paramsArray);
-    }
-    return virtualanObj;
-  }
-
-  private static void getSecurityValue(Map<String, String> dataMap, JSONObject virtualanObj) {
-    String security = dataMap.get("Security");
-    if (security != null && !security.isEmpty() && security.split("=").length == 2) {
-      virtualanObj.put("security", "okta");
-    } else if (dataMap.get("Security") != null) {
-      virtualanObj.put("security", security);
-    }
-
-  }
-
-  private static void getValue(String key, Map<String, String> dataMap, JSONObject virtualanObj) {
-    if (dataMap.get(key) != null) {
-      virtualanObj.put(key, dataMap.get(key));
-    }
-  }
-
-  private static void getMultiRunValue(Map<String, String> dataMap, JSONObject virtualanObj,
-      JSONArray paramsArray) {
-    if (dataMap.get("MultiRun") != null) {
-      virtualanObj.put("MultiRun", dataMap.get("MultiRun"));
-      String row = dataMap.get("MultiRun").split(";")[0];
-      for (String param : row.split("\\|")) {
-        buildParam(param, "<" + param + ">", paramsArray, "ADDIFY_PARAM");
-      }
-    }
-  }
-
-
-  private static void builHttpStausCode(Map<String, String> dataMap, JSONObject virtualanObj) {
-    if (dataMap.get("StatusCode") != null) {
-      virtualanObj.put("httpStatusCode", dataMap.get("StatusCode"));
-    } else {
-      log.error("HTTP STATUS CODE IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
-    }
-  }
-
-  private static String buildObjectResponse(String basePath, Map<String, String> responseFile) {
-    try {
-      String body = null;
-      if (responseFile.get("ResponseContent") != null) {
-        body = responseFile.get("ResponseContent");
-      } else if (responseFile.get("ResponseFile") != null) {
-        body = getFileAsString(basePath, responseFile.get("ResponseFile"));
-      }
-      if (body != null) {
-        return body.trim();
-      } else {
-        log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
-            + responseFile.get("ResponseContent"));
-      }
-    } catch (IOException e) {
-      log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
-          + responseFile.get("ResponseContent"));
-    }
-    return null;
-  }
-
-  private static String buildObjectRequest(String basePath, Map<String, String> requestFile) {
-    try {
-      String body = null;
-      if (requestFile.get("RequestContent") != null) {
-        body = requestFile.get("RequestContent");
-      } else if (requestFile.get("RequestFile") != null) {
-        body = getFileAsString(basePath, requestFile.get("RequestFile"));
-      }
-      if (body != null) {
-        return body.trim();
-      } else {
-        log.warn("Unable to load " + requestFile + " file or content > " + requestFile);
-      }
-    } catch (IOException e) {
-      log.warn("Unable to load " + requestFile + " file or conten> " + requestFile);
-    }
-    return null;
-  }
-
-  private static void createProcessingType(Map<String, String> dataMap,
-      JSONArray paramsArray, String requestProcessingType, String param) {
-    if (dataMap.get(requestProcessingType) != null) {
-      String[] processTypes = dataMap.get(requestProcessingType).split(";");
-      for (String keyValue : processTypes) {
-        String[] processType = keyValue.split("=");
-        if (processType.length == 2) {
-          buildParam(processType[0], processType[1], paramsArray, param);
-        }
-      }
-    }
-  }
-
-  private static void createIdaithalamProcessingFile(
-      CreateFileInfo createFileInfo) {
-    String fileCreated = generateExcelJson(createFileInfo.getGeneratedPath(),
-        createFileInfo.getVirtualanArray(),
-        createFileInfo.getTestcaseName());
-    if (fileCreated != null) {
-      String filesCreated = createFileInfo.getCucumblanMap().get("virtualan.data.load");
-      createFileInfo.getCucumblanMap().put("virtualan.data.load", filesCreated + fileCreated + ";");
-      String headings = createFileInfo.getCucumblanMap().get("virtualan.data.heading");
-      createFileInfo.getCucumblanMap()
-          .put("virtualan.data.heading", headings + createFileInfo.getScenario() + ";");
-    }
-  }
-
-  private static String getResource(String resource) {
-    if (resource.split("/").length > 0) {
-      return resource.split("/")[1];
-    }
-    return "default";
-  }
-
-  private static void createPrpos(String path, InputStream stream, String fileName) {
-    try {
-      Properties props = new Properties();
-      //Populating the properties file
-      props.load(stream);
-      //Instantiating the FileInputStream for output file
-      FileOutputStream outputStrem = new FileOutputStream(
-          path + File.separator + fileName);
-      //Storing the properties file
-      props.store(outputStrem, "This is a " + fileName + " properties file");
-      log.info(fileName + " Properties file created......");
-    } catch (IOException e) {
-      log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
-    }
-  }
-
-  public static void createPrpos(String path, Map<String, String> propsMap, String fileName) {
-    try {
-      Properties props = new Properties();
-      //Populating the properties file
-      props.putAll(propsMap);
-      //Instantiating the FileInputStream for output file
-      FileOutputStream outputStrem = new FileOutputStream(
-          path + File.separator + fileName);
-      //Storing the properties file
-      props.store(outputStrem, "This is a " + fileName + " properties file");
-      log.info(fileName + " Properties file created......");
-    } catch (IOException e) {
-      log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
-    }
-  }
-
-  private static String generateExcelJson(String path, JSONArray excelArray, String fileName) {
-    String fileCreated = null;
-    try {
-      FileOutputStream outputStream = new FileOutputStream(
-          path + File.separator + fileName + ".json");
-      Writer writer = new OutputStreamWriter(outputStream);
-      CharSequence cs = excelArray.toString();
-      writer.append(cs);
-      writer.close();
-      fileCreated = fileName + ".json";
-    } catch (IOException e) {
-      log.warn(" Unable to generate Virtualan  JSON  " + fileName + " : " + e.getMessage());
-    }
-    return fileCreated;
-  }
-
-  private static void buildParam(String key, String value, JSONArray paramsArray, String param) {
-    JSONObject virtualanObjParam = new JSONObject();
-    virtualanObjParam.put("key", key);
-    virtualanObjParam.put("value", value);
-    virtualanObjParam.put("parameterType", param);
-    paramsArray.put(virtualanObjParam);
-  }
-
-  private static void createQueryParam(String queryString, JSONArray paramsArray) {
-    if (queryString != null) {
-      String[] querys = queryString.split("&");
-      for (String query : querys) {
-        JSONObject virtualanObjParam = new JSONObject();
-        String[] queryPart = query.split("=");
-        virtualanObjParam.put("key", queryPart[0]);
-        if (queryPart.length == 2) {
-          virtualanObjParam.put("value", queryPart[1]);
+    private ExcelToCollectionGenerator() {
+    }
+
+
+    public static String convertStreamToString(InputStream is) throws IOException {
+        if (is != null) {
+            StringBuilder sb = new StringBuilder();
+
+            try {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (!line.trim().equalsIgnoreCase("")) {
+                        sb.append(line).append("\n");
+                    }
+                }
+            } finally {
+                is.close();
+            }
+
+            return sb.toString();
         } else {
-          virtualanObjParam.put("value", "");
+            return null;
         }
-        virtualanObjParam.put("parameterType", "QUERY_PARAM");
-        paramsArray.put(virtualanObjParam);
-      }
-    }
-  }
-
-  private static void populateConfigMaps(
-      Map<String, String> dataMap, Map<String, String> cucumblanMap,
-      Map<String, String> excludeResponseMap) throws MalformedURLException {
-    URL aURL = new URL(dataMap.get("URL"));
-    String resource = getResource(aURL.getPath());
-    cucumblanMap.put("service.api." + resource,
-        aURL.getProtocol() + "://" + aURL.getAuthority());
-    String okta = dataMap.get("Security");
-    if (okta != null && !okta.isEmpty() && okta.split("=").length == 2) {
-      cucumblanMap.put("service.api.okta_token." + resource, okta.split("=")[1]);
-    }
-    if (dataMap.get("ExcludeFields") != null) {
-      excludeResponseMap.put(aURL.getPath(), dataMap.get("ExcludeFields"));
-    }
-  }
-
-  private static String getCellValue(Cell cell) {
-    if (cell.getCellTypeEnum() != CellType.FORMULA) {
-      switch (cell.getCellTypeEnum()) {
-        case STRING:
-          return cell.getStringCellValue().trim();
-        case BOOLEAN:
-          return String.valueOf(cell.getBooleanCellValue());
-        case NUMERIC:
-          return String.valueOf((int) cell.getNumericCellValue());
-        default:
-          return null;
-      }
-    }
-    return null;
-  }
-
-  private static class BuildCollections {
-
-    private final String basePath;
-    private final List<String> generatedTestCaseList;
-    private final String generatedPath;
-    private final InputStream stream;
-    private Map<String, String> excludeResponseMap;
-    private Map<String, String> cucumblanMap;
-
-    BuildCollections(String basePath, List<String> generatedTestCaseList,
-        String generatedPath,
-        InputStream stream) {
-      this.basePath = basePath;
-      this.generatedTestCaseList = generatedTestCaseList;
-      this.generatedPath = generatedPath;
-      this.stream = stream;
-    }
-
-    Map<String, String> getExcludeResponseMap() {
-      return excludeResponseMap;
-    }
-
-    Map<String, String> getCucumblanMap() {
-      return cucumblanMap;
-    }
-
-
-    BuildCollections createCollection() throws IOException {
-      excludeResponseMap = new HashMap<>();
-      cucumblanMap = getCucumblan();
-      try (Workbook workbook = new XSSFWorkbook(stream)) {
-        for (int sheet = 0; sheet < workbook.getNumberOfSheets(); sheet++) {
-          Sheet firstSheet = workbook.getSheetAt(sheet);
-          SheetObject sheetObject = new SheetObject();
-          sheetObject.setBasePath(basePath);
-          sheetObject.setExcludeResponseMap(excludeResponseMap);
-          sheetObject.setCucumblanMap(cucumblanMap);
-          sheetObject.setFirstSheet(firstSheet);
-          createCollections(generatedTestCaseList, sheet, firstSheet, sheetObject);
-        }
-      }
-      return this;
-    }
-
-    private void createCollections(List<String> generatedTestCaseList, int sheet, Sheet firstSheet,
-        SheetObject sheetObject)
-        throws MalformedURLException {
-      JSONArray virtualanArray = getObjectSheet(generatedTestCaseList, sheetObject);
-      log.info(virtualanArray.toString());
-      if(virtualanArray.length() > 0) {
-        if (IdaithalamConfiguration.isWorkFlow()) {
-          CreateFileInfo createFileInfo = new CreateFileInfo();
-          createFileInfo.setGeneratedPath(generatedPath);
-          createFileInfo.setCucumblanMap(cucumblanMap);
-          createFileInfo.setVirtualanArray(virtualanArray);
-          createFileInfo.setTestcaseName(
-              "Virtualan_" + sheet + "_" + firstSheet.getSheetName().replaceAll(" ", "_")
-                  + "_WORKFLOW_" + sheet);
-          createFileInfo.setScenario("WORKFLOW:" + firstSheet.getSheetName());
-          createIdaithalamProcessingFile(createFileInfo);
+    }
+
+    /**
+     * Create collection.
+     *
+     * @param generatedTestCaseList the generated test case list
+     * @param excelFilePath         the excel file path
+     * @param generatedPath         the generated path
+     * @throws IOException the io exception
+     */
+    public static void createCollection(List<String> generatedTestCaseList,
+                                        String excelFilePath,
+                                        String generatedPath)
+            throws IOException, UnableToProcessException {
+        createCollection(null, generatedTestCaseList,
+                excelFilePath,
+                generatedPath);
+
+    }
+
+    private static Map<Integer, String> getHeader(Row nextRow) {
+        Map<Integer, String> headers = new HashMap<>();
+        int headerIndex = 0;
+        for (Cell cell : nextRow) {
+            headers.put(headerIndex++, getCellValue(cell));
+
+        }
+        return headers;
+    }
+
+    private static Map<String, String> getRow(Row nextRow, Map<Integer, String> headers) {
+        Map<String, String> dataMap = new HashMap<>();
+        if(nextRow != null) {
+            int lastColumn = Math.max(nextRow.getLastCellNum(), 5);
+            if(lastColumn > 0) {
+                for (Cell cell : nextRow) {
+                    String key = headers.get(cell.getColumnIndex());
+                    dataMap.put(key, getCellValue(cell));
+                }
+            }
+        }else {
+            log.error(
+                    "Unable to process the row and row is empty >>> ");
+        }
+        return dataMap;
+    }
+
+    /**
+     * Create collection.
+     *
+     * @param basePath              the base path
+     * @param generatedTestCaseList the generated test case list
+     * @param excelFilePath         the excel file path
+     * @param generatedPath         the generated path
+     * @throws IOException the io exception
+     */
+    public static void createCollection(String basePath, List<String> generatedTestCaseList,
+                                        String excelFilePath,
+                                        String generatedPath)
+            throws IOException, UnableToProcessException {
+        try {
+            BuildCollections buildCollections = new BuildCollections(basePath, generatedTestCaseList,
+                    generatedPath, excelFilePath).createCollection();
+            Map<String, String> excludeResponseMap = buildCollections.getExcludeResponseMap();
+            Map<String, String> cucumblanMap = buildCollections.getCucumblanMap();
+            createPrpos(generatedPath, cucumblanMap, "cucumblan.properties");
+            InputStream streamEnv = Thread.currentThread().getContextClassLoader()
+                    .getResourceAsStream("cucumblan-env.properties");
+            if (streamEnv != null) {
+                createPrpos(generatedPath, streamEnv, "cucumblan-env.properties");
+            }
+            if (!excludeResponseMap.isEmpty()) {
+                createPrpos(generatedPath, excludeResponseMap, "exclude-response.properties");
+            }
+        } catch (Exception e) {
+            log.error(
+                    "Unable to create collection for the given excel file " + excelFilePath + " >>> " + e
+                            .getMessage());
+        }
+
+    }
+
+    private static void getAsSingleFile(int sheet, List<String> generatedTestCaseList,
+                                        String generatedPath,
+                                        Map<String, String> cucumblanMap, JSONArray virtualanArray) {
+        Map<String, JSONArray> arrayMap = buildByMiniCategory(virtualanArray);
+        for (Map.Entry<String, JSONArray> entry : arrayMap.entrySet()) {
+            JSONArray virtualanSingle = entry.getValue();
+            String scenarioId = virtualanSingle.getJSONObject(0).getString("scenarioId").split("-")[0];
+            if (byEachTestCase(generatedTestCaseList, scenarioId)) {
+                CreateFileInfo createFileInfo = new CreateFileInfo();
+                createFileInfo.setGeneratedPath(generatedPath);
+                createFileInfo.setCucumblanMap(cucumblanMap);
+                createFileInfo.setVirtualanArray(virtualanSingle);
+                createFileInfo
+                        .setTestcaseName(
+                                "Virtualan_" + sheet + "_" + scenarioId);
+                createFileInfo.setScenario(scenarioId);
+                createIdaithalamProcessingFile(createFileInfo);
+            }
+        }
+    }
+
+    private static Map<String, JSONArray> buildByMiniCategory(JSONArray virtualanArray) {
+        Map<String, JSONArray> arrayMap = new HashMap<>();
+        for (int i = 0; i < virtualanArray.length(); i++) {
+            String scenarioId = virtualanArray.getJSONObject(i).getString("scenarioId").split("-")[0];
+            JSONArray array = null;
+            if (arrayMap.containsKey(scenarioId)) {
+                array = arrayMap.get(scenarioId);
+            } else {
+                array = new JSONArray();
+            }
+            array.put(virtualanArray.getJSONObject(i));
+            arrayMap.put(scenarioId, array);
+        }
+        return arrayMap;
+    }
+
+    private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
+                                            SheetObject sheetObject)
+            throws MalformedURLException {
+        Map<Integer, String> headers = new HashMap<>();
+        JSONArray virtualanArray = new JSONArray();
+        for (int i = 0; i < sheetObject.getFirstSheet().getLastRowNum() ; i++) {
+            Row nextRow = sheetObject.getFirstSheet().getRow(i);
+            if (headers.isEmpty()) {
+                headers = getHeader(nextRow);
+            } else {
+                Map<String, String> finalRow = getRow(nextRow, headers);
+                if (finalRow != null && !finalRow.isEmpty() && (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
+                        generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x)))) {
+                    if (finalRow.get("Type") == null || "REST".equalsIgnoreCase(finalRow.get("Type"))) {
+                        JSONObject object = buildRESTVirtualanCollection(sheetObject.getBasePath(),
+                                finalRow);
+                        populateConfigMaps(finalRow, sheetObject.getCucumblanMap(),
+                                sheetObject.getExcludeResponseMap());
+                        virtualanArray.put(object);
+                    }
+                }
+            }
+        }
+        return virtualanArray;
+    }
+
+
+    private static boolean byEachTestCase(List<String> generatedTestCaseList,
+                                          String scenarioId) {
+        return (!IdaithalamConfiguration.isWorkFlow()
+                && (generatedTestCaseList == null || generatedTestCaseList.isEmpty()
+                || generatedTestCaseList.stream().anyMatch(x -> scenarioId.contains(x))));
+
+    }
+
+    /**
+     * Gets input stream.
+     *
+     * @param basePath                the base path
+     * @param fileNameWithSubCategory the file name with sub category
+     * @return the input stream
+     * @throws FileNotFoundException the file not found exception
+     */
+    public static InputStream getInputStream(String basePath, String fileNameWithSubCategory)
+            throws FileNotFoundException, UnableToProcessException {
+        InputStream stream = null;
+        String filePath = basePath + File.separator + fileNameWithSubCategory;
+        File file = new File(filePath);
+        File fileSub = new File(fileNameWithSubCategory);
+        if (file.exists()) {
+            stream = new FileInputStream(file);
+        } else if (fileSub.exists()) {
+            stream = new FileInputStream(fileSub);
+        }
+        if (stream == null) {
+            stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
+            if (stream == null) {
+                stream = Thread.currentThread().getContextClassLoader()
+                        .getResourceAsStream(fileNameWithSubCategory);
+            }
+        }
+        if (stream == null) {
+            stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
+            if (stream == null) {
+                stream = ExcelToCollectionGenerator.class.getClassLoader()
+                        .getResourceAsStream(fileNameWithSubCategory);
+            }
+        }
+        if (stream == null) {
+            log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+            throw new UnableToProcessException(
+                    " File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+        }
+        return stream;
+    }
+
+    /**
+     * Gets file as string.
+     *
+     * @param basePath                the base path
+     * @param fileNameWithSubCategory the file name with sub category
+     * @return the file as string
+     * @throws IOException the io exception
+     */
+    public static String getFileAsString(String basePath, String fileNameWithSubCategory)
+            throws IOException {
+        InputStream stream = null;
+        String filePath = basePath + File.separator + fileNameWithSubCategory;
+        File file = new File(filePath);
+        File fileSub = new File(fileNameWithSubCategory);
+        if (file.exists()) {
+            stream = new FileInputStream(file);
+        } else if (fileSub.exists()) {
+            stream = new FileInputStream(fileSub);
+        }
+        stream = getInputStream(fileNameWithSubCategory, stream, filePath);
+        if (stream == null) {
+            stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
+            if (stream == null) {
+                stream = ExcelToCollectionGenerator.class.getClassLoader()
+                        .getResourceAsStream(fileNameWithSubCategory);
+            }
+        }
+        if (stream == null) {
+            log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+            System.exit(-1);
+        }
+        return convertStreamToString(stream);
+    }
+
+    private static InputStream getInputStream(String fileNameWithSubCategory,
+                                              InputStream stream,
+                                              String filePath) {
+        if (stream == null) {
+            stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
+            if (stream == null) {
+                stream = Thread.currentThread().getContextClassLoader()
+                        .getResourceAsStream(fileNameWithSubCategory);
+            }
+        }
+        return stream;
+    }
+
+    private static Map<String, String> getCucumblan() {
+        Map<String, String> cucumblanMap = new HashMap<>();
+        cucumblanMap.put("virtualan.data.load", "");
+        cucumblanMap.put("virtualan.data.heading", "");
+        cucumblanMap.put("virtualan.data.type", "VIRTUALAN");
+        return cucumblanMap;
+    }
+
+    private static JSONObject buildRESTVirtualanCollection(String basePath,
+                                                           Map<String, String> dataMap) throws MalformedURLException {
+        JSONObject virtualanObj = new JSONObject();
+        JSONArray paramsArray = new JSONArray();
+        getMultiRunValue(dataMap, virtualanObj, paramsArray);
+        virtualanObj.put("contentType", dataMap.get("ContentType"));
+        buildParam("contentType", dataMap.get("ContentType"), paramsArray, "HEADER_PARAM");
+        createProcessingType(dataMap, paramsArray, "FormParams", "FORM_PARAM");
+        createProcessingType(dataMap, paramsArray, "RequestHeaders", "HEADER_PARAM");
+        createProcessingType(dataMap, paramsArray, "ResponseProcessingType", "HEADER_PARAM");
+        virtualanObj.put("scenarioId", dataMap.get("TestCaseName"));
+        virtualanObj.put("scenario", dataMap.get("TestCaseNameDesc"));
+        createProcessingType(dataMap, paramsArray, "StoreResponseVariables", "STORAGE_PARAM");
+        createProcessingType(dataMap, paramsArray, "AddifyVariables", "ADDIFY_PARAM");
+        createProcessingType(dataMap, paramsArray, "CookieVariables", "COOKIE_PARAM");
+        getValue("Tags", dataMap, virtualanObj);
+        getValue("SkipScenario", dataMap, virtualanObj);
+        getSecurityValue(dataMap, virtualanObj);
+        if (dataMap.get("Action") != null) {
+            virtualanObj.put("method",
+                    dataMap.get("Action").toUpperCase());
+        } else {
+            log.error("HTTP ACTION IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
+        }
+        if (dataMap.get("URL") != null) {
+            URL aURL = new URL(dataMap.get("URL"));
+            String resource = getResource(aURL.getPath());
+            virtualanObj.put("url", aURL.getPath());
+            virtualanObj.put("resource", resource);
+            createQueryParam(aURL.getQuery(), paramsArray);
         } else {
-          getAsSingleFile(sheet, generatedTestCaseList, generatedPath, cucumblanMap,
-              virtualanArray);
+            log.error("URL IS MANDATORY!!! for " + dataMap.get("TestCaseName"));
+        }
+        if (dataMap.get("RequestFile") != null || dataMap.get("RequestContent") != null) {
+            virtualanObj.put("input", buildObjectRequest(basePath, dataMap));
+        }
+        if (dataMap.get("ResponseByFields") != null) {
+            virtualanObj.put("outputFields", dataMap.get("ResponseByFields"));
+        } else if (dataMap.get("ResponseFile") != null || dataMap.get("ResponseContent") != null) {
+            if (dataMap.get("IncludesByPath") != null) {
+                virtualanObj.put("outputPaths", dataMap.get("IncludesByPath"));
+            }
+            virtualanObj.put("output", buildObjectResponse(basePath, dataMap));
+        }
+        builHttpStausCode(dataMap, virtualanObj);
+        if (paramsArray.length() > 0) {
+            virtualanObj.put("availableParams", paramsArray);
+        }
+        return virtualanObj;
+    }
+
+    private static void getSecurityValue(Map<String, String> dataMap, JSONObject virtualanObj) {
+        String security = dataMap.get("Security");
+        if (security != null && !security.isEmpty() && security.split("=").length == 2) {
+            virtualanObj.put("security", "okta");
+        } else if (dataMap.get("Security") != null) {
+            virtualanObj.put("security", security);
+        }
+
+    }
+
+    private static void getValue(String key, Map<String, String> dataMap, JSONObject virtualanObj) {
+        if (dataMap.get(key) != null) {
+            virtualanObj.put(key, dataMap.get(key));
+        }
+    }
+
+    private static void getMultiRunValue(Map<String, String> dataMap, JSONObject virtualanObj,
+                                         JSONArray paramsArray) {
+        if (dataMap.get("MultiRun") != null) {
+            virtualanObj.put("MultiRun", dataMap.get("MultiRun"));
+            String row = dataMap.get("MultiRun").split(";")[0];
+            for (String param : row.split("\\|")) {
+                buildParam(param, "<" + param + ">", paramsArray, "ADDIFY_PARAM");
+            }
+        }
+    }
+
+
+    private static void builHttpStausCode(Map<String, String> dataMap, JSONObject virtualanObj) {
+        if (dataMap.get("StatusCode") != null) {
+            virtualanObj.put("httpStatusCode", dataMap.get("StatusCode"));
+        } else {
+            log.error("HTTP STATUS CODE IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
+        }
+    }
+
+    private static String buildObjectResponse(String basePath, Map<String, String> responseFile) {
+        try {
+            String body = null;
+            if (responseFile.get("ResponseContent") != null) {
+                body = responseFile.get("ResponseContent");
+            } else if (responseFile.get("ResponseFile") != null) {
+                body = getFileAsString(basePath, responseFile.get("ResponseFile"));
+            }
+            if (body != null) {
+                return body.trim();
+            } else {
+                log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
+                        + responseFile.get("ResponseContent"));
+            }
+        } catch (IOException e) {
+            log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
+                    + responseFile.get("ResponseContent"));
+        }
+        return null;
+    }
+
+    private static String buildObjectRequest(String basePath, Map<String, String> requestFile) {
+        try {
+            String body = null;
+            if (requestFile.get("RequestContent") != null) {
+                body = requestFile.get("RequestContent");
+            } else if (requestFile.get("RequestFile") != null) {
+                body = getFileAsString(basePath, requestFile.get("RequestFile"));
+            }
+            if (body != null) {
+                return body.trim();
+            } else {
+                log.warn("Unable to load " + requestFile + " file or content > " + requestFile);
+            }
+        } catch (IOException e) {
+            log.warn("Unable to load " + requestFile + " file or conten> " + requestFile);
+        }
+        return null;
+    }
+
+    private static void createProcessingType(Map<String, String> dataMap,
+                                             JSONArray paramsArray, String requestProcessingType, String param) {
+        if (dataMap.get(requestProcessingType) != null) {
+            String[] processTypes = dataMap.get(requestProcessingType).split(";");
+            for (String keyValue : processTypes) {
+                String[] processType = keyValue.split("=");
+                if (processType.length == 2) {
+                    buildParam(processType[0], processType[1], paramsArray, param);
+                }
+            }
+        }
+    }
+
+    private static void createIdaithalamProcessingFile(
+            CreateFileInfo createFileInfo) {
+        String fileCreated = generateExcelJson(createFileInfo.getGeneratedPath(),
+                createFileInfo.getVirtualanArray(),
+                createFileInfo.getTestcaseName());
+        if (fileCreated != null) {
+            String filesCreated = createFileInfo.getCucumblanMap().get("virtualan.data.load");
+            createFileInfo.getCucumblanMap().put("virtualan.data.load", filesCreated + fileCreated + ";");
+            String headings = createFileInfo.getCucumblanMap().get("virtualan.data.heading");
+            createFileInfo.getCucumblanMap()
+                    .put("virtualan.data.heading", headings + createFileInfo.getScenario() + ";");
+        }
+    }
+
+    private static String getResource(String resource) {
+        if (resource.split("/").length > 0) {
+            return resource.split("/")[1];
+        }
+        return "default";
+    }
+
+    private static void createPrpos(String path, InputStream stream, String fileName) {
+        try {
+            Properties props = new Properties();
+            //Populating the properties file
+            props.load(stream);
+            //Instantiating the FileInputStream for output file
+            FileOutputStream outputStrem = new FileOutputStream(
+                    path + File.separator + fileName);
+            //Storing the properties file
+            props.store(outputStrem, "This is a " + fileName + " properties file");
+            log.info(fileName + " Properties file created......");
+        } catch (IOException e) {
+            log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
+        }
+    }
+
+    public static void createPrpos(String path, Map<String, String> propsMap, String fileName) {
+        try {
+            Properties props = new Properties();
+            //Populating the properties file
+            props.putAll(propsMap);
+            //Instantiating the FileInputStream for output file
+            FileOutputStream outputStrem = new FileOutputStream(
+                    path + File.separator + fileName);
+            //Storing the properties file
+            props.store(outputStrem, "This is a " + fileName + " properties file");
+            log.info(fileName + " Properties file created......");
+        } catch (IOException e) {
+            log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
+        }
+    }
+
+    private static String generateExcelJson(String path, JSONArray excelArray, String fileName) {
+        String fileCreated = null;
+        try {
+            FileOutputStream outputStream = new FileOutputStream(
+                    path + File.separator + fileName + ".json");
+            Writer writer = new OutputStreamWriter(outputStream);
+            CharSequence cs = excelArray.toString();
+            writer.append(cs);
+            writer.close();
+            fileCreated = fileName + ".json";
+        } catch (IOException e) {
+            log.warn(" Unable to generate Virtualan  JSON  " + fileName + " : " + e.getMessage());
+        }
+        return fileCreated;
+    }
+
+    private static void buildParam(String key, String value, JSONArray paramsArray, String param) {
+        JSONObject virtualanObjParam = new JSONObject();
+        virtualanObjParam.put("key", key);
+        virtualanObjParam.put("value", value);
+        virtualanObjParam.put("parameterType", param);
+        paramsArray.put(virtualanObjParam);
+    }
+
+    private static void createQueryParam(String queryString, JSONArray paramsArray) {
+        if (queryString != null) {
+            String[] querys = queryString.split("&");
+            for (String query : querys) {
+                JSONObject virtualanObjParam = new JSONObject();
+                String[] queryPart = query.split("=");
+                virtualanObjParam.put("key", queryPart[0]);
+                if (queryPart.length == 2) {
+                    virtualanObjParam.put("value", queryPart[1]);
+                } else {
+                    virtualanObjParam.put("value", "");
+                }
+                virtualanObjParam.put("parameterType", "QUERY_PARAM");
+                paramsArray.put(virtualanObjParam);
+            }
+        }
+    }
+
+    private static void populateConfigMaps(
+            Map<String, String> dataMap, Map<String, String> cucumblanMap,
+            Map<String, String> excludeResponseMap) throws MalformedURLException {
+        URL aURL = new URL(dataMap.get("URL"));
+        String resource = getResource(aURL.getPath());
+        cucumblanMap.put("service.api." + resource,
+                aURL.getProtocol() + "://" + aURL.getAuthority());
+        String okta = dataMap.get("Security");
+        if (okta != null && !okta.isEmpty() && okta.split("=").length == 2) {
+            cucumblanMap.put("service.api.okta_token." + resource, okta.split("=")[1]);
+        }
+        if (dataMap.get("ExcludeFields") != null) {
+            excludeResponseMap.put(aURL.getPath(), dataMap.get("ExcludeFields"));
+        }
+    }
+
+    private static String getCellValue(Cell cell) {
+        if (cell.getCellTypeEnum() != CellType.FORMULA) {
+            switch (cell.getCellTypeEnum()) {
+                case STRING:
+                    return cell.getStringCellValue().trim();
+                case BOOLEAN:
+                    return String.valueOf(cell.getBooleanCellValue());
+                case NUMERIC:
+                    return String.valueOf((int) cell.getNumericCellValue());
+                default:
+                    return null;
+            }
+        }
+        return null;
+    }
+
+    private static class BuildCollections {
+
+        private final String basePath;
+        private final List<String> generatedTestCaseList;
+        private final String generatedPath;
+        private final String inputExcel;
+        private Map<String, String> excludeResponseMap;
+        private Map<String, String> cucumblanMap;
+
+        BuildCollections(String basePath, List<String> generatedTestCaseList,
+                         String generatedPath,
+                         String inputExcel) {
+            this.basePath = basePath;
+            this.generatedTestCaseList = generatedTestCaseList;
+            this.generatedPath = generatedPath;
+            this.inputExcel = inputExcel;
+        }
+
+        Map<String, String> getExcludeResponseMap() {
+            return excludeResponseMap;
+        }
+
+        Map<String, String> getCucumblanMap() {
+            return cucumblanMap;
+        }
+
+
+        BuildCollections createCollection() throws IOException, UnableToProcessException {
+            excludeResponseMap = new HashMap<>();
+            cucumblanMap = getCucumblan();
+            InputStream stream = getInputStream(basePath, inputExcel);
+            Workbook workbook = null;
+            try {
+                workbook = new XSSFWorkbook(stream);
+                for (int sheet = 0; sheet < workbook.getNumberOfSheets(); sheet++) {
+                    Sheet firstSheet = workbook.getSheetAt(sheet);
+                    SheetObject sheetObject = new SheetObject();
+                    sheetObject.setBasePath(basePath);
+                    sheetObject.setExcludeResponseMap(excludeResponseMap);
+                    sheetObject.setCucumblanMap(cucumblanMap);
+                    sheetObject.setFirstSheet(firstSheet);
+                    createCollections(generatedTestCaseList, sheet, firstSheet, sheetObject);
+                }
+            } catch (Exception e) {
+              log.error(
+                      "Unable to create collection for the given excel file " + inputExcel + " <<< " + e.getMessage());
+            } finally {
+                if (workbook != null)
+                    workbook.close();
+                if (stream != null)
+                    stream.close();
+            }
+            return this;
+        }
+
+        private void createCollections(List<String> generatedTestCaseList, int sheet, Sheet firstSheet,
+                                       SheetObject sheetObject)
+                throws MalformedURLException {
+            JSONArray virtualanArray = getObjectSheet(generatedTestCaseList, sheetObject);
+            log.info(virtualanArray.toString());
+            if (virtualanArray.length() > 0) {
+                if (IdaithalamConfiguration.isWorkFlow()) {
+                    CreateFileInfo createFileInfo = new CreateFileInfo();
+                    createFileInfo.setGeneratedPath(generatedPath);
+                    createFileInfo.setCucumblanMap(cucumblanMap);
+                    createFileInfo.setVirtualanArray(virtualanArray);
+                    createFileInfo.setTestcaseName(
+                            "Virtualan_" + sheet + "_" + firstSheet.getSheetName().replaceAll(" ", "_")
+                                    + "_WORKFLOW_" + sheet);
+                    createFileInfo.setScenario("WORKFLOW:" + firstSheet.getSheetName());
+                    createIdaithalamProcessingFile(createFileInfo);
+                } else {
+                    getAsSingleFile(sheet, generatedTestCaseList, generatedPath, cucumblanMap,
+                            virtualanArray);
+                }
+            }
         }
-      }
     }
-  }
 }

From 4f8b2436936a09b7120be082cc5e9db8be3a48d9 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Thu, 22 Apr 2021 19:46:24 -0500
Subject: [PATCH 16/29] Updated Workflow disable feature to enable all
 testcases

---
 .../idaithalam/core/generator/FeatureGenerationHelper.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
index ad85c126..d9c778e6 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
@@ -401,7 +401,7 @@ private static Object getJSON(String json) {
 
   private static String replaceSpecialChar(String request){
     String  skipChars = IdaithalamConfiguration.getProperty("SPECIAL_SKIP_CHAR");
-    skipChars = skipChars == null ? "\\|=\\\\\\\\|;" : skipChars;
+    skipChars = skipChars == null ? "\\|=\\\\\\\\|;\\\\n=\\\\\\\\n;" : skipChars;
     String replacedChar = request;
     for(String skipChar : skipChars.split(";") ) {
       replacedChar = replacedChar.replaceAll(skipChar.split("=")[0], skipChar.split("=")[1]);

From c27e383ecdc70b4272bf3ecc41f725c1f700d580 Mon Sep 17 00:00:00 2001
From: elanj <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 07:37:17 -0500
Subject: [PATCH 17/29] Updated with Integration changes

---
 modules/idaithalam/pom.xml                    |  2 +-
 .../idaithalam/core/domain/Item.java          | 26 +++++++++++++++++++
 .../generator/ExcelToCollectionGenerator.java |  4 ++-
 .../generator/FeatureGenerationHelper.java    |  4 +++
 .../resources/virtualan-contract.mustache     |  8 +++++-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 2411ab8b..2c3d0e5a 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -6,7 +6,7 @@
   <name>idaithalam-platform-testing</name>
   <version>1.2.7-SNAPSHOT</version>
   <properties>
-    <cucumblan-api.version>1.1.12</cucumblan-api.version>
+    <cucumblan-api.version>1.1.13-SNAPSHOT</cucumblan-api.version>
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/domain/Item.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/domain/Item.java
index 799840fc..33e227d1 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/domain/Item.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/domain/Item.java
@@ -89,6 +89,16 @@ public class Item {
    */
   String skipScenario;
 
+  /**
+   * The Csvson.
+   */
+  String hasCsvson;
+
+  /**
+   * The Csvson.
+   */
+  List<String> csvson;
+
   /**
    * The Output file by path.
    */
@@ -487,6 +497,22 @@ public void setHasInputInline(String hasInputInline) {
   }
 
 
+  public List<String> getCsvson() {
+    return csvson;
+  }
+
+  public void setCsvson(List<String> csvson) {
+    this.csvson = csvson;
+  }
+
+  public String getHasCsvson() {
+    return hasCsvson;
+  }
+
+  public void setHasCsvson(String hasCsvson) {
+    this.hasCsvson = hasCsvson;
+  }
+
   /**
    * Gets std type.
    *
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index a57ffffa..4ef71c86 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -352,7 +352,9 @@ private static JSONObject buildRESTVirtualanCollection(String basePath,
         }
         if (dataMap.get("ResponseByFields") != null) {
             virtualanObj.put("outputFields", dataMap.get("ResponseByFields"));
-        } else if (dataMap.get("ResponseFile") != null || dataMap.get("ResponseContent") != null) {
+        }else if (dataMap.get("Csvson") != null) {
+            virtualanObj.put("csvson", dataMap.get("Csvson"));
+        }else if (dataMap.get("ResponseFile") != null || dataMap.get("ResponseContent") != null) {
             if (dataMap.get("IncludesByPath") != null) {
                 virtualanObj.put("outputPaths", dataMap.get("IncludesByPath"));
             }
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
index d9c778e6..b64a67c3 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
@@ -291,6 +291,10 @@ private static void extractedScenario(JSONObject object, Item item) {
 
   private static void extractedOutput(JSONObject object, Item item, String path)
       throws IOException {
+    if(!object.optString("csvson").trim().isEmpty()) {
+      item.setHasCsvson(object.optString("csvson"));
+      item.setCsvson(Arrays.asList(object.optString("csvson").split("\n")));
+    }
     if (object.optString("outputFields") != null
         && !object.optString("outputFields").isEmpty()) {
       item.setHasResponseByField(true);
diff --git a/modules/idaithalam/src/main/resources/virtualan-contract.mustache b/modules/idaithalam/src/main/resources/virtualan-contract.mustache
index 8b19f15b..0e501e2a 100644
--- a/modules/idaithalam/src/main/resources/virtualan-contract.mustache
+++ b/modules/idaithalam/src/main/resources/virtualan-contract.mustache
@@ -85,11 +85,17 @@ Feature: {{feature}} - API Contract validation status
       And Update api with given input
       {{/isPut}}
       {{#inputJsonMap}}
-        | {{{key}}}                   |  {{{value}}}                        |
+      | {{{key}}}                   |  {{{value}}}                        |
       {{/inputJsonMap}}
       {{/hasInputJsonMap}}
       When a user {{action}} {{contentType}} in {{url}} resource on {{resource}}
       Then Verify the status code is {{httpStatusCode}}
+      {{#hasCsvson}}
+      And Verify api response csvson includes in the response
+      {{#csvson}}
+      | {{{.}}} |
+      {{/csvson}}
+      {{/hasCsvson}}
       {{#stdType}}
       {{#outputFile}}
       And Verify-standard {{stdType}} all {{{outputFile}}} file {{url}} api includes following in the response

From 9b1f2d54fcd15e4adff631c66578cafdae59701e Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 08:48:32 -0500
Subject: [PATCH 18/29] Updated Workflow disable feature to enable all
 testcases

---
 .../idaithalam/core/generator/FeatureGenerationHelper.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
index b64a67c3..7ae2b553 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
@@ -398,6 +398,7 @@ private static Object getJSON(String json) {
       try {
         return new JSONArray(json);
       } catch (Exception e) {
+        LOGGER.warning(json + " is invalid");
         return json;
       }
     }

From ebe61a18e388080fb5cf8e843cb432bf2275702d Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 09:26:42 -0500
Subject: [PATCH 19/29] Updated wit \r fix

---
 .../idaithalam/core/generator/FeatureGenerationHelper.java      | 2 +-
 samples/idaithalam-excel-apitesting/pom.xml                     | 2 +-
 .../java/io/virtualan/test/APITestWithExcelAsRunManager.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
index 7ae2b553..0155e98d 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
@@ -406,7 +406,7 @@ private static Object getJSON(String json) {
 
   private static String replaceSpecialChar(String request){
     String  skipChars = IdaithalamConfiguration.getProperty("SPECIAL_SKIP_CHAR");
-    skipChars = skipChars == null ? "\\|=\\\\\\\\|;\\\\n=\\\\\\\\n;" : skipChars;
+    skipChars = skipChars == null ? "\\|=\\\\\\\\|;\\\\n=\\\\\\\\n;\\\\r=\\\\\\\\r;" : skipChars;
     String replacedChar = request;
     for(String skipChar : skipChars.split(";") ) {
       replacedChar = replacedChar.replaceAll(skipChar.split("=")[0], skipChar.split("=")[1]);
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index dd936c7b..a86721a2 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.6</idaithalam.version>
+		<idaithalam.version>1.2.7-SNAPSHOT</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
index 4a02274c..6ebbd4b5 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
@@ -233,7 +233,7 @@ public void executeApiTests_6() {
   public void executeApiTests_empty_7() {
     int status =0 ;
     try {
-      IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\r\\\\\\\\n");
+      //IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\r\\\\\\\\n");
       //pass the spreadsheet that you want to pass to the user
       IdaithalamConfiguration.setProperty("workflow","Disabled");
       List<String> list = new ArrayList<>();

From 477ff3ed18e8e41d5928d139abf68549bc0c020a Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 09:39:12 -0500
Subject: [PATCH 20/29] Updated Workflow disable feature to enable all
 testcases

---
 modules/idaithalam/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 2c3d0e5a..1aa0e008 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -6,7 +6,7 @@
   <name>idaithalam-platform-testing</name>
   <version>1.2.7-SNAPSHOT</version>
   <properties>
-    <cucumblan-api.version>1.1.13-SNAPSHOT</cucumblan-api.version>
+    <cucumblan-api.version>1.1.13</cucumblan-api.version>
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>

From d99d197fc155df372645d5dc63bb79ad0e9cd8ab Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 09:40:29 -0500
Subject: [PATCH 21/29] [maven-release-plugin] prepare release
 idaithalam-project-1.2.7

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 1aa0e008..9e2282e0 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <properties>
     <cucumblan-api.version>1.1.13</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.7</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index e991aea6..441f1e8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>idaithalam-project-1.2.7</tag>
   </scm>
   <developers>
     <developer>

From 6a2b5ccf939fbb436e7bc410fa1aac19fb360143 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 09:40:30 -0500
Subject: [PATCH 22/29] [maven-release-plugin] prepare for next development
 iteration

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 9e2282e0..ad25e9d4 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <properties>
     <cucumblan-api.version>1.1.13</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.7</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index 441f1e8c..7fb1bbe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>idaithalam-project-1.2.7</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <developer>

From c36edb6ce1b62d4d7a690c7134ddeaa9bfca000e Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 10:00:54 -0500
Subject: [PATCH 23/29] Updated Workflow disable feature to enable all
 testcases

---
 modules/idaithalam/pom.xml                    |   2 +-
 .../generator/ExcelToCollectionGenerator.java |   2 +-
 pom.xml                                       |   2 +-
 samples/idaithalam-excel-apitesting/pom.xml   |   2 +-
 .../virtualan_collection_testcase_6.xlsx      | Bin 5560 -> 5614 bytes
 .../idaithalam-massapibatch-testing/pom.xml   |   2 +-
 .../conf/feature/virtualan-contract.0.feature |  37 ++++------
 .../conf/virtualan-provider.json              |  29 +-------
 .../conf/feature/virtualan-contract.0.feature |  68 +++++++++---------
 .../idaithalam-postmancoll-apitesting/pom.xml |   2 +-
 10 files changed, 55 insertions(+), 91 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index ad25e9d4..1aa0e008 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.7-SNAPSHOT</version>
   <properties>
     <cucumblan-api.version>1.1.13</cucumblan-api.version>
     <java.version>1.8</java.version>
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index 4ef71c86..fbf118d9 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -188,7 +188,7 @@ private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
             throws MalformedURLException {
         Map<Integer, String> headers = new HashMap<>();
         JSONArray virtualanArray = new JSONArray();
-        for (int i = 0; i < sheetObject.getFirstSheet().getLastRowNum() ; i++) {
+        for (int i = 0; i <= sheetObject.getFirstSheet().getLastRowNum() ; i++) {
             Row nextRow = sheetObject.getFirstSheet().getRow(i);
             if (headers.isEmpty()) {
                 headers = getHeader(nextRow);
diff --git a/pom.xml b/pom.xml
index 7fb1bbe5..e991aea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.7-SNAPSHOT</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index a86721a2..00f0d78e 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.7-SNAPSHOT</idaithalam.version>
+		<idaithalam.version>1.2.7</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_6.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_6.xlsx
index b7c3893b9a947a7c031cc94ca43c0eff8ea97846..6f1a89e29968a6ba6be47e78bc800e1d959807cc 100644
GIT binary patch
delta 2513
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
F<ZqrLgMR=3

delta 2481
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
Qp8~6dHi!Zn2k6JkU&YXf1^@s6

diff --git a/samples/idaithalam-massapibatch-testing/pom.xml b/samples/idaithalam-massapibatch-testing/pom.xml
index 3237abaf..03815f04 100644
--- a/samples/idaithalam-massapibatch-testing/pom.xml
+++ b/samples/idaithalam-massapibatch-testing/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.4-SNAPSHOT</idaithalam.version>
+		<idaithalam.version>1.2.7</idaithalam.version>
     <java.version>1.8</java.version>
 		<testng.ver>7.4.0</testng.ver>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature b/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
index 0fb339f7..850fa672 100644
--- a/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
+++ b/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
@@ -1,24 +1,15 @@
 Feature: Sample.yaml - API Contract validation status
-  Scenario: Load initial set of data
-    Given Provided all the feature level parameters from file
-  @sample
-  Scenario: Create a new sample object. - POST api call
-    Given a user perform a api action
-    And Create api with given input
-      | filename                   |  Sample.yaml                        |
-      | name                   |  Sample                        |
-      | version                   |  0.0.1                        |
-    When a user post application/json in /sample resource on sample
-    Then Verify the status code is 201
-  @sample
-  Scenario: Sample path - GET api call
-    Given a user perform a api action
-    And add request with given path params
-      | sampleId                   | sampleId                         |
-    When a user get application/json in /sample/validate/{sampleId} resource on sample
-    Then Verify the status code is 200
-    And Verify-all /sample/validate/{sampleId} api includes following in the response
-      | sample1                 |  one                          |
-      | id                 |  i~1                          |
-      | sample3                 |  three                          |
-      | sample2                 |  two                          |
+    Scenario: Load initial set of data
+      Given Provided all the feature level parameters from file
+    @sample
+    Scenario: Create a new sample object. - POST api call
+      Given a user perform a api action
+      When a user post application/json in /sample resource on sample
+      Then Verify the status code is 201
+    @sample
+    Scenario: Sample path - GET api call
+      Given a user perform a api action
+      And add request with given path params
+        | sampleId                   | sampleId                         |
+      When a user get application/json in /sample/validate/{sampleId} resource on sample
+      Then Verify the status code is 200
diff --git a/samples/idaithalam-openapi-contract/conf/virtualan-provider.json b/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
index 2a05d1d3..c9f1ef61 100644
--- a/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
+++ b/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
@@ -1,28 +1 @@
-[
-  {
-    "input": "{\r\n  \"filename\" : \"Sample.yaml\",\r\n  \"name\" : \"Sample\",\r\n  \"version\" : \"0.0.1\"\r\n}",
-    "method": "POST",
-    "scenario": "Create a new sample object.",
-    "resource": "sample",
-    "availableParams": [],
-    "type": "Response",
-    "url": "/sample",
-    "httpStatusCode": "201"
-  },
-  {
-    "output": "{\r\n  \"sample1\" : \"one\",\r\n  \"id\" : 1,\r\n  \"sample3\" : \"three\",\r\n  \"sample2\" : \"two\"\r\n}",
-    "method": "GET",
-    "scenario": "Sample path",
-    "resource": "sample",
-    "availableParams": [
-      {
-        "parameterType": "PATH_PARAM",
-        "value": "sampleId",
-        "key": "sampleId"
-      }
-    ],
-    "type": "Response",
-    "url": "/sample/validate/{sampleId}",
-    "httpStatusCode": "200"
-  }
-]
\ No newline at end of file
+[{"input":"","method":"POST","scenario":"Create a new sample object.","resource":"sample","availableParams":[],"type":"Response","url":"/sample","httpStatusCode":"201"},{"output":"","method":"GET","scenario":"Sample path","resource":"sample","availableParams":[{"parameterType":"PATH_PARAM","value":"sampleId","key":"sampleId"}],"type":"Response","url":"/sample/validate/{sampleId}","httpStatusCode":"200"}]
\ No newline at end of file
diff --git a/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature b/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature
index 25b66cc3..1e0c6858 100644
--- a/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature
+++ b/samples/idaithalam-postmancoll-apitesting/conf/feature/virtualan-contract.0.feature
@@ -37,14 +37,14 @@ Feature: idaithalan.postman_collection.json - API Contract validation status
       And add request with given header params
         | Content-Type                   | application/json                         |
       And Update api with given input
-        | photoUrls[0]                   |  string                        |
-        | name                   |  Rocky                        |
-        | id                   |  i~101                        |
-        | category.name                   |  german shepherd                        |
-        | category.id                   |  i~100                        |
-        | status                   |  available                        |
-        | tags[0].name                   |  brown                        |
-        | tags[0].id                   |  i~101                        |
+      | photoUrls[0]                   |  string                        |
+      | name                   |  Rocky                        |
+      | id                   |  i~101                        |
+      | category.name                   |  german shepherd                        |
+      | category.id                   |  i~100                        |
+      | status                   |  available                        |
+      | tags[0].name                   |  brown                        |
+      | tags[0].id                   |  i~101                        |
       When a user put application/json in /api/pets/100 resource on api
       Then Verify the status code is 200
       And Verify-all /api/pets/100 api includes following in the response
@@ -63,14 +63,14 @@ Feature: idaithalan.postman_collection.json - API Contract validation status
       And add request with given header params
         | Content-Type                   | application/json                         |
       And Update api with given input
-        | photoUrls[0]                   |  string                        |
-        | name                   |  Butch                        |
-        | id                   |  i~201                        |
-        | category.name                   |  Bulldog                        |
-        | category.id                   |  i~200                        |
-        | status                   |  available                        |
-        | tags[0].name                   |  white gray                        |
-        | tags[0].id                   |  i~201                        |
+      | photoUrls[0]                   |  string                        |
+      | name                   |  Butch                        |
+      | id                   |  i~201                        |
+      | category.name                   |  Bulldog                        |
+      | category.id                   |  i~200                        |
+      | status                   |  available                        |
+      | tags[0].name                   |  white gray                        |
+      | tags[0].id                   |  i~201                        |
       When a user put application/json in /api/pets/200 resource on api
       Then Verify the status code is 200
       And Verify-all /api/pets/200 api includes following in the response
@@ -89,14 +89,14 @@ Feature: idaithalan.postman_collection.json - API Contract validation status
       And add request with given header params
         | Content-Type                   | application/json                         |
       And Create api with given input
-        | photoUrls[0]                   |  string                        |
-        | name                   |  Rocky                        |
-        | id                   |  i~101                        |
-        | category.name                   |  German Shepherd                        |
-        | category.id                   |  i~100                        |
-        | status                   |  available                        |
-        | tags[0].name                   |  brown                        |
-        | tags[0].id                   |  i~101                        |
+      | photoUrls[0]                   |  string                        |
+      | name                   |  Rocky                        |
+      | id                   |  i~101                        |
+      | category.name                   |  German Shepherd                        |
+      | category.id                   |  i~100                        |
+      | status                   |  available                        |
+      | tags[0].name                   |  brown                        |
+      | tags[0].id                   |  i~101                        |
       When a user post application/json in /api/pets resource on api
       Then Verify the status code is 201
       And Verify-all /api/pets api includes following in the response
@@ -115,14 +115,14 @@ Feature: idaithalan.postman_collection.json - API Contract validation status
       And add request with given header params
         | Content-Type                   | application/json                         |
       And Create api with given input
-        | photoUrls[0]                   |  string                        |
-        | name                   |  Butch                        |
-        | id                   |  i~201                        |
-        | category.name                   |  Bulldog                        |
-        | category.id                   |  i~200                        |
-        | status                   |  available                        |
-        | tags[0].name                   |  grey                        |
-        | tags[0].id                   |  i~201                        |
+      | photoUrls[0]                   |  string                        |
+      | name                   |  Butch                        |
+      | id                   |  i~201                        |
+      | category.name                   |  Bulldog                        |
+      | category.id                   |  i~200                        |
+      | status                   |  available                        |
+      | tags[0].name                   |  grey                        |
+      | tags[0].id                   |  i~201                        |
       When a user post application/json in /api/pets resource on api
       Then Verify the status code is 201
       And Verify-all /api/pets api includes following in the response
@@ -204,8 +204,8 @@ Feature: idaithalan.postman_collection.json - API Contract validation status
       And add request with given header params
         | Content-Type                   | application/json                         |
       And Create api with given input
-        | birthday                   |  1978-10-24                        |
-        | postalCode                   |  60563                        |
+      | birthday                   |  1978-10-24                        |
+      | postalCode                   |  60563                        |
       When a user post application/json in /api/riskfactor/compute resource on api
       Then Verify the status code is 200
       And Verify api response with 40 includes in the response
diff --git a/samples/idaithalam-postmancoll-apitesting/pom.xml b/samples/idaithalam-postmancoll-apitesting/pom.xml
index 56bf6600..9b0dc368 100644
--- a/samples/idaithalam-postmancoll-apitesting/pom.xml
+++ b/samples/idaithalam-postmancoll-apitesting/pom.xml
@@ -6,7 +6,7 @@
 	<name>idaithalam-postmancoll-apitesting</name>
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
-	  <idaithalam.version>1.2.2-SNAPSHOT</idaithalam.version>
+	  <idaithalam.version>1.2.7</idaithalam.version>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>

From 2b9666acd4a2f24a96efbe846a3ed79485863407 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 10:02:54 -0500
Subject: [PATCH 24/29] [maven-release-plugin] prepare release v1.2.7.1

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 1aa0e008..3aa56880 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <properties>
     <cucumblan-api.version>1.1.13</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>v1.2.7.1</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index e991aea6..cf642ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>V1.0.13.1</tag>
+    <tag>v1.2.7.1</tag>
   </scm>
   <developers>
     <developer>

From 3ca627da34567d7c1d69a5970e1a7b1def9a9a18 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 10:02:55 -0500
Subject: [PATCH 25/29] [maven-release-plugin] prepare for next development
 iteration

---
 modules/idaithalam/pom.xml | 4 ++--
 pom.xml                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/idaithalam/pom.xml b/modules/idaithalam/pom.xml
index 3aa56880..ad25e9d4 100644
--- a/modules/idaithalam/pom.xml
+++ b/modules/idaithalam/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>idaithalam</artifactId>
   <packaging>jar</packaging>
   <name>idaithalam-platform-testing</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <properties>
     <cucumblan-api.version>1.1.13</cucumblan-api.version>
     <java.version>1.8</java.version>
@@ -24,7 +24,7 @@
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>v1.2.7.1</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <!-- original author of the project -->
diff --git a/pom.xml b/pom.xml
index cf642ab9..7fb1bbe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
   <artifactId>idaithalam-project</artifactId>
   <packaging>pom</packaging>
   <name>idaithalam-project</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <url>https://virtualan.io</url>
   <scm>
     <connection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/virtualansoftware/idaithalam.git
     </developerConnection>
     <url>https://github.com/virtualansoftware/idaithalam.git</url>
-    <tag>v1.2.7.1</tag>
+    <tag>V1.0.13.1</tag>
   </scm>
   <developers>
     <developer>

From b20a20e7530b21d948d44a4ff7b93f301244d284 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 11:57:11 -0500
Subject: [PATCH 26/29] Updated wit \r fix

---
 .../generator/ExcelToCollectionGenerator.java |   3 ---
 .../api-testing.xml                           |   1 +
 .../test/APITestWithExcelAsRunManager.java    |   3 +--
 .../virtualan_collection_testcase_6.xlsx      | Bin 5614 -> 5572 bytes
 .../virtualan_collection_testcase_8.xlsx      | Bin 8168 -> 8181 bytes
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index fbf118d9..f8b0d784 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -104,9 +104,6 @@ private static Map<String, String> getRow(Row nextRow, Map<Integer, String> head
                     dataMap.put(key, getCellValue(cell));
                 }
             }
-        }else {
-            log.error(
-                    "Unable to process the row and row is empty >>> ");
         }
         return dataMap;
     }
diff --git a/samples/idaithalam-excel-apitesting/api-testing.xml b/samples/idaithalam-excel-apitesting/api-testing.xml
index 93d3420c..498b31ee 100644
--- a/samples/idaithalam-excel-apitesting/api-testing.xml
+++ b/samples/idaithalam-excel-apitesting/api-testing.xml
@@ -12,6 +12,7 @@
                     <include name="executeApiTests_5"/>
                     <include name="executeApiTests_6"/>
                     <include name="executeApiTests_7"/>
+                    <include name="executeApiTests_multiplesheet_8"/>
                 </methods>
             </class>
         </classes>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
index 6ebbd4b5..999933e3 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
@@ -269,7 +269,6 @@ public void executeApiTests_empty_7() {
   public void executeApiTests_multiplesheet_8() {
     int status =0 ;
     try {
-      IdaithalamConfiguration.setProperty("SPECIAL_SKIP_CHAR","\\\\r\\\\n=\\\\\\\\r\\\\\\\\n");
       //pass the spreadsheet that you want to pass to the user
       IdaithalamConfiguration.setProperty("workflow","Disabled");
       List<String> list = new ArrayList<>();
@@ -286,7 +285,7 @@ public void executeApiTests_multiplesheet_8() {
       File f  = new File(System.getProperty("user.dir") +"/target/"+testPlanIndex);
       if(!f.exists())
         f.mkdir();
-      ExcelToCollectionGenerator.createCollection(list, "virtualan_collection_pet_sheet_2.xlsx",
+      ExcelToCollectionGenerator.createCollection(list, "virtualan_collection_testcase_8.xlsx",
           System.getProperty("user.dir") +"/target/"+testPlanIndex);
       //Generate feature and summary page html report for the selected testcase from the excel
       status = IdaithalamExecutor.validateContract("Scriptlet testcase execution version 5", System.getProperty("user.dir") +"/target/"+testPlanIndex);
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_6.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_6.xlsx
index 6f1a89e29968a6ba6be47e78bc800e1d959807cc..9409ecec293acd3c4eedce333d0a02aae0d5af4c 100644
GIT binary patch
delta 821
zcmV-51IqmFE5s|X`wtFV`=Pt>0ssJW2><{X0F%BI8h@ph+j8145Qgvj6dv6N;R7Ks
zm`nmW(55Mq>ET+~0z6ojD~Z$FcYU^HH(}Zv5c2o`yV_lOnB1ONXdI}J0gqf{_WH=6
zk;nZY+PLV)_s6RnWJpCKpM*T3E;>_*Zl|9nM=o}9OQ|xLH(qQaF32i`=O@!49x}i+
zk}ldR6@QO0mfn^!B6~ch5j<IQ!H9yNVuNKYDDhJ#7GkU4zs8INQSLBi-X$iCh}}NE
z@;Hl$3RXcFsB`L7+8kW87tuKPxMG1Pxa4b<XvU0q;{yvz_|%G7@;%@&U#|m?LR1ga
zlSk9EZyITfOR~;v=G@ye8ma8;f`)Jc9?5MG%YVWRYI<2ltzwSwsF7FNo&WGETMJHu
zfAcZ>*fg6-vCEvwTIVA&ousZyF`e+e3WJC)g(3G0rr~@~Lw<A-Omn{R7HqaE*_cjn
zNyECdNEbf?dX%-bk&O9@^Ih^|;b(eDL+T|>GGdZk3B}_Vx>m>_uzR308ip>qvmx|v
zL4VijG6__uilB*QeO<(TOh*KcvLcesc=#*u)z(FD4}H2O`%qPTrqgrma{rAVpJ{eX
zbASvCx76by*utm50=V85G8j3f-^bkHre`|H@b*%1R=6hGN@V9EyAlnrKU58K)v#1q
zW^ZV|FB;{dQ6;i_*64kaStMvy89JknWq(c~bE;_0-()zeWZIxPQ3Pr$_|Xu_b1+R7
zcR<RNhXzR4Jxu!(d`Pr8ai0-ZjWC<UtnFbniFuo_o5Vv#*maLV6M1Z#Xv9-TBG*mi
zxs42)#G*~yG>Ok0VKn4R2cpG!=|DzJ<ZBx-waUJBAX;g^brfIg@v;M{nv7v+rhmoc
zSmoqc?Z{fO?>i8!3bPDx>WEg$d4>$?h*qcvt35s15uZ8`ZH_;;)3vm6zZ6LF&@r|7
zd+jjLnz8Ia9Iev0eqp!gm<o9D@8BYrYa@L{C$$sf0ABE7;b%8qC+rr1>xRA{NBGZF
zF-doEz6-1J|I+jiP)h*<000yK0JBFETLKDO`=Pt>0ssJW36rc9JO&gK00000PLGJ6

delta 849
zcmV-X1FrnUEAA_>`wt43PfeB^0{{Ts3X=s8Ab;6%+AtJ`@B0)U-3Q@?5Ex9RKo-(8
zWinl^g%RMvvRp}QZ(qr~B{wkb4ao9${&V!}$oA;|L?Y{e84qdf1H01&7LEhD3ge9r
zetdttxdRp#C|;q6#@GjE%)$Nm)96Uqj&Cs*772#)O-vbDM)Lm2_D}#UsTy-1Y=uaM
z5P$MuiwWW#n&4R8SyM)kke6%&dBQMSrAj1%PPcmt2@2y}VMu~&L<nNLeR2~}k{}T-
z!zdKzRI8LZ_+ZcCVXkpQ!hlgu*Fwb%2?~Y>5|!}D$XW6o$wRtchXIyZ1Bg!nPRqV)
zl+CWGI+K~vU{7!?vb8fD$raF;Z^MKaYJbwx>nbwL9Kb=Nu5@?)L#y0csnq*79lHx{
zyIB;uPO0=dZ;|mRRb8<0i0(xc#(2Rjz9+I9&J!HbqYq>^=M(SYW-HXhcmzvYj!TJj
z@H50mUK?Ag&6kw!)Wv+2#d93tKy8whAax`JO<wU@01L_41D@h2^1(!%o8Jtt(|@5#
zR74d?m1KQf<b6zAL@s5CIG)nzSGW>eA4t6wUZZ^^syW;1cy2lWPLIzxTc+Iu7L=zn
zpplf7zZMDQ@pgbk&?)^t<_dQm+XGgx=Yo<#RmE08ZXV=TLH*l{QT;rsUq(50r*D58
zG{}PnRgl|p1|J96MS*rzp*Of3=6@AoUX{)JTNuooOgCtT1d`q|dbF6jFGbbhvm|-S
z%MIXi_Au^_;6cUa#3Un}8eunysj1;KiJ3{bP2wRV+`2}ui9DJj8u8Rp$ZZpOHj#dl
zn4831lXz)Kqaj~f5G~JZ3o>XTUrof;oPBFSG;6=Ln6K^eq6Mio8Oo*^7k{1Ol%3<4
znKiQ~Er{mAG()^PqIo&XkX{|pjCyd)?$MU`)PiVz{9=~tXm-CAh`Q<7TK~PZ2xyzJ
zXhFPor`^(N*W4Ygu8D~lPP><#b}u{aUUs?#(VaHSHJo-obh<@Ace(}9ord*C<My0j
zCSS2T`N%BCR{AnjUCM@`d>@sv`6_$1>V#_$ur9b_=qSHVD@L6on9s^l`DHr(1G5wp
bWC9A9PfeB^0{{Ts3X_5rJO(}!00000H!73Q

diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_8.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_8.xlsx
index acf395529b4fb9461826a36d837217b789ad9bb3..c716b78cef8a829ee9a340f74c906ac090d274da 100644
GIT binary patch
delta 2904
zcmV-e3#atxKlMMbO$G_6pfSST0ssJ&lU4>Ee^c5(5dPj@k;!)wg1l%YC`GZ%I4vX5
zFOI_;cT2dM+@*ILl>Yi&0$L|8+EPEtFh_28Z#Vbsv&;5R9^=SbgVJ0I-}aoQZGoVY
zaS{6Vbuexm+LlHl7>T3+-`;?>PX?d*TBAi}D$utNjY%r_&lE;mLAz&L#;wr4y+TYr
zf4i=xD~O49WCFrymQuw8%~pl3P81NPR{$7CZmZesx-sFx9`rRI^l=b?#u3r*jl|G*
zanN@&d0BS`nilofSC>W6ND2gj!6qqry8?3sjbk3wsisO&(Ar>AeO@P0XsC9u)xGZF
zYY<F_6iq6Mn)62*rOdd7h?PzmjAuwNf7K(&N<L>O6+DH%A&Qel1iEN7WQ;F2wQ3DC
zRU9`(Ig+qsdww=)^}Gsc!-%cnbYh`_vZ&t?C6@Gl!9~st^XncgyKU%pSc7&uy+*sm
zI*kRTM~%+HJAj@?N&D!a=!zss#3{*ObPd^xYA%u#oeG6au|{*l6{aL2Vumcsf1AI%
zP0?=peHIjDX9Np5QRX|%ma*ZYwI-2oPfW=PEhB=&w%kE~ku6k4Qdufo`1W|*%s;tO
z|Jok%ynLH(cNwQ5$R%#>KF^N74XyT!>Uo{cX!LJULj{}Xs4svx1p}aUT9y1M;02VV
zA>cDzOqh27ai8mC#MFkF5nqF|e|{nYgIGFL#x6;?n*eHe$p!ne2~0tpWL5E>!0(gp
zTNC%L3i+1>@k5uJivfDBb{)d0GPpP|(c0X3!hFt-%|q6HePNbk69hu3HuG%fKkXb*
z(YsI0!CE#<Wm%jUS<Z)`iVuICs4BM&we9bfm){w@0*?XWHpk=c84V`GW005bylsth
z@1q}N?e-ptziays4-ZbZ&oh-hw5nUgy!Fuq_U!@-qB$L=xT>kQdFhYz?NOvuP4#m~
zP&F#-=jvVGYgRMbRK0IjK!505KipXPIBS(i{I;EI=IX(3P)h>@lkpuIvtkJo3km%f
zKv%c}006R+eiR{p-*ehH5Xax|ukiTcrhN#;KS%-x?i5G@X}IZRdhN4f3-BOWK1l}h
z-`~o=uw`AEX<tA{pZ)G?cNHnqPiIQ3BjzGu>CAQqL)*e>#Ns5~&Fp`^-Cy0>mXIio
z5n(Bw*{@jGpTa+;C&mwAkFm69G+FOb#?cFb^|KqG$hJU#H5D^^FJ(4y91-m?MPk4*
zoWjbMaf&4T<U2=X9HY2UqQvor!)u44B&`%CG<uH+Mf{LwR}rHblF3U#68TzaH8RJU
zo%3{3X<X4H;!LouR5lZeqREkx20r(EHv9m1hi$h>gu!d%;B$nFux~qI^Y=tu$}Cxw
zQ=H0j?;I0<*a1t$KFLI_2049SM7?B=opC3wqB_5!)sz;LM!%-x4jtF+21Vbe)a1Hq
zk#Jh5e&ykm<&q>R{>m+pQ|N}*IVS8hv!R=-iRWaumue!MIt>luMxq#ePw+{!#+GXH
z7sd|i$2u<U1tvIBMY1xaj)Y{{6W&VOLNI&83rxs=%>L}T;QL>Wx8+#5s_kmGO0+$$
zJ>M5i0-Je30xuZ(k;HO8v*9Ghc#Co(FLQ1%2>fRLnVnX++^9RUEeFnN#0bd3r$rMu
z;GS(!bS}P6mBQ`74QwmQg=Dl=Rkjx+zcTVKMmN_#wYsUSZW=4kA9&-pja;{~QiIAY
z82{XVtlpP<*_apnpP5r8rO5RXNd#%)>|}AZ4x(!CSyiv#A(sMXkKu6Y9F=WF%uB*+
z5pI`Q^fkOLvFsCmm$>T_L6^Ai6W3khp-<d&iIu^NhOGO@NZaqD0ns-6rH{Cp%98=n
zR5k`jm+ClB%djq}*A&z%Z2Y$DNUNv;(Nej8D3PFzXo*^S{rGRSq8gB~R@FY@X$|;b
zK(t)042YJ?wE@w3@Uce9D6}x1%GFU@Kx@&B!N<s4FTbgm-?!0<G532X(9?>sD3R+n
zq7`FlaHJQbkN8>^Rt7{r9{yWt{9+K$+unfq<}?OP8iT%#R-L&4(N4x9=%vxuim~i}
ztLSOGGdR-fb#FkldaVqOv_w4yZ#JyKhZgC^fasZa+Sf<K(l}99J0j)fE#duKU;ht9
zQ*WPhf-U))!HXefaD}H59x-B0P<nuuUVPq`?+YvA3FGj9EjOSZj5$H!)7{@6zCEuu
zA0GUVAOGCRzhGDO8bnp77dM+BkZ`(H2e%yFJO|MlTSav0Pa2;j;G3`G@_y8aO`Gsc
zggRyo;TwsdMFiz7+zu+{=%iBCFeCM1s%Bx-{JRnU2T)4`1QY-O00;neNO)54^+FKS
z0{{R%4U>Nq8GkY^cx`N@mrHZvI1tD0`zc&LY|R{k@dF49Ff~9D$Pj8OHM?_GYymE0
z%PWaTzWuiR!j`m2YW4y`{`J3G-Rg2P{(4D>b;69tG@aOPr)yg{4QUjoyNUhR&-<HO
z+u{PH5h66j6Z;i&`|I?N@tLv%-(xJSBpj`FDP`z|z<=|L8=%m(KsDtPdoM&bavUD+
zae{b<W;lf>Tgnn7;3wNTJYyI|xl%$LuiNcA35wHFVU&a)5lIj`9J8B{CK(d(OH5+%
znrqcEr-^-J>8RAWN#c-EPPanZj1m-%P6?^ui{`WDJHR`1yNyE(UPA|8LY#+v+X|a~
zB<ezDL4U(zf>TkPonZnepef(S8L!kJryq+*OXkoSw&KdG^FOre(t=X&_jKH@<GSsj
zl8-6Xxh}8BbeyaHVAC-@3KFOI2ebGwf!pvp!-SqEHr(cN<2l~#h1{5qotlPqEs-z&
zj`5i{)|R~HFO(kSk5yFIb4+k3i)3X;wuGSB8h>wvZ6Vk_;W;K`V$WR{eE-AnwpdG7
zm0jgliZ<7k=llGUz+qkx$8$=4#gW)gZ0N)YZ_$y6>z*5Q0>9pWrspLt4(j%7%Yi-(
zDFIpdw2~Ma+_S9&UGnd9sc_qI1KSFZT+pOam9|$Szcli%MuYylR)f-NP+NI^#~Z$F
zB!9D(TggRf77X7vtIp+K59S5`W#$w~$#cCx0zsM>JzGpZ2T{5BCaah8kV_7`r)hWW
zoTP0@%nHJ55N?~8>l$90Sm=b`Chl}1XcPB3(QgwEIx%PyOP%N`fvgOO63L?h>9vvX
zI^rr>TN@B1ZBGVA%9%F?<a%fa$~~=W?tj%a_i`J*nQOJ^I?`8=d4UAY_?2`oJpG8b
zO5F{}P$|5QcuFh}21H5s(ts%GUKtSOc05){5rq=Qx_H`aCRPdKN%s*bVQdUx^voso
z>yrAp&7di(gg*1NKK7J)%?qU8R8j8!!q<aS>!l;UlBlHtQ4;m&zm@6l1_33FYk&X!
zV(2P?(#RWwBi~$%pe{zB7ei^=S)j`*p67v93|~=M=qhS4?hKBUs^1$BrAwCvM@qUM
zgEu?F;6sUYV?fkQJIz;FNYf~mV+JC{AR%CuuSSuFyfwDZM}jT!n!)svQWz&v0Rt7E
z5tJTa>WnViV%D)T7E=bpba4PVyk8y(ny&9QpME~Co<2SJpFjV(6JOv|)ia1HSI^(F
zhCrs{J-B5se;s&ZZ54wObRiqX;G3<Y;$5u}Pffxz5wclp!Z#8@g9wU=pcz!e&{?Le
zW_ogZD|ca4|Mi*v3$t4sUI7WIpfSST0ssJ&lfoTS0Zx+^9y$SylTjW(0p^pE9y|hw
z5tAVw8<XoEGy(mSARjgx{TD!2xB~zHvJ3zK7ytkO000000RR9100425aUUxj@by9v
z(*pniJ`Df>7ytkO000000RR91003VYlW-Us7EntC1^@s601W^Q0Cxib0B9Tl00019
CHfy^8

delta 2927
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
GWBw1g{&Wif


From cf6a9b4423beadc9555479ad80eb1ec36c5d3dad Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 20:30:01 -0500
Subject: [PATCH 27/29] Add useful information for the error message

---
 .../generator/ExcelToCollectionGenerator.java | 1250 +++++++++--------
 .../generator/FeatureGenerationHelper.java    |    4 +-
 2 files changed, 640 insertions(+), 614 deletions(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index f8b0d784..dca98690 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -4,7 +4,6 @@
 import io.virtualan.idaithalam.core.UnableToProcessException;
 import io.virtualan.idaithalam.core.domain.CreateFileInfo;
 import io.virtualan.idaithalam.core.domain.SheetObject;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -21,8 +20,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
@@ -39,623 +38,648 @@
 @Slf4j
 public class ExcelToCollectionGenerator {
 
-    private ExcelToCollectionGenerator() {
-    }
-
-
-    public static String convertStreamToString(InputStream is) throws IOException {
-        if (is != null) {
-            StringBuilder sb = new StringBuilder();
-
-            try {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    if (!line.trim().equalsIgnoreCase("")) {
-                        sb.append(line).append("\n");
-                    }
-                }
-            } finally {
-                is.close();
-            }
-
-            return sb.toString();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create collection.
-     *
-     * @param generatedTestCaseList the generated test case list
-     * @param excelFilePath         the excel file path
-     * @param generatedPath         the generated path
-     * @throws IOException the io exception
-     */
-    public static void createCollection(List<String> generatedTestCaseList,
-                                        String excelFilePath,
-                                        String generatedPath)
-            throws IOException, UnableToProcessException {
-        createCollection(null, generatedTestCaseList,
-                excelFilePath,
-                generatedPath);
-
-    }
-
-    private static Map<Integer, String> getHeader(Row nextRow) {
-        Map<Integer, String> headers = new HashMap<>();
-        int headerIndex = 0;
-        for (Cell cell : nextRow) {
-            headers.put(headerIndex++, getCellValue(cell));
-
-        }
-        return headers;
-    }
-
-    private static Map<String, String> getRow(Row nextRow, Map<Integer, String> headers) {
-        Map<String, String> dataMap = new HashMap<>();
-        if(nextRow != null) {
-            int lastColumn = Math.max(nextRow.getLastCellNum(), 5);
-            if(lastColumn > 0) {
-                for (Cell cell : nextRow) {
-                    String key = headers.get(cell.getColumnIndex());
-                    dataMap.put(key, getCellValue(cell));
-                }
-            }
-        }
-        return dataMap;
-    }
-
-    /**
-     * Create collection.
-     *
-     * @param basePath              the base path
-     * @param generatedTestCaseList the generated test case list
-     * @param excelFilePath         the excel file path
-     * @param generatedPath         the generated path
-     * @throws IOException the io exception
-     */
-    public static void createCollection(String basePath, List<String> generatedTestCaseList,
-                                        String excelFilePath,
-                                        String generatedPath)
-            throws IOException, UnableToProcessException {
+  private ExcelToCollectionGenerator() {
+  }
+
+
+  public static String convertStreamToString(InputStream is) throws IOException {
+    if (is != null) {
+      StringBuilder sb = new StringBuilder();
+
+      try {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+        String line;
+        while ((line = reader.readLine()) != null) {
+          if (!line.trim().equalsIgnoreCase("")) {
+            sb.append(line).append("\n");
+          }
+        }
+      } finally {
+        is.close();
+      }
+
+      return sb.toString();
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Create collection.
+   *
+   * @param generatedTestCaseList the generated test case list
+   * @param excelFilePath         the excel file path
+   * @param generatedPath         the generated path
+   * @throws IOException the io exception
+   */
+  public static void createCollection(List<String> generatedTestCaseList,
+      String excelFilePath,
+      String generatedPath)
+      throws IOException, UnableToProcessException {
+    createCollection(null, generatedTestCaseList,
+        excelFilePath,
+        generatedPath);
+
+  }
+
+  private static Map<Integer, String> getHeader(Row nextRow) {
+    Map<Integer, String> headers = new HashMap<>();
+    int headerIndex = 0;
+    for (Cell cell : nextRow) {
+      headers.put(headerIndex++, getCellValue(cell));
+
+    }
+    return headers;
+  }
+
+  private static boolean isEmptyRow(Row row) {
+    boolean isEmptyRow = true;
+    for (int cellNum = row.getFirstCellNum(); cellNum < row.getLastCellNum(); cellNum++) {
+      Cell cell = row.getCell(cellNum);
+      if (cell != null && cell.getCellType() != CellType.BLANK && StringUtils
+          .isNotBlank(cell.toString())) {
+        isEmptyRow = false;
+      }
+    }
+    return isEmptyRow;
+  }
+
+  private static Map<String, String> getRow(Row nextRow, Map<Integer, String> headers) {
+    Map<String, String> dataMap = new HashMap<>();
+    if (nextRow != null && !isEmptyRow(nextRow)) {
+      for (Cell cell : nextRow) {
+        String key = headers.get(cell.getColumnIndex());
+        dataMap.put(key, getCellValue(cell));
+      }
+    }
+    return dataMap;
+  }
+
+  /**
+   * Create collection.
+   *
+   * @param basePath              the base path
+   * @param generatedTestCaseList the generated test case list
+   * @param excelFilePath         the excel file path
+   * @param generatedPath         the generated path
+   * @throws IOException the io exception
+   */
+  public static void createCollection(String basePath, List<String> generatedTestCaseList,
+      String excelFilePath,
+      String generatedPath)
+      throws IOException, UnableToProcessException {
+    try {
+      BuildCollections buildCollections = new BuildCollections(basePath, generatedTestCaseList,
+          generatedPath, excelFilePath).createCollection();
+      Map<String, String> excludeResponseMap = buildCollections.getExcludeResponseMap();
+      Map<String, String> cucumblanMap = buildCollections.getCucumblanMap();
+      createPrpos(generatedPath, cucumblanMap, "cucumblan.properties");
+      InputStream streamEnv = Thread.currentThread().getContextClassLoader()
+          .getResourceAsStream("cucumblan-env.properties");
+      if (streamEnv != null) {
+        createPrpos(generatedPath, streamEnv, "cucumblan-env.properties");
+      }
+      if (!excludeResponseMap.isEmpty()) {
+        createPrpos(generatedPath, excludeResponseMap, "exclude-response.properties");
+      }
+    } catch (Exception e) {
+      log.error(
+          "Unable to create collection for the given excel file " + excelFilePath + " >>> " + e
+              .getMessage());
+    }
+
+  }
+
+  private static void getAsSingleFile(int sheet, List<String> generatedTestCaseList,
+      String generatedPath,
+      Map<String, String> cucumblanMap, JSONArray virtualanArray) {
+    Map<String, JSONArray> arrayMap = buildByMiniCategory(virtualanArray);
+    for (Map.Entry<String, JSONArray> entry : arrayMap.entrySet()) {
+      JSONArray virtualanSingle = entry.getValue();
+      String scenarioId = virtualanSingle.getJSONObject(0).getString("scenarioId").split("-")[0];
+      if (byEachTestCase(generatedTestCaseList, scenarioId)) {
+        CreateFileInfo createFileInfo = new CreateFileInfo();
+        createFileInfo.setGeneratedPath(generatedPath);
+        createFileInfo.setCucumblanMap(cucumblanMap);
+        createFileInfo.setVirtualanArray(virtualanSingle);
+        createFileInfo
+            .setTestcaseName(
+                "Virtualan_" + sheet + "_" + scenarioId);
+        createFileInfo.setScenario(scenarioId);
+        createIdaithalamProcessingFile(createFileInfo);
+      }
+    }
+  }
+
+  private static Map<String, JSONArray> buildByMiniCategory(JSONArray virtualanArray) {
+    Map<String, JSONArray> arrayMap = new HashMap<>();
+    for (int i = 0; i < virtualanArray.length(); i++) {
+      String scenarioId = virtualanArray.getJSONObject(i).getString("scenarioId").split("-")[0];
+      JSONArray array = null;
+      if (arrayMap.containsKey(scenarioId)) {
+        array = arrayMap.get(scenarioId);
+      } else {
+        array = new JSONArray();
+      }
+      array.put(virtualanArray.getJSONObject(i));
+      arrayMap.put(scenarioId, array);
+    }
+    return arrayMap;
+  }
+
+  private static JSONArray getObjectSheet(int sheet, List<String> generatedTestCaseList,
+      SheetObject sheetObject) {
+    Map<Integer, String> headers = new HashMap<>();
+    JSONArray virtualanArray = new JSONArray();
+    for (int i = 0; i <= sheetObject.getFirstSheet().getLastRowNum(); i++) {
+      Row nextRow = sheetObject.getFirstSheet().getRow(i);
+      if (headers.isEmpty()) {
+        headers = getHeader(nextRow);
+      } else {
+        String testcaseName = null;
         try {
-            BuildCollections buildCollections = new BuildCollections(basePath, generatedTestCaseList,
-                    generatedPath, excelFilePath).createCollection();
-            Map<String, String> excludeResponseMap = buildCollections.getExcludeResponseMap();
-            Map<String, String> cucumblanMap = buildCollections.getCucumblanMap();
-            createPrpos(generatedPath, cucumblanMap, "cucumblan.properties");
-            InputStream streamEnv = Thread.currentThread().getContextClassLoader()
-                    .getResourceAsStream("cucumblan-env.properties");
-            if (streamEnv != null) {
-                createPrpos(generatedPath, streamEnv, "cucumblan-env.properties");
-            }
-            if (!excludeResponseMap.isEmpty()) {
-                createPrpos(generatedPath, excludeResponseMap, "exclude-response.properties");
+          Map<String, String> finalRow = getRow(nextRow, headers);
+          testcaseName = finalRow.get("TestCaseName");
+          if (!finalRow.isEmpty() && (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
+              generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x)))) {
+            if (finalRow.get("Type") == null || "REST".equalsIgnoreCase(finalRow.get("Type"))) {
+              JSONObject object = buildRESTVirtualanCollection(sheetObject.getBasePath(),finalRow);
+              populateConfigMaps(finalRow, sheetObject.getCucumblanMap(),
+                  sheetObject.getExcludeResponseMap());
+              virtualanArray.put(object);
             }
+          }
         } catch (Exception e) {
-            log.error(
-                    "Unable to create collection for the given excel file " + excelFilePath + " >>> " + e
-                            .getMessage());
-        }
-
-    }
-
-    private static void getAsSingleFile(int sheet, List<String> generatedTestCaseList,
-                                        String generatedPath,
-                                        Map<String, String> cucumblanMap, JSONArray virtualanArray) {
-        Map<String, JSONArray> arrayMap = buildByMiniCategory(virtualanArray);
-        for (Map.Entry<String, JSONArray> entry : arrayMap.entrySet()) {
-            JSONArray virtualanSingle = entry.getValue();
-            String scenarioId = virtualanSingle.getJSONObject(0).getString("scenarioId").split("-")[0];
-            if (byEachTestCase(generatedTestCaseList, scenarioId)) {
-                CreateFileInfo createFileInfo = new CreateFileInfo();
-                createFileInfo.setGeneratedPath(generatedPath);
-                createFileInfo.setCucumblanMap(cucumblanMap);
-                createFileInfo.setVirtualanArray(virtualanSingle);
-                createFileInfo
-                        .setTestcaseName(
-                                "Virtualan_" + sheet + "_" + scenarioId);
-                createFileInfo.setScenario(scenarioId);
-                createIdaithalamProcessingFile(createFileInfo);
-            }
-        }
-    }
-
-    private static Map<String, JSONArray> buildByMiniCategory(JSONArray virtualanArray) {
-        Map<String, JSONArray> arrayMap = new HashMap<>();
-        for (int i = 0; i < virtualanArray.length(); i++) {
-            String scenarioId = virtualanArray.getJSONObject(i).getString("scenarioId").split("-")[0];
-            JSONArray array = null;
-            if (arrayMap.containsKey(scenarioId)) {
-                array = arrayMap.get(scenarioId);
-            } else {
-                array = new JSONArray();
-            }
-            array.put(virtualanArray.getJSONObject(i));
-            arrayMap.put(scenarioId, array);
-        }
-        return arrayMap;
-    }
-
-    private static JSONArray getObjectSheet(List<String> generatedTestCaseList,
-                                            SheetObject sheetObject)
-            throws MalformedURLException {
-        Map<Integer, String> headers = new HashMap<>();
-        JSONArray virtualanArray = new JSONArray();
-        for (int i = 0; i <= sheetObject.getFirstSheet().getLastRowNum() ; i++) {
-            Row nextRow = sheetObject.getFirstSheet().getRow(i);
-            if (headers.isEmpty()) {
-                headers = getHeader(nextRow);
-            } else {
-                Map<String, String> finalRow = getRow(nextRow, headers);
-                if (finalRow != null && !finalRow.isEmpty() && (generatedTestCaseList == null || generatedTestCaseList.isEmpty() ||
-                        generatedTestCaseList.stream().anyMatch(x -> finalRow.get("TestCaseName").contains(x)))) {
-                    if (finalRow.get("Type") == null || "REST".equalsIgnoreCase(finalRow.get("Type"))) {
-                        JSONObject object = buildRESTVirtualanCollection(sheetObject.getBasePath(),
-                                finalRow);
-                        populateConfigMaps(finalRow, sheetObject.getCucumblanMap(),
-                                sheetObject.getExcludeResponseMap());
-                        virtualanArray.put(object);
-                    }
-                }
-            }
-        }
-        return virtualanArray;
-    }
-
-
-    private static boolean byEachTestCase(List<String> generatedTestCaseList,
-                                          String scenarioId) {
-        return (!IdaithalamConfiguration.isWorkFlow()
-                && (generatedTestCaseList == null || generatedTestCaseList.isEmpty()
-                || generatedTestCaseList.stream().anyMatch(x -> scenarioId.contains(x))));
-
-    }
-
-    /**
-     * Gets input stream.
-     *
-     * @param basePath                the base path
-     * @param fileNameWithSubCategory the file name with sub category
-     * @return the input stream
-     * @throws FileNotFoundException the file not found exception
-     */
-    public static InputStream getInputStream(String basePath, String fileNameWithSubCategory)
-            throws FileNotFoundException, UnableToProcessException {
-        InputStream stream = null;
-        String filePath = basePath + File.separator + fileNameWithSubCategory;
-        File file = new File(filePath);
-        File fileSub = new File(fileNameWithSubCategory);
-        if (file.exists()) {
-            stream = new FileInputStream(file);
-        } else if (fileSub.exists()) {
-            stream = new FileInputStream(fileSub);
-        }
-        if (stream == null) {
-            stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
-            if (stream == null) {
-                stream = Thread.currentThread().getContextClassLoader()
-                        .getResourceAsStream(fileNameWithSubCategory);
-            }
-        }
-        if (stream == null) {
-            stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
-            if (stream == null) {
-                stream = ExcelToCollectionGenerator.class.getClassLoader()
-                        .getResourceAsStream(fileNameWithSubCategory);
-            }
-        }
-        if (stream == null) {
-            log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-            throw new UnableToProcessException(
-                    " File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-        }
-        return stream;
-    }
-
-    /**
-     * Gets file as string.
-     *
-     * @param basePath                the base path
-     * @param fileNameWithSubCategory the file name with sub category
-     * @return the file as string
-     * @throws IOException the io exception
-     */
-    public static String getFileAsString(String basePath, String fileNameWithSubCategory)
-            throws IOException {
-        InputStream stream = null;
-        String filePath = basePath + File.separator + fileNameWithSubCategory;
-        File file = new File(filePath);
-        File fileSub = new File(fileNameWithSubCategory);
-        if (file.exists()) {
-            stream = new FileInputStream(file);
-        } else if (fileSub.exists()) {
-            stream = new FileInputStream(fileSub);
-        }
-        stream = getInputStream(fileNameWithSubCategory, stream, filePath);
-        if (stream == null) {
-            stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
-            if (stream == null) {
-                stream = ExcelToCollectionGenerator.class.getClassLoader()
-                        .getResourceAsStream(fileNameWithSubCategory);
-            }
-        }
-        if (stream == null) {
-            log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
-            System.exit(-1);
-        }
-        return convertStreamToString(stream);
-    }
-
-    private static InputStream getInputStream(String fileNameWithSubCategory,
-                                              InputStream stream,
-                                              String filePath) {
-        if (stream == null) {
-            stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
-            if (stream == null) {
-                stream = Thread.currentThread().getContextClassLoader()
-                        .getResourceAsStream(fileNameWithSubCategory);
-            }
-        }
-        return stream;
-    }
-
-    private static Map<String, String> getCucumblan() {
-        Map<String, String> cucumblanMap = new HashMap<>();
-        cucumblanMap.put("virtualan.data.load", "");
-        cucumblanMap.put("virtualan.data.heading", "");
-        cucumblanMap.put("virtualan.data.type", "VIRTUALAN");
-        return cucumblanMap;
-    }
-
-    private static JSONObject buildRESTVirtualanCollection(String basePath,
-                                                           Map<String, String> dataMap) throws MalformedURLException {
-        JSONObject virtualanObj = new JSONObject();
-        JSONArray paramsArray = new JSONArray();
-        getMultiRunValue(dataMap, virtualanObj, paramsArray);
-        virtualanObj.put("contentType", dataMap.get("ContentType"));
-        buildParam("contentType", dataMap.get("ContentType"), paramsArray, "HEADER_PARAM");
-        createProcessingType(dataMap, paramsArray, "FormParams", "FORM_PARAM");
-        createProcessingType(dataMap, paramsArray, "RequestHeaders", "HEADER_PARAM");
-        createProcessingType(dataMap, paramsArray, "ResponseProcessingType", "HEADER_PARAM");
-        virtualanObj.put("scenarioId", dataMap.get("TestCaseName"));
-        virtualanObj.put("scenario", dataMap.get("TestCaseNameDesc"));
-        createProcessingType(dataMap, paramsArray, "StoreResponseVariables", "STORAGE_PARAM");
-        createProcessingType(dataMap, paramsArray, "AddifyVariables", "ADDIFY_PARAM");
-        createProcessingType(dataMap, paramsArray, "CookieVariables", "COOKIE_PARAM");
-        getValue("Tags", dataMap, virtualanObj);
-        getValue("SkipScenario", dataMap, virtualanObj);
-        getSecurityValue(dataMap, virtualanObj);
-        if (dataMap.get("Action") != null) {
-            virtualanObj.put("method",
-                    dataMap.get("Action").toUpperCase());
-        } else {
-            log.error("HTTP ACTION IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
-        }
-        if (dataMap.get("URL") != null) {
-            URL aURL = new URL(dataMap.get("URL"));
-            String resource = getResource(aURL.getPath());
-            virtualanObj.put("url", aURL.getPath());
-            virtualanObj.put("resource", resource);
-            createQueryParam(aURL.getQuery(), paramsArray);
-        } else {
-            log.error("URL IS MANDATORY!!! for " + dataMap.get("TestCaseName"));
-        }
-        if (dataMap.get("RequestFile") != null || dataMap.get("RequestContent") != null) {
-            virtualanObj.put("input", buildObjectRequest(basePath, dataMap));
-        }
-        if (dataMap.get("ResponseByFields") != null) {
-            virtualanObj.put("outputFields", dataMap.get("ResponseByFields"));
-        }else if (dataMap.get("Csvson") != null) {
-            virtualanObj.put("csvson", dataMap.get("Csvson"));
-        }else if (dataMap.get("ResponseFile") != null || dataMap.get("ResponseContent") != null) {
-            if (dataMap.get("IncludesByPath") != null) {
-                virtualanObj.put("outputPaths", dataMap.get("IncludesByPath"));
-            }
-            virtualanObj.put("output", buildObjectResponse(basePath, dataMap));
-        }
-        builHttpStausCode(dataMap, virtualanObj);
-        if (paramsArray.length() > 0) {
-            virtualanObj.put("availableParams", paramsArray);
-        }
-        return virtualanObj;
-    }
-
-    private static void getSecurityValue(Map<String, String> dataMap, JSONObject virtualanObj) {
-        String security = dataMap.get("Security");
-        if (security != null && !security.isEmpty() && security.split("=").length == 2) {
-            virtualanObj.put("security", "okta");
-        } else if (dataMap.get("Security") != null) {
-            virtualanObj.put("security", security);
-        }
-
-    }
-
-    private static void getValue(String key, Map<String, String> dataMap, JSONObject virtualanObj) {
-        if (dataMap.get(key) != null) {
-            virtualanObj.put(key, dataMap.get(key));
-        }
-    }
-
-    private static void getMultiRunValue(Map<String, String> dataMap, JSONObject virtualanObj,
-                                         JSONArray paramsArray) {
-        if (dataMap.get("MultiRun") != null) {
-            virtualanObj.put("MultiRun", dataMap.get("MultiRun"));
-            String row = dataMap.get("MultiRun").split(";")[0];
-            for (String param : row.split("\\|")) {
-                buildParam(param, "<" + param + ">", paramsArray, "ADDIFY_PARAM");
-            }
-        }
-    }
-
-
-    private static void builHttpStausCode(Map<String, String> dataMap, JSONObject virtualanObj) {
-        if (dataMap.get("StatusCode") != null) {
-            virtualanObj.put("httpStatusCode", dataMap.get("StatusCode"));
-        } else {
-            log.error("HTTP STATUS CODE IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
-        }
-    }
-
-    private static String buildObjectResponse(String basePath, Map<String, String> responseFile) {
-        try {
-            String body = null;
-            if (responseFile.get("ResponseContent") != null) {
-                body = responseFile.get("ResponseContent");
-            } else if (responseFile.get("ResponseFile") != null) {
-                body = getFileAsString(basePath, responseFile.get("ResponseFile"));
-            }
-            if (body != null) {
-                return body.trim();
-            } else {
-                log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
-                        + responseFile.get("ResponseContent"));
-            }
-        } catch (IOException e) {
-            log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
-                    + responseFile.get("ResponseContent"));
-        }
-        return null;
-    }
-
-    private static String buildObjectRequest(String basePath, Map<String, String> requestFile) {
-        try {
-            String body = null;
-            if (requestFile.get("RequestContent") != null) {
-                body = requestFile.get("RequestContent");
-            } else if (requestFile.get("RequestFile") != null) {
-                body = getFileAsString(basePath, requestFile.get("RequestFile"));
-            }
-            if (body != null) {
-                return body.trim();
-            } else {
-                log.warn("Unable to load " + requestFile + " file or content > " + requestFile);
-            }
-        } catch (IOException e) {
-            log.warn("Unable to load " + requestFile + " file or conten> " + requestFile);
-        }
-        return null;
-    }
-
-    private static void createProcessingType(Map<String, String> dataMap,
-                                             JSONArray paramsArray, String requestProcessingType, String param) {
-        if (dataMap.get(requestProcessingType) != null) {
-            String[] processTypes = dataMap.get(requestProcessingType).split(";");
-            for (String keyValue : processTypes) {
-                String[] processType = keyValue.split("=");
-                if (processType.length == 2) {
-                    buildParam(processType[0], processType[1], paramsArray, param);
-                }
-            }
-        }
-    }
-
-    private static void createIdaithalamProcessingFile(
-            CreateFileInfo createFileInfo) {
-        String fileCreated = generateExcelJson(createFileInfo.getGeneratedPath(),
-                createFileInfo.getVirtualanArray(),
-                createFileInfo.getTestcaseName());
-        if (fileCreated != null) {
-            String filesCreated = createFileInfo.getCucumblanMap().get("virtualan.data.load");
-            createFileInfo.getCucumblanMap().put("virtualan.data.load", filesCreated + fileCreated + ";");
-            String headings = createFileInfo.getCucumblanMap().get("virtualan.data.heading");
-            createFileInfo.getCucumblanMap()
-                    .put("virtualan.data.heading", headings + createFileInfo.getScenario() + ";");
-        }
-    }
-
-    private static String getResource(String resource) {
-        if (resource.split("/").length > 0) {
-            return resource.split("/")[1];
-        }
-        return "default";
-    }
-
-    private static void createPrpos(String path, InputStream stream, String fileName) {
-        try {
-            Properties props = new Properties();
-            //Populating the properties file
-            props.load(stream);
-            //Instantiating the FileInputStream for output file
-            FileOutputStream outputStrem = new FileOutputStream(
-                    path + File.separator + fileName);
-            //Storing the properties file
-            props.store(outputStrem, "This is a " + fileName + " properties file");
-            log.info(fileName + " Properties file created......");
-        } catch (IOException e) {
-            log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
-        }
-    }
-
-    public static void createPrpos(String path, Map<String, String> propsMap, String fileName) {
-        try {
-            Properties props = new Properties();
-            //Populating the properties file
-            props.putAll(propsMap);
-            //Instantiating the FileInputStream for output file
-            FileOutputStream outputStrem = new FileOutputStream(
-                    path + File.separator + fileName);
-            //Storing the properties file
-            props.store(outputStrem, "This is a " + fileName + " properties file");
-            log.info(fileName + " Properties file created......");
-        } catch (IOException e) {
-            log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
-        }
-    }
-
-    private static String generateExcelJson(String path, JSONArray excelArray, String fileName) {
-        String fileCreated = null;
-        try {
-            FileOutputStream outputStream = new FileOutputStream(
-                    path + File.separator + fileName + ".json");
-            Writer writer = new OutputStreamWriter(outputStream);
-            CharSequence cs = excelArray.toString();
-            writer.append(cs);
-            writer.close();
-            fileCreated = fileName + ".json";
-        } catch (IOException e) {
-            log.warn(" Unable to generate Virtualan  JSON  " + fileName + " : " + e.getMessage());
-        }
-        return fileCreated;
-    }
-
-    private static void buildParam(String key, String value, JSONArray paramsArray, String param) {
-        JSONObject virtualanObjParam = new JSONObject();
-        virtualanObjParam.put("key", key);
-        virtualanObjParam.put("value", value);
-        virtualanObjParam.put("parameterType", param);
-        paramsArray.put(virtualanObjParam);
-    }
-
-    private static void createQueryParam(String queryString, JSONArray paramsArray) {
-        if (queryString != null) {
-            String[] querys = queryString.split("&");
-            for (String query : querys) {
-                JSONObject virtualanObjParam = new JSONObject();
-                String[] queryPart = query.split("=");
-                virtualanObjParam.put("key", queryPart[0]);
-                if (queryPart.length == 2) {
-                    virtualanObjParam.put("value", queryPart[1]);
-                } else {
-                    virtualanObjParam.put("value", "");
-                }
-                virtualanObjParam.put("parameterType", "QUERY_PARAM");
-                paramsArray.put(virtualanObjParam);
-            }
-        }
-    }
-
-    private static void populateConfigMaps(
-            Map<String, String> dataMap, Map<String, String> cucumblanMap,
-            Map<String, String> excludeResponseMap) throws MalformedURLException {
+          log.warn("Spread sheet (" + testcaseName + ") " + (sheet+1) + " with row number " + (i+1)
+              + " is unable to process for the reason >> "
+              + e.getMessage());
+        }
+      }
+    }
+    return virtualanArray;
+  }
+
+
+  private static boolean byEachTestCase(List<String> generatedTestCaseList,
+      String scenarioId) {
+    return (!IdaithalamConfiguration.isWorkFlow()
+        && (generatedTestCaseList == null || generatedTestCaseList.isEmpty()
+        || generatedTestCaseList.stream().anyMatch(x -> scenarioId.contains(x))));
+
+  }
+
+  /**
+   * Gets input stream.
+   *
+   * @param basePath                the base path
+   * @param fileNameWithSubCategory the file name with sub category
+   * @return the input stream
+   * @throws FileNotFoundException the file not found exception
+   */
+  public static InputStream getInputStream(String basePath, String fileNameWithSubCategory)
+      throws FileNotFoundException, UnableToProcessException {
+    InputStream stream = null;
+    String filePath = basePath + File.separator + fileNameWithSubCategory;
+    File file = new File(filePath);
+    File fileSub = new File(fileNameWithSubCategory);
+    if (file.exists()) {
+      stream = new FileInputStream(file);
+    } else if (fileSub.exists()) {
+      stream = new FileInputStream(fileSub);
+    }
+    if (stream == null) {
+      stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
+      if (stream == null) {
+        stream = Thread.currentThread().getContextClassLoader()
+            .getResourceAsStream(fileNameWithSubCategory);
+      }
+    }
+    if (stream == null) {
+      stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
+      if (stream == null) {
+        stream = ExcelToCollectionGenerator.class.getClassLoader()
+            .getResourceAsStream(fileNameWithSubCategory);
+      }
+    }
+    if (stream == null) {
+      log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+      throw new UnableToProcessException(
+          " File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+    }
+    return stream;
+  }
+
+  /**
+   * Gets file as string.
+   *
+   * @param basePath                the base path
+   * @param fileNameWithSubCategory the file name with sub category
+   * @return the file as string
+   * @throws IOException the io exception
+   */
+  public static String getFileAsString(String basePath, String fileNameWithSubCategory)
+      throws IOException {
+    InputStream stream = null;
+    String filePath = basePath + File.separator + fileNameWithSubCategory;
+    File file = new File(filePath);
+    File fileSub = new File(fileNameWithSubCategory);
+    if (file.exists()) {
+      stream = new FileInputStream(file);
+    } else if (fileSub.exists()) {
+      stream = new FileInputStream(fileSub);
+    }
+    stream = getInputStream(fileNameWithSubCategory, stream, filePath);
+    if (stream == null) {
+      stream = ExcelToCollectionGenerator.class.getClassLoader().getResourceAsStream(filePath);
+      if (stream == null) {
+        stream = ExcelToCollectionGenerator.class.getClassLoader()
+            .getResourceAsStream(fileNameWithSubCategory);
+      }
+    }
+    if (stream == null) {
+      log.error(" File is missing(" + basePath + ") : " + fileNameWithSubCategory);
+      System.exit(-1);
+    }
+    return convertStreamToString(stream);
+  }
+
+  private static InputStream getInputStream(String fileNameWithSubCategory,
+      InputStream stream,
+      String filePath) {
+    if (stream == null) {
+      stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
+      if (stream == null) {
+        stream = Thread.currentThread().getContextClassLoader()
+            .getResourceAsStream(fileNameWithSubCategory);
+      }
+    }
+    return stream;
+  }
+
+  private static Map<String, String> getCucumblan() {
+    Map<String, String> cucumblanMap = new HashMap<>();
+    cucumblanMap.put("virtualan.data.load", "");
+    cucumblanMap.put("virtualan.data.heading", "");
+    cucumblanMap.put("virtualan.data.type", "VIRTUALAN");
+    return cucumblanMap;
+  }
+
+  private static JSONObject buildRESTVirtualanCollection(String basePath,
+      Map<String, String> dataMap)
+      throws UnableToProcessException {
+    JSONObject virtualanObj = new JSONObject();
+    try {
+      JSONArray paramsArray = new JSONArray();
+      getMultiRunValue(dataMap, virtualanObj, paramsArray);
+      virtualanObj.put("contentType", dataMap.get("ContentType"));
+      buildParam("contentType", dataMap.get("ContentType"), paramsArray, "HEADER_PARAM");
+      createProcessingType(dataMap, paramsArray, "FormParams", "FORM_PARAM");
+      createProcessingType(dataMap, paramsArray, "RequestHeaders", "HEADER_PARAM");
+      createProcessingType(dataMap, paramsArray, "ResponseProcessingType", "HEADER_PARAM");
+      virtualanObj.put("scenarioId", dataMap.get("TestCaseName"));
+      virtualanObj.put("scenario", dataMap.get("TestCaseNameDesc"));
+      createProcessingType(dataMap, paramsArray, "StoreResponseVariables", "STORAGE_PARAM");
+      createProcessingType(dataMap, paramsArray, "AddifyVariables", "ADDIFY_PARAM");
+      createProcessingType(dataMap, paramsArray, "CookieVariables", "COOKIE_PARAM");
+      getValue("Tags", dataMap, virtualanObj);
+      getValue("SkipScenario", dataMap, virtualanObj);
+      getSecurityValue(dataMap, virtualanObj);
+      if (dataMap.get("Action") != null) {
+        virtualanObj.put("method",
+            dataMap.get("Action").toUpperCase());
+      } else {
+        log.error("HTTP ACTION IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
+      }
+      if (dataMap.get("URL") != null) {
         URL aURL = new URL(dataMap.get("URL"));
         String resource = getResource(aURL.getPath());
-        cucumblanMap.put("service.api." + resource,
-                aURL.getProtocol() + "://" + aURL.getAuthority());
-        String okta = dataMap.get("Security");
-        if (okta != null && !okta.isEmpty() && okta.split("=").length == 2) {
-            cucumblanMap.put("service.api.okta_token." + resource, okta.split("=")[1]);
-        }
-        if (dataMap.get("ExcludeFields") != null) {
-            excludeResponseMap.put(aURL.getPath(), dataMap.get("ExcludeFields"));
-        }
-    }
-
-    private static String getCellValue(Cell cell) {
-        if (cell.getCellTypeEnum() != CellType.FORMULA) {
-            switch (cell.getCellTypeEnum()) {
-                case STRING:
-                    return cell.getStringCellValue().trim();
-                case BOOLEAN:
-                    return String.valueOf(cell.getBooleanCellValue());
-                case NUMERIC:
-                    return String.valueOf((int) cell.getNumericCellValue());
-                default:
-                    return null;
-            }
-        }
-        return null;
-    }
-
-    private static class BuildCollections {
-
-        private final String basePath;
-        private final List<String> generatedTestCaseList;
-        private final String generatedPath;
-        private final String inputExcel;
-        private Map<String, String> excludeResponseMap;
-        private Map<String, String> cucumblanMap;
-
-        BuildCollections(String basePath, List<String> generatedTestCaseList,
-                         String generatedPath,
-                         String inputExcel) {
-            this.basePath = basePath;
-            this.generatedTestCaseList = generatedTestCaseList;
-            this.generatedPath = generatedPath;
-            this.inputExcel = inputExcel;
-        }
-
-        Map<String, String> getExcludeResponseMap() {
-            return excludeResponseMap;
-        }
-
-        Map<String, String> getCucumblanMap() {
-            return cucumblanMap;
-        }
-
-
-        BuildCollections createCollection() throws IOException, UnableToProcessException {
-            excludeResponseMap = new HashMap<>();
-            cucumblanMap = getCucumblan();
-            InputStream stream = getInputStream(basePath, inputExcel);
-            Workbook workbook = null;
-            try {
-                workbook = new XSSFWorkbook(stream);
-                for (int sheet = 0; sheet < workbook.getNumberOfSheets(); sheet++) {
-                    Sheet firstSheet = workbook.getSheetAt(sheet);
-                    SheetObject sheetObject = new SheetObject();
-                    sheetObject.setBasePath(basePath);
-                    sheetObject.setExcludeResponseMap(excludeResponseMap);
-                    sheetObject.setCucumblanMap(cucumblanMap);
-                    sheetObject.setFirstSheet(firstSheet);
-                    createCollections(generatedTestCaseList, sheet, firstSheet, sheetObject);
-                }
-            } catch (Exception e) {
-              log.error(
-                      "Unable to create collection for the given excel file " + inputExcel + " <<< " + e.getMessage());
-            } finally {
-                if (workbook != null)
-                    workbook.close();
-                if (stream != null)
-                    stream.close();
-            }
-            return this;
+        virtualanObj.put("url", aURL.getPath());
+        virtualanObj.put("resource", resource);
+        createQueryParam(aURL.getQuery(), paramsArray);
+      } else {
+        log.error("URL IS MANDATORY!!! for " + dataMap.get("TestCaseName"));
+      }
+      if (dataMap.get("RequestFile") != null || dataMap.get("RequestContent") != null) {
+        virtualanObj.put("input", buildObjectRequest(basePath, dataMap));
+      }
+      if (dataMap.get("ResponseByFields") != null) {
+        virtualanObj.put("outputFields", dataMap.get("ResponseByFields"));
+      } else if (dataMap.get("Csvson") != null) {
+        virtualanObj.put("csvson", dataMap.get("Csvson"));
+      } else if (dataMap.get("ResponseFile") != null || dataMap.get("ResponseContent") != null) {
+        if (dataMap.get("IncludesByPath") != null) {
+          virtualanObj.put("outputPaths", dataMap.get("IncludesByPath"));
+        }
+        virtualanObj.put("output", buildObjectResponse(basePath, dataMap));
+      }
+      builHttpStausCode(dataMap, virtualanObj);
+      if (paramsArray.length() > 0) {
+        virtualanObj.put("availableParams", paramsArray);
+      }
+    } catch (Exception e) {
+      throw new UnableToProcessException(
+          "Unable to build collection object for " + dataMap.get("TestCaseName") + " :: " + e
+              .getMessage());
+    }
+    return virtualanObj;
+  }
+
+  private static void getSecurityValue(Map<String, String> dataMap, JSONObject virtualanObj) {
+    String security = dataMap.get("Security");
+    if (security != null && !security.isEmpty() && security.split("=").length == 2) {
+      virtualanObj.put("security", "okta");
+    } else if (dataMap.get("Security") != null) {
+      virtualanObj.put("security", security);
+    }
+
+  }
+
+  private static void getValue(String key, Map<String, String> dataMap, JSONObject virtualanObj) {
+    if (dataMap.get(key) != null) {
+      virtualanObj.put(key, dataMap.get(key));
+    }
+  }
+
+  private static void getMultiRunValue(Map<String, String> dataMap, JSONObject virtualanObj,
+      JSONArray paramsArray) {
+    if (dataMap.get("MultiRun") != null) {
+      virtualanObj.put("MultiRun", dataMap.get("MultiRun"));
+      String row = dataMap.get("MultiRun").split(";")[0];
+      for (String param : row.split("\\|")) {
+        buildParam(param, "<" + param + ">", paramsArray, "ADDIFY_PARAM");
+      }
+    }
+  }
+
+
+  private static void builHttpStausCode(Map<String, String> dataMap, JSONObject virtualanObj) {
+    if (dataMap.get("StatusCode") != null) {
+      virtualanObj.put("httpStatusCode", dataMap.get("StatusCode"));
+    } else {
+      log.error("HTTP STATUS CODE IS MANDATORY!!! " + dataMap.get("TestCaseNameDesc"));
+    }
+  }
+
+  private static String buildObjectResponse(String basePath, Map<String, String> responseFile) {
+    try {
+      String body = null;
+      if (responseFile.get("ResponseContent") != null) {
+        body = responseFile.get("ResponseContent");
+      } else if (responseFile.get("ResponseFile") != null) {
+        body = getFileAsString(basePath, responseFile.get("ResponseFile"));
+      }
+      if (body != null) {
+        return body.trim();
+      } else {
+        log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
+            + responseFile.get("ResponseContent"));
+      }
+    } catch (IOException e) {
+      log.warn("Unable to load " + responseFile.get("ResponseFile") + " file or content > "
+          + responseFile.get("ResponseContent"));
+    }
+    return null;
+  }
+
+  private static String buildObjectRequest(String basePath, Map<String, String> requestFile) {
+    try {
+      String body = null;
+      if (requestFile.get("RequestContent") != null) {
+        body = requestFile.get("RequestContent");
+      } else if (requestFile.get("RequestFile") != null) {
+        body = getFileAsString(basePath, requestFile.get("RequestFile"));
+      }
+      if (body != null) {
+        return body.trim();
+      } else {
+        log.warn("Unable to load " + requestFile + " file or content > " + requestFile);
+      }
+    } catch (IOException e) {
+      log.warn("Unable to load " + requestFile + " file or conten> " + requestFile);
+    }
+    return null;
+  }
+
+  private static void createProcessingType(Map<String, String> dataMap,
+      JSONArray paramsArray, String requestProcessingType, String param) {
+    if (dataMap.get(requestProcessingType) != null) {
+      String[] processTypes = dataMap.get(requestProcessingType).split(";");
+      for (String keyValue : processTypes) {
+        String[] processType = keyValue.split("=");
+        if (processType.length == 2) {
+          buildParam(processType[0], processType[1], paramsArray, param);
+        }
+      }
+    }
+  }
+
+  private static void createIdaithalamProcessingFile(
+      CreateFileInfo createFileInfo) {
+    String fileCreated = generateExcelJson(createFileInfo.getGeneratedPath(),
+        createFileInfo.getVirtualanArray(),
+        createFileInfo.getTestcaseName());
+    if (fileCreated != null) {
+      String filesCreated = createFileInfo.getCucumblanMap().get("virtualan.data.load");
+      createFileInfo.getCucumblanMap().put("virtualan.data.load", filesCreated + fileCreated + ";");
+      String headings = createFileInfo.getCucumblanMap().get("virtualan.data.heading");
+      createFileInfo.getCucumblanMap()
+          .put("virtualan.data.heading", headings + createFileInfo.getScenario() + ";");
+    }
+  }
+
+  private static String getResource(String resource) {
+    if (resource.split("/").length > 0) {
+      return resource.split("/")[1];
+    }
+    return "default";
+  }
+
+  private static void createPrpos(String path, InputStream stream, String fileName) {
+    try {
+      Properties props = new Properties();
+      //Populating the properties file
+      props.load(stream);
+      //Instantiating the FileInputStream for output file
+      FileOutputStream outputStrem = new FileOutputStream(
+          path + File.separator + fileName);
+      //Storing the properties file
+      props.store(outputStrem, "This is a " + fileName + " properties file");
+      log.info(fileName + " Properties file created......");
+    } catch (IOException e) {
+      log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
+    }
+  }
+
+  public static void createPrpos(String path, Map<String, String> propsMap, String fileName) {
+    try {
+      Properties props = new Properties();
+      //Populating the properties file
+      props.putAll(propsMap);
+      //Instantiating the FileInputStream for output file
+      FileOutputStream outputStrem = new FileOutputStream(
+          path + File.separator + fileName);
+      //Storing the properties file
+      props.store(outputStrem, "This is a " + fileName + " properties file");
+      log.info(fileName + " Properties file created......");
+    } catch (IOException e) {
+      log.warn(" Unable to generate " + fileName + " properties  " + e.getMessage());
+    }
+  }
+
+  private static String generateExcelJson(String path, JSONArray excelArray, String fileName) {
+    String fileCreated = null;
+    try {
+      FileOutputStream outputStream = new FileOutputStream(
+          path + File.separator + fileName + ".json");
+      Writer writer = new OutputStreamWriter(outputStream);
+      CharSequence cs = excelArray.toString();
+      writer.append(cs);
+      writer.close();
+      fileCreated = fileName + ".json";
+    } catch (IOException e) {
+      log.warn(" Unable to generate Virtualan  JSON  " + fileName + " : " + e.getMessage());
+    }
+    return fileCreated;
+  }
+
+  private static void buildParam(String key, String value, JSONArray paramsArray, String param) {
+    JSONObject virtualanObjParam = new JSONObject();
+    virtualanObjParam.put("key", key);
+    virtualanObjParam.put("value", value);
+    virtualanObjParam.put("parameterType", param);
+    paramsArray.put(virtualanObjParam);
+  }
+
+  private static void createQueryParam(String queryString, JSONArray paramsArray) {
+    if (queryString != null) {
+      String[] querys = queryString.split("&");
+      for (String query : querys) {
+        JSONObject virtualanObjParam = new JSONObject();
+        String[] queryPart = query.split("=");
+        virtualanObjParam.put("key", queryPart[0]);
+        if (queryPart.length == 2) {
+          virtualanObjParam.put("value", queryPart[1]);
+        } else {
+          virtualanObjParam.put("value", "");
         }
-
-        private void createCollections(List<String> generatedTestCaseList, int sheet, Sheet firstSheet,
-                                       SheetObject sheetObject)
-                throws MalformedURLException {
-            JSONArray virtualanArray = getObjectSheet(generatedTestCaseList, sheetObject);
-            log.info(virtualanArray.toString());
-            if (virtualanArray.length() > 0) {
-                if (IdaithalamConfiguration.isWorkFlow()) {
-                    CreateFileInfo createFileInfo = new CreateFileInfo();
-                    createFileInfo.setGeneratedPath(generatedPath);
-                    createFileInfo.setCucumblanMap(cucumblanMap);
-                    createFileInfo.setVirtualanArray(virtualanArray);
-                    createFileInfo.setTestcaseName(
-                            "Virtualan_" + sheet + "_" + firstSheet.getSheetName().replaceAll(" ", "_")
-                                    + "_WORKFLOW_" + sheet);
-                    createFileInfo.setScenario("WORKFLOW:" + firstSheet.getSheetName());
-                    createIdaithalamProcessingFile(createFileInfo);
-                } else {
-                    getAsSingleFile(sheet, generatedTestCaseList, generatedPath, cucumblanMap,
-                            virtualanArray);
-                }
-            }
+        virtualanObjParam.put("parameterType", "QUERY_PARAM");
+        paramsArray.put(virtualanObjParam);
+      }
+    }
+  }
+
+  private static void populateConfigMaps(
+      Map<String, String> dataMap, Map<String, String> cucumblanMap,
+      Map<String, String> excludeResponseMap) throws MalformedURLException {
+    URL aURL = new URL(dataMap.get("URL"));
+    String resource = getResource(aURL.getPath());
+    cucumblanMap.put("service.api." + resource,
+        aURL.getProtocol() + "://" + aURL.getAuthority());
+    String okta = dataMap.get("Security");
+    if (okta != null && !okta.isEmpty() && okta.split("=").length == 2) {
+      cucumblanMap.put("service.api.okta_token." + resource, okta.split("=")[1]);
+    }
+    if (dataMap.get("ExcludeFields") != null) {
+      excludeResponseMap.put(aURL.getPath(), dataMap.get("ExcludeFields"));
+    }
+  }
+
+  private static String getCellValue(Cell cell) {
+    if (cell.getCellTypeEnum() != CellType.FORMULA) {
+      switch (cell.getCellTypeEnum()) {
+        case STRING:
+          return cell.getStringCellValue().trim();
+        case BOOLEAN:
+          return String.valueOf(cell.getBooleanCellValue());
+        case NUMERIC:
+          return String.valueOf((int) cell.getNumericCellValue());
+        default:
+          return null;
+      }
+    }
+    return null;
+  }
+
+  private static class BuildCollections {
+
+    private final String basePath;
+    private final List<String> generatedTestCaseList;
+    private final String generatedPath;
+    private final String inputExcel;
+    private Map<String, String> excludeResponseMap;
+    private Map<String, String> cucumblanMap;
+
+    BuildCollections(String basePath, List<String> generatedTestCaseList,
+        String generatedPath,
+        String inputExcel) {
+      this.basePath = basePath;
+      this.generatedTestCaseList = generatedTestCaseList;
+      this.generatedPath = generatedPath;
+      this.inputExcel = inputExcel;
+    }
+
+    Map<String, String> getExcludeResponseMap() {
+      return excludeResponseMap;
+    }
+
+    Map<String, String> getCucumblanMap() {
+      return cucumblanMap;
+    }
+
+
+    BuildCollections createCollection() throws IOException, UnableToProcessException {
+      excludeResponseMap = new HashMap<>();
+      cucumblanMap = getCucumblan();
+      InputStream stream = getInputStream(basePath, inputExcel);
+      Workbook workbook = null;
+      try {
+        workbook = new XSSFWorkbook(stream);
+        for (int sheet = 0; sheet < workbook.getNumberOfSheets(); sheet++) {
+          Sheet firstSheet = workbook.getSheetAt(sheet);
+          SheetObject sheetObject = new SheetObject();
+          sheetObject.setBasePath(basePath);
+          sheetObject.setExcludeResponseMap(excludeResponseMap);
+          sheetObject.setCucumblanMap(cucumblanMap);
+          sheetObject.setFirstSheet(firstSheet);
+          createCollections(generatedTestCaseList, sheet, firstSheet, sheetObject);
+        }
+      } catch (Exception e) {
+        log.error(
+            "Unable to create collection for the given excel file " + inputExcel + " <<< " + e
+                .getMessage());
+      } finally {
+          if (workbook != null) {
+              workbook.close();
+          }
+          if (stream != null) {
+              stream.close();
+          }
+      }
+      return this;
+    }
+
+    private void createCollections(List<String> generatedTestCaseList, int sheet, Sheet firstSheet,
+        SheetObject sheetObject)
+        throws MalformedURLException {
+      JSONArray virtualanArray = getObjectSheet(sheet, generatedTestCaseList, sheetObject);
+      log.info("Sheet no " + sheet + " build out" + virtualanArray.toString());
+      if (virtualanArray.length() > 0) {
+        if (IdaithalamConfiguration.isWorkFlow()) {
+          CreateFileInfo createFileInfo = new CreateFileInfo();
+          createFileInfo.setGeneratedPath(generatedPath);
+          createFileInfo.setCucumblanMap(cucumblanMap);
+          createFileInfo.setVirtualanArray(virtualanArray);
+          createFileInfo.setTestcaseName(
+              "Virtualan_" + sheet + "_" + firstSheet.getSheetName().replaceAll(" ", "_")
+                  + "_WORKFLOW_" + sheet);
+          createFileInfo.setScenario("WORKFLOW:" + firstSheet.getSheetName());
+          createIdaithalamProcessingFile(createFileInfo);
+        } else {
+          getAsSingleFile(sheet, generatedTestCaseList, generatedPath, cucumblanMap,
+              virtualanArray);
         }
+      }
     }
+  }
 }
diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
index 0155e98d..e0215a94 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/FeatureGenerationHelper.java
@@ -398,7 +398,9 @@ private static Object getJSON(String json) {
       try {
         return new JSONArray(json);
       } catch (Exception e) {
-        LOGGER.warning(json + " is invalid");
+        if (json.contains("{") && json.contains("}")) {
+          log.warn(  json +" is not a valid JSON!. Correct the JSON file!");
+        }
         return json;
       }
     }

From 65b75dbee9dd8ef792e81960d090fdf455f178d5 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Fri, 23 Apr 2021 20:50:18 -0500
Subject: [PATCH 28/29] Add useful information for the error message

---
 pom.xml                                       |   1 +
 .../api-testing.xml                           |   4 ++--
 samples/idaithalam-excel-apitesting/pom.xml   |   2 +-
 ...ava => APITestWithExcelAsTestManager.java} |   2 +-
 .../virtualan_collection_testcase_8.xlsx      | Bin 8181 -> 8172 bytes
 .../idaithalam-massapibatch-testing/pom.xml   |   2 +-
 .../conf/feature/virtualan-contract.0.feature |  11 +++++++++--
 .../conf/virtualan-provider.json              |   2 +-
 samples/idaithalam-openapi-contract/pom.xml   |   2 +-
 .../idaithalam-postmancoll-apitesting/pom.xml |   2 +-
 10 files changed, 18 insertions(+), 10 deletions(-)
 rename samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/{APITestWithExcelAsRunManager.java => APITestWithExcelAsTestManager.java} (99%)

diff --git a/pom.xml b/pom.xml
index 7fb1bbe5..c547c480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
       </activation>
       <modules>
         <module>samples/idaithalam-postmancoll-apitesting</module>
+        <module>samples/idaithalam-massapibatch-testing</module>
         <module>samples/idaithalam-excel-apitesting</module>
         <module>samples/idaithalam-openapi-contract</module>
       </modules>
diff --git a/samples/idaithalam-excel-apitesting/api-testing.xml b/samples/idaithalam-excel-apitesting/api-testing.xml
index 498b31ee..a8a0015f 100644
--- a/samples/idaithalam-excel-apitesting/api-testing.xml
+++ b/samples/idaithalam-excel-apitesting/api-testing.xml
@@ -3,7 +3,7 @@
 <suite name="End-2-End API automation Suite">
     <test name="End-2-End API automation Suite">
         <classes>
-            <class name="io.virtualan.test.APITestWithExcelAsRunManager">
+            <class name="io.virtualan.test.APITestWithExcelAsTestManager">
                 <methods>
                     <include name="executeApiTests_1"/>
                     <include name="executeApiTests_2"/>
@@ -11,7 +11,7 @@
                     <include name="executeApiTests_4"/>
                     <include name="executeApiTests_5"/>
                     <include name="executeApiTests_6"/>
-                    <include name="executeApiTests_7"/>
+                    <include name=" executeApiTests_empty_7"/>
                     <include name="executeApiTests_multiplesheet_8"/>
                 </methods>
             </class>
diff --git a/samples/idaithalam-excel-apitesting/pom.xml b/samples/idaithalam-excel-apitesting/pom.xml
index 00f0d78e..6fa13944 100644
--- a/samples/idaithalam-excel-apitesting/pom.xml
+++ b/samples/idaithalam-excel-apitesting/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.7</idaithalam.version>
+		<idaithalam.version>1.2.8-SNAPSHOT</idaithalam.version>
     <testng.ver>7.4.0</testng.ver>
     <java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsTestManager.java
similarity index 99%
rename from samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
rename to samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsTestManager.java
index 999933e3..5776db0c 100644
--- a/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsRunManager.java
+++ b/samples/idaithalam-excel-apitesting/src/test/java/io/virtualan/test/APITestWithExcelAsTestManager.java
@@ -11,7 +11,7 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-public class APITestWithExcelAsRunManager {
+public class APITestWithExcelAsTestManager {
 
     @BeforeClass
     public void testBeforeClass(){
diff --git a/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_8.xlsx b/samples/idaithalam-excel-apitesting/src/test/resources/virtualan_collection_testcase_8.xlsx
index c716b78cef8a829ee9a340f74c906ac090d274da..54ecec308c8426365f325029e1bca14703e48c35 100644
GIT binary patch
delta 1032
zcmV+j1o!*(KkPrSZ5R&x`(Osj0{{RC4FCWb0F!?o6_bz{2Y+32>NXID@B1q}zUZ8D
z5sW{8K*47UB!L`~Ig>eUuN7Mc53=P-GLV1Y^(VHZCYkmIg#7Hgt6gopnSZ+^#5iHb
zW122ZdoVN&oCY+E)BVEy<LCX&t!Z$9(hw1v;)VH!x%tiiWqzjY$PX9`BMD~PeM%X6
zCGh-WdnhmsP=8JN!aN9(%`A%t2b>^2pczi#NkmzK1pH)si)Rd@uvAKj<qU^oD?xEu
zE6kGMGa?CM$2_|UXp$ijzs4jMZ>3f%b6S`=OJ}vlO%ex;avF)kW|p8}c1lPKUlgA$
zKLFmMQ4|LlyapD&1h@?Qwih=0Ow^Ukng)4-Q&F9rVSfTApeaAZ8E@1er=N>RN#@j=
z_Tnn5^FOrO(t^_Hzv<XR%eMPLC7)Ajb6sB%e_pEoVE&xug2XBQ!3>@!a2wv1n9%dW
zgxg$iyu|y1C^r1L)zYwTCCbI0F+TIo+9<C1E2YQc$2P3&IVLzLiezM{XbC~H9gc))
zAlN<O6@MmVVLmzF`frA#a#=WPtQx0<WOv>8y)Ul_9OV^pyrSf<I24D434Ivi2<1dv
z_iS(Ax$XW7J#TPzOnYP+7IbMq3CO~yk;Ks65L1FK<@dQ(xE<J@X#_bJG-*@|+pCdV
z8@X4b$@oL7No_T0tsHmYOy4)M?b@nX)MnoFV}G;eT=w-~j`we7R+W@8*J~sYq>0h9
z!HVY~S}cACl9xQ>lEd!FAI_~)VOtZ+if}rF-6vM6hSMk3D&h8tJC*SI#Jx(4`^1Av
zO!~w|B}P&pTMZ&b@~A;ZedN1}*izPZ8bnIllg5#B=4TCZJ+uYo_M4hJZOxt1#_i@>
zE`Pd;j3s1MAzn9rDcx&FJ>soYcMUR?3a=uL6w8AKk<z`<AX2)w8brDsj}1~qA%(H4
zo{qYSmBM&xeOOHeHC{*h3c76t-O^^#btFZ)bd|Psr1GpPWZYGeuKL<lgOkgnBCeE|
zjRukO^60*o*zXzvsdzj0<J_w%p47L`8h=Nwz8GFx3{NeF)TK*Lm6bfNJf#?}q_S33
z<YL@u97$Eb*C0|;ZZwXhbU%9UHiE{76zQ`Dkuz;|-&_Gr!?>6#5UJ({0fT!pcs!J?
z5xwLD8{#d4Q6;4?J){DrC%z;oJ;I0?UZQHSF)|iY29tAjfMQb33G#P$&tHDNY)_xQ
zJh)%K{<;^x!Ks>O5LKyOzEm}V`11p}WiV_Vd1q~u(G`Cx*(?U%Y#UasFB5KuaJ7Wj
zA-wAK-gOx=bS@IoGNWP?t9N15{ukr_1G8uxK?4c=`(Osj0{{RCld>N@245Ti0001Q
C2<wah

delta 1039
zcmV+q1n~RpKlMMbZ5R&l^+FKS0{{R%4FCWb0F%5Q8h@piOLO8l5XbNPDO^5m%^ZU9
z0|*Q-H9!)`5NawlyK`1-0WM_AD~U(G{kHtVmb6J~_5wow^}k!)>T)ywdP#_N!i>i>
zo!D-tYg;%CX%wfsiT&5l`<q+a;sT`+A~eMl`xSHh>-3NDnX&`lV=SyB9IbXKW$1;#
z^NSmx(0{f-HRTg~FGMzS93Jj*f_R5!IE5!$$`T~tC)+tZV;DubQbHWB+wD6EiqleI
zl!PA<Nf0|6vzw4684~eJOk(kxYt=HRiG5`0sMNSg;*e2Jw?f*C5)_V338~?W=CkHI
zz&muijYAAxLkC|%oQHke3Y&c->Oy8g!()O|QGcABVFD+hDc{E#uhbx?AB#v!=Fl0o
z;>xS@KeX!7f>Q7Iblk4vy6vEnk15r;F0aURoU8s|(=j~?5~uhFv-mNA+weNWgq|lh
z+~#uQIo|Ds+?bA?nuc{PkuUy^@tHT)mb~UKlpf@dRaDq>OmHZRWMxRUgrM0PZ-s3k
z*nd6YIVNOc&s`UM|HJUMSW8!xUFBAaHrJKs`}~r?VO|i&b4q^2k=Rdc=)?$b(UFMj
zo*Q%mzuteQ=Or!<>h^5Qfj$i>0a^I8k{BA?v#kVO^6zu0aNBVM+X|0d(4<n8wpSy+
zH1e-TgZ{f#gVJhHTX}xR8@_EMvzA-QMSp1)4Bt1a&gEVY<^}&{<`hZEbG<+UL7Esn
zTTDI&QMvdgtC#bTOAfoIX?N_Lq-{ye3c_m;Zkw3v8eW@N=!D-U?sOt(6ZbmNZxatX
zF=!J@o#-intPF?}$)f@3wUO^S;wo8N8xSRJPX<TInKuUHdT0mAJ*{f))iw8W8-Kr<
zYqjV)(pQjqfdtL?m2@vW{fM_p-3`c4DZGw&N-PfsL`nD3fGFu+84%@mJXS~%g%ZZP
zc-m_wRte)t_Yo*zYz$%a%q8{flKQ#Lped__KJ&Fc_LO?f3#8vvQSSc2*Mn2*r6azQ
zsHFi>67}f6mFe#W0VR!V|NUa<Du02}$Qy$r-&~BKE=HgiLuuPtpvx+r=YduXUr|};
zDrzzA433nl-y0C6OP2;mO1d9|H#@`NLy2@_K-5e-%~x4S(<qi>1|r2EAz+rTMv;fS
zHMY-3f-Uiy!Ss?+7$;Hz0~MbUlpbK}j4s<^*0C}cQwGCyaR52I9toPR?^-sWem<|B
zK0WxKKmWNCU*J^LGl(iz&)>3!K&In8xMeVZ9e87H6@wCVAsfZuo2{baU9AvLO~Nw~
zvRP}wHxfaE2#SfI8C1m3S*EOJdUARzcVSik^_l()vtJxR0}1f;LJ-pf002IdsUJNC
JXdD0l005U!@v#5^

diff --git a/samples/idaithalam-massapibatch-testing/pom.xml b/samples/idaithalam-massapibatch-testing/pom.xml
index 03815f04..dd9f1ea8 100644
--- a/samples/idaithalam-massapibatch-testing/pom.xml
+++ b/samples/idaithalam-massapibatch-testing/pom.xml
@@ -7,7 +7,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
 		<slf4j.version>1.7.30</slf4j.version>
-		<idaithalam.version>1.2.7</idaithalam.version>
+		<idaithalam.version>1.2.8-SNAPSHOT</idaithalam.version>
     <java.version>1.8</java.version>
 		<testng.ver>7.4.0</testng.ver>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature b/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
index 850fa672..b2716c14 100644
--- a/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
+++ b/samples/idaithalam-openapi-contract/conf/feature/virtualan-contract.0.feature
@@ -1,15 +1,22 @@
 Feature: Sample.yaml - API Contract validation status
     Scenario: Load initial set of data
       Given Provided all the feature level parameters from file
-    @sample
     Scenario: Create a new sample object. - POST api call
       Given a user perform a api action
+      And Create api with given input
+        | filename                   |  Sample.yaml                        |
+        | name                   |  Sample                        |
+        | version                   |  0.0.1                        |
       When a user post application/json in /sample resource on sample
       Then Verify the status code is 201
-    @sample
     Scenario: Sample path - GET api call
       Given a user perform a api action
       And add request with given path params
         | sampleId                   | sampleId                         |
       When a user get application/json in /sample/validate/{sampleId} resource on sample
       Then Verify the status code is 200
+      And Verify-all /sample/validate/{sampleId} api includes following in the response
+        | sample1                 |  one                          |
+        | id                 |  i~1                          |
+        | sample3                 |  three                          |
+        | sample2                 |  two                          |
diff --git a/samples/idaithalam-openapi-contract/conf/virtualan-provider.json b/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
index c9f1ef61..425a51d3 100644
--- a/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
+++ b/samples/idaithalam-openapi-contract/conf/virtualan-provider.json
@@ -1 +1 @@
-[{"input":"","method":"POST","scenario":"Create a new sample object.","resource":"sample","availableParams":[],"type":"Response","url":"/sample","httpStatusCode":"201"},{"output":"","method":"GET","scenario":"Sample path","resource":"sample","availableParams":[{"parameterType":"PATH_PARAM","value":"sampleId","key":"sampleId"}],"type":"Response","url":"/sample/validate/{sampleId}","httpStatusCode":"200"}]
\ No newline at end of file
+[{"input":"{\r\n  \"filename\" : \"Sample.yaml\",\r\n  \"name\" : \"Sample\",\r\n  \"version\" : \"0.0.1\"\r\n}","method":"POST","scenario":"Create a new sample object.","resource":"sample","availableParams":[],"type":"Response","url":"/sample","httpStatusCode":"201"},{"output":"{\r\n  \"sample1\" : \"one\",\r\n  \"id\" : 1,\r\n  \"sample3\" : \"three\",\r\n  \"sample2\" : \"two\"\r\n}","method":"GET","scenario":"Sample path","resource":"sample","availableParams":[{"parameterType":"PATH_PARAM","value":"sampleId","key":"sampleId"}],"type":"Response","url":"/sample/validate/{sampleId}","httpStatusCode":"200"}]
\ No newline at end of file
diff --git a/samples/idaithalam-openapi-contract/pom.xml b/samples/idaithalam-openapi-contract/pom.xml
index 33ce62cb..2b890ca4 100644
--- a/samples/idaithalam-openapi-contract/pom.xml
+++ b/samples/idaithalam-openapi-contract/pom.xml
@@ -8,7 +8,7 @@
 	<name>idaithalam-opeapi-contract</name>
 	<version>1.0.0-SNAPSHOT</version>
 	<properties>
-		<idaithalam.version>1.1.5</idaithalam.version>
+		<idaithalam.version>1.1.0</idaithalam.version>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/samples/idaithalam-postmancoll-apitesting/pom.xml b/samples/idaithalam-postmancoll-apitesting/pom.xml
index 9b0dc368..aaefd00f 100644
--- a/samples/idaithalam-postmancoll-apitesting/pom.xml
+++ b/samples/idaithalam-postmancoll-apitesting/pom.xml
@@ -6,7 +6,7 @@
 	<name>idaithalam-postmancoll-apitesting</name>
 	<version>1.0.1-SNAPSHOT</version>
 	<properties>
-	  <idaithalam.version>1.2.7</idaithalam.version>
+	  <idaithalam.version>1.2.8-SNAPSHOT</idaithalam.version>
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>

From 9a47f5bb7c66da6dea3559d88314cdeb53b591c2 Mon Sep 17 00:00:00 2001
From: Elan Thangamani <elans3.java@gmail.com>
Date: Sat, 24 Apr 2021 17:21:33 -0500
Subject: [PATCH 29/29] Add useful information for the error message

---
 .../generator/ExcelToCollectionGenerator.java     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
index dca98690..56c40327 100644
--- a/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
+++ b/modules/idaithalam/src/main/java/io/virtualan/idaithalam/core/generator/ExcelToCollectionGenerator.java
@@ -94,17 +94,22 @@ private static Map<Integer, String> getHeader(Row nextRow) {
   }
 
   private static boolean isEmptyRow(Row row) {
-    boolean isEmptyRow = true;
+    if (row == null) {
+      return true;
+    }
+    if (row.getLastCellNum() <= 0) {
+      return true;
+    }
     for (int cellNum = row.getFirstCellNum(); cellNum < row.getLastCellNum(); cellNum++) {
       Cell cell = row.getCell(cellNum);
-      if (cell != null && cell.getCellType() != CellType.BLANK && StringUtils
-          .isNotBlank(cell.toString())) {
-        isEmptyRow = false;
+      if (cell != null && cell.getCellTypeEnum() != CellType.BLANK && StringUtils.isNotBlank(cell.toString())) {
+        return false;
       }
     }
-    return isEmptyRow;
+    return true;
   }
 
+
   private static Map<String, String> getRow(Row nextRow, Map<Integer, String> headers) {
     Map<String, String> dataMap = new HashMap<>();
     if (nextRow != null && !isEmptyRow(nextRow)) {