From feabb2d4f19a8d0a9f872ac89f95eb8dc32514f9 Mon Sep 17 00:00:00 2001 From: jamal-khey Date: Thu, 15 Feb 2024 12:09:17 +0100 Subject: [PATCH] move CaseInfo to dto package --- .../org/gridsuite/explore/server/ExploreController.java | 2 +- .../java/org/gridsuite/explore/server/dto/CaseInfo.java | 7 +++++++ .../gridsuite/explore/server/services/ExploreService.java | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/gridsuite/explore/server/dto/CaseInfo.java diff --git a/src/main/java/org/gridsuite/explore/server/ExploreController.java b/src/main/java/org/gridsuite/explore/server/ExploreController.java index eb6681b3..934b13de 100644 --- a/src/main/java/org/gridsuite/explore/server/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/ExploreController.java @@ -56,7 +56,7 @@ public ResponseEntity createStudy(@PathVariable("studyName") String studyN @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid, @RequestHeader("userId") String userId, @RequestBody(required = false) Map importParams) { - ExploreService.CaseInfo caseInfo = new ExploreService.CaseInfo(caseUuid, caseFormat); + CaseInfo caseInfo = new CaseInfo(caseUuid, caseFormat); exploreService.createStudy(studyName, caseInfo, description, userId, parentDirectoryUuid, importParams, duplicateCase); return ResponseEntity.ok().build(); } diff --git a/src/main/java/org/gridsuite/explore/server/dto/CaseInfo.java b/src/main/java/org/gridsuite/explore/server/dto/CaseInfo.java new file mode 100644 index 00000000..c07e916e --- /dev/null +++ b/src/main/java/org/gridsuite/explore/server/dto/CaseInfo.java @@ -0,0 +1,7 @@ +package org.gridsuite.explore.server.dto; + +import java.util.UUID; + +public record CaseInfo(UUID caseUuid, String caseFormat) { + +} diff --git a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java index 2da31b5c..9ba9c7d7 100644 --- a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java +++ b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java @@ -60,10 +60,6 @@ public ExploreService( this.parametersService = parametersService; } - public record CaseInfo(UUID caseUuid, String caseFormat) { - - } - public void createStudy(String studyName, CaseInfo caseInfo, String description, String userId, UUID parentDirectoryUuid, Map importParams, Boolean duplicateCase) { ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), studyName, STUDY, null, userId, 0L, description); studyService.insertStudyWithExistingCaseFile(elementAttributes.getElementUuid(), userId, caseInfo.caseUuid(), caseInfo.caseFormat(), importParams, duplicateCase);