diff --git a/pom.xml b/pom.xml
index ac23039d..7a485d02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
Collection of non-Vaadin, non-Liferay utilities.
4.0.0
Core Utilities Library
- 1.11.0
+ 1.12.0-SNAPSHOT
https://github.com/qbicsoftware/core-utils-lib
jar
@@ -127,7 +127,7 @@
data-model-lib
life.qbic
- 2.18.0
+ 2.19.0
org.mockito
diff --git a/src/main/groovy/life/qbic/utils/MaxQuantParser.groovy b/src/main/groovy/life/qbic/utils/MaxQuantParser.groovy
index 084d9f0a..aed1088f 100644
--- a/src/main/groovy/life/qbic/utils/MaxQuantParser.groovy
+++ b/src/main/groovy/life/qbic/utils/MaxQuantParser.groovy
@@ -118,16 +118,14 @@ class MaxQuantParser implements DatasetParser {
rootChildren.each { currentChild ->
if (currentChild.containsKey("children")) {
//folder
- parseCombinedInformation(map)
+ parseTxtFolder(map)
} else if (currentChild.containsKey("fileType")) {
//file
- switch (currentChild.get("name")) {
- case "mqpar.xml":
- insertAsProperty(map, currentChild, RequiredRootFileKeys.RUN_PARAMETERS.getKeyName())
- break
- case "sample_ids.txt":
- insertAsProperty(map, currentChild, RequiredRootFileKeys.SAMPLE_ID.getKeyName())
- break
+ String name = currentChild.get("name")
+ if(name.equals("mqpar.xml")) {
+ insertAsProperty(map, currentChild, RequiredRootFileKeys.RUN_PARAMETERS.getKeyName())
+ } else if(name.endsWith("sample_ids.txt")) {
+ insertAsProperty(map, currentChild, RequiredRootFileKeys.SAMPLE_ID.getKeyName())
}
}
}
@@ -137,26 +135,17 @@ class MaxQuantParser implements DatasetParser {
* Method which adapts the parsed content of the txt directory in place to the expected file structure.
* @see {valid datastructure example}
*
- * After parsing the files of the txt directory are contained in the children property of the combined directory, which itself is contained in the root directory.
+ * After parsing, the files of the txt directory are contained in the children property of the root directory.
* The underlying datastructure however expects a mapping of the expected files as a Map entry in the root directory.
* @param maxQuantInformation a nested map representing the parsed fileTree structure
* @since 1.9.0
*/
- private static void parseCombinedInformation(Map maxQuantInformation) {
+ private static void parseTxtFolder(Map maxQuantInformation) {
List