MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-06-27 12:07:11 +03:00
parent d15e4419bf 01c90ad4d6
commit 82f90bb0b7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java
View File

@ -460,7 +460,10 @@ public class DatasetMigrationService {
} }
case SELECT -> { case SELECT -> {
if(!this.conventionService.isNullOrEmpty(textValue)) { if(!this.conventionService.isNullOrEmpty(textValue)) {
String[] valuesParsed = migrationTools.tryParseJsonAsObjectString(String[].class, textValue); String[] valuesParsed = null;
if (propertyValue instanceof List<?> && ((List<?>)propertyValue).stream().allMatch(x-> x instanceof String)) valuesParsed = ((List<?>)propertyValue).stream().map(x-> (String)x).toList().toArray(String[]::new);
if (valuesParsed == null && propertyValue instanceof String[]) valuesParsed = (String[])propertyValue;
if (valuesParsed == null) valuesParsed = migrationTools.tryParseJsonAsObjectString(String[].class, textValue);
fieldEntity.setTextListValue(valuesParsed == null ? List.of(textValue) : Arrays.stream(valuesParsed).toList()); fieldEntity.setTextListValue(valuesParsed == null ? List.of(textValue) : Arrays.stream(valuesParsed).toList());
} }
} }