From 3b59c7ff713e659003bfdd2df93d6ea721cba31f Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Tue, 18 Aug 2026 16:58:25 +0200 Subject: [PATCH] import study pamaters --- .../gridsuite/explore/server/dto/TreeExportInfos.java | 4 +++- .../explore/server/services/StudyImportService.java | 2 +- .../explore/server/StudyImportExportTest.java | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gridsuite/explore/server/dto/TreeExportInfos.java b/src/main/java/org/gridsuite/explore/server/dto/TreeExportInfos.java index 68325cc1..16481a29 100644 --- a/src/main/java/org/gridsuite/explore/server/dto/TreeExportInfos.java +++ b/src/main/java/org/gridsuite/explore/server/dto/TreeExportInfos.java @@ -7,6 +7,7 @@ package org.gridsuite.explore.server.dto; import java.util.List; +import java.util.Map; import java.util.UUID; /** @@ -15,6 +16,7 @@ public record TreeExportInfos( UUID studyUuid, List rootNetworks, - NodeTreeExportInfos nodeTree + NodeTreeExportInfos nodeTree, + Map computationParameters ) { } diff --git a/src/main/java/org/gridsuite/explore/server/services/StudyImportService.java b/src/main/java/org/gridsuite/explore/server/services/StudyImportService.java index a5d2f151..4f172de7 100644 --- a/src/main/java/org/gridsuite/explore/server/services/StudyImportService.java +++ b/src/main/java/org/gridsuite/explore/server/services/StudyImportService.java @@ -215,7 +215,7 @@ private TreeExportInfos updateCaseUuidsAndStudyUuidInExportInfos(TreeExportInfos rootNetwork.caseInfos().caseName(), rootNetwork.caseInfos().caseFormat()); return new RootNetworkExportInfos(rootNetwork.name(), rootNetwork.tag(), rootNetwork.index(), updatedCaseInfo, rootNetwork.importParameters()); }).toList(); - return new TreeExportInfos(createdStudyUuid, updatedRootNetworks, original.nodeTree()); + return new TreeExportInfos(createdStudyUuid, updatedRootNetworks, original.nodeTree(), original.computationParameters()); } /** diff --git a/src/test/java/org/gridsuite/explore/server/StudyImportExportTest.java b/src/test/java/org/gridsuite/explore/server/StudyImportExportTest.java index ad10c607..1efa57b8 100644 --- a/src/test/java/org/gridsuite/explore/server/StudyImportExportTest.java +++ b/src/test/java/org/gridsuite/explore/server/StudyImportExportTest.java @@ -315,7 +315,8 @@ private byte[] createArchiveWithEmptyRootNetworks() throws IOException { TreeExportInfos exportInfos = new TreeExportInfos( STUDY_UUID, Collections.emptyList(), - createNodeTree() + createNodeTree(), + Collections.emptyMap() ); addJsonEntry(zos, exportInfos); } @@ -344,7 +345,7 @@ private byte[] createArchiveWithOneMissingCaseFileAmongTwoRoots() throws IOExcep CaseInfos missingCaseInfo = new CaseInfos(missingCaseUuid, UUID.randomUUID(), "case-missing.xiidm", "XIIDM"); RootNetworkExportInfos missingRootNetwork = new RootNetworkExportInfos("Network 2", "2", 1, missingCaseInfo, Collections.emptyMap()); - TreeExportInfos exportInfos = new TreeExportInfos(STUDY_UUID, List.of(validRootNetwork, missingRootNetwork), createNodeTree()); + TreeExportInfos exportInfos = new TreeExportInfos(STUDY_UUID, List.of(validRootNetwork, missingRootNetwork), createNodeTree(), Collections.emptyMap()); addJsonEntry(zos, exportInfos); // only the first root network's case file is present in the archive @@ -379,7 +380,8 @@ private TreeExportInfos createStudyExportInfos() { return new TreeExportInfos( STUDY_UUID, Collections.singletonList(rootNetwork), - createNodeTree() + createNodeTree(), + Collections.emptyMap() ); } @@ -397,7 +399,7 @@ private TreeExportInfos createStudyExportInfosWithMultipleRoots() { ); rootNetworks.add(rootNetwork); } - return new TreeExportInfos(STUDY_UUID, rootNetworks, createNodeTree()); + return new TreeExportInfos(STUDY_UUID, rootNetworks, createNodeTree(), Collections.emptyMap()); } private NodeTreeExportInfos createNodeTree() {