update deps and refactoring

pom.xml

@@ -35,15 +35,15 @@
     <!--Dependencies versions-->
     <!--Common-->
     <mongo.java.driver.version>3.2.2</mongo.java.driver.version>
-    <commons.io.version>2.5</commons.io.version>
+    <commons.io.version>2.7</commons.io.version>
     <junit.version>4.13.1</junit.version>
-    <slf4j.version>1.7.5</slf4j.version>
+    <slf4j.version>2.0.7</slf4j.version>
     <!--excel-provider-->
-    <apache.poi-ooxml.version>3.17</apache.poi-ooxml.version>
+    <apache.poi-ooxml.version>5.2.3</apache.poi-ooxml.version>
     <!--mongo-provider-->
     <fakemongo.fongo.version>2.1.1</fakemongo.fongo.version>
     <!--properties-provider-->
-    <java.properties.to.json.version>3.0</java.properties.to.json.version>
+    <java.properties.to.json.version>5.3.0</java.properties.to.json.version>
     <!--Plugins versions-->
     <maven.compilier.plugin.version>3.3</maven.compilier.plugin.version>
     <maven.jar.plugin.version>2.4</maven.jar.plugin.version>

providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/providers/excel/ExcelDataProvider.java

@@ -273,13 +273,13 @@ private Map<String, BasicDBObject> getObjectMappedToName(XSSFRow row) {
      */
     private String getCellValue(Cell cell) {
         //noinspection deprecation
-        if (cell.getCellTypeEnum() == CellType.FORMULA) {
+        if (cell.getCellType() == CellType.FORMULA) {
             String value = "";
             try {
                 value = cell.getRichStringCellValue().getString();
             } catch (Exception e) {
                 LOG.debug("Failed to get raw cell value, now trying to get typified", e);
-                switch (evaluator.evaluateFormulaCellEnum(cell)) {
+                switch (evaluator.evaluateFormulaCell(cell)) {
                     case BOOLEAN:
                         value = String.valueOf(cell.getBooleanCellValue());
                         break;

providers/mongo-provider/pom.xml

@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.25</version>
+      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

providers/properties-provider/pom.xml

@@ -34,11 +34,21 @@
       <groupId>pl.jalokim.propertiestojson</groupId>
       <artifactId>java-properties-to-json</artifactId>
       <version>${java.properties.to.json.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>lombok</artifactId>
+          <groupId>org.projectlombok</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-io</artifactId>
+          <groupId>commons-io</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.2</version>
+      <version>1.18.26</version>
     </dependency>
   </dependencies>
 

providers/properties-provider/src/main/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataProvider.java

@@ -7,7 +7,16 @@
 import pl.jalokim.propertiestojson.resolvers.primitives.ObjectFromTextJsonTypeResolver;
 import pl.jalokim.propertiestojson.resolvers.primitives.PrimitiveArrayJsonTypeResolver;
 import pl.jalokim.propertiestojson.resolvers.primitives.StringJsonTypeResolver;
+import pl.jalokim.propertiestojson.resolvers.primitives.adapter.PrimitiveJsonTypeResolverToNewApiAdapter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.BooleanToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.ElementsToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.ObjectToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.StringToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.SuperObjectToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.string.TextToElementsResolver;
 import pl.jalokim.propertiestojson.util.PropertiesToJsonConverter;
+import pl.jalokim.propertiestojson.util.PropertiesToJsonConverterBuilder;
+import pl.jalokim.propertiestojson.util.exception.ReadInputException;
 import ru.sbtqa.tag.datajack.TestDataProvider;
 import ru.sbtqa.tag.datajack.exceptions.CollectionNotFoundException;
 import ru.sbtqa.tag.datajack.exceptions.CyclicReferencesException;
@@ -162,15 +171,12 @@ private String readFile(String testDataFolder, String collectionName) throws Col
         String json;
         try {
             File targetFile = new File(testDataFolder + separator + collectionName + "." + this.extension);
-            Properties properties = getProperties(targetFile);
-            json = new PropertiesToJsonConverter(
-                    new PrimitiveArrayJsonTypeResolver(arrayDelimiter),
-                    new ObjectFromTextJsonTypeResolver(),
-                    new BooleanJsonTypeResolver(),
-                    new StringJsonTypeResolver()
-            ).parseToJson(properties);
-
-        } catch (DataException ex) {
+            json = new PropertiesToJsonConverterBuilder()
+                    .onlyCustomTextToObjectResolvers(new TextToElementsResolver(true, arrayDelimiter))
+                    .build()
+                    .convertPropertiesFromFileToJson(targetFile);
+
+        } catch (ReadInputException ex) {
             throw new CollectionNotFoundException(String.format("File %s.%s not found in %s",
                     collectionName, extension, testDataFolder), ex);
         }

providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java

@@ -246,7 +246,7 @@ public void failWithCyclicReference() throws DataException {
         String collectionName = "DataBlocks";
         String cyclicPath = "Common.cyclic";
         TestDataProvider dataProvider = new PropertiesDataProvider(this.propertiesDataPath, collectionName);
-        String cyclicObject = format("{ \"comment\" : \"Cyclic\", \"$ref\" : \"%s:Common.cyclic\" }", collectionName);
+        String cyclicObject = format("{ \"$ref\" : \"%s:Common.cyclic\", \"comment\" : \"Cyclic\" }", collectionName);
         expectDataExceptions
                 .expect(CyclicReferencesException.class);
         expectDataExceptions.expectMessage(format("Cyclic references in database:\n%s", cyclicObject));
@@ -403,7 +403,7 @@ public void getStringValuesTest() throws DataException {
     public void getJsonTest() throws DataException {
         TestDataProvider testDataProvider = new PropertiesDataProvider(propertiesDataPath, "DataBlocks");
         String stringJson = testDataProvider.get("Params Group 1").getValue();
-        String expectedJson = "{ \"password\" : 123 , \"login\" : 123}";
+        String expectedJson = "{ \"login\" : 123 , \"password\" : 123}";
         Assert.assertEquals(expectedJson, stringJson);
     }