Merge pull request #31 from crowdin/fix-json-import-options

yevheniyJ · web-flow · commit 315a1b684bbe · 2020-05-07T09:53:05.000+03:00
Fix JSON deserializing for import options
diff --git a/src/main/java/com/crowdin/client/core/http/impl/json/FileImportOptionsDeserializer.java b/src/main/java/com/crowdin/client/core/http/impl/json/FileImportOptionsDeserializer.java
@@ -33,10 +33,10 @@ public ImportOptions deserialize(JsonParser p, DeserializationContext ctxt) thro
                 .collect(Collectors.toList());
         if (fields.contains("firstLineContainsHeader")) {
             return this.objectMapper.readValue(treeNode.toString(), SpreadsheetFileImportOptions.class);
-        } else if (fields.contains("contentSegmentation")) {
-            return this.objectMapper.readValue(treeNode.toString(), OtherFileImportOptions.class);
-        } else {
+        } else if (fields.contains("translateContent")) {
             return this.objectMapper.readValue(treeNode.toString(), XmlFileImportOptions.class);
+        } else {
+            return this.objectMapper.readValue(treeNode.toString(), OtherFileImportOptions.class);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ public ImportOptions deserialize(JsonParser p, DeserializationContext ctxt) thro`
`33`	`33`	`.collect(Collectors.toList());`
`34`	`34`	`if (fields.contains("firstLineContainsHeader")) {`
`35`	`35`	`return this.objectMapper.readValue(treeNode.toString(), SpreadsheetFileImportOptions.class);`
`36`		`- } else if (fields.contains("contentSegmentation")) {`
`37`		`- return this.objectMapper.readValue(treeNode.toString(), OtherFileImportOptions.class);`
`38`		`- } else {`
	`36`	`+ } else if (fields.contains("translateContent")) {`
`39`	`37`	`return this.objectMapper.readValue(treeNode.toString(), XmlFileImportOptions.class);`
	`38`	`+ } else {`
	`39`	`+ return this.objectMapper.readValue(treeNode.toString(), OtherFileImportOptions.class);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`