-
Notifications
You must be signed in to change notification settings - Fork 2
export network #1001
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ghazwarhili
wants to merge
3
commits into
main
Choose a base branch
from
import-export-study
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
export network #1001
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
src/main/java/org/gridsuite/study/server/dto/RootNetworkExportInfos.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /** | ||
| * Copyright (c) 2026, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
| package org.gridsuite.study.server.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import lombok.*; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * @author Rehili Ghazwa <ghazwa.rehili at rte-france.com> | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| @Builder | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public class RootNetworkExportInfos { | ||
| private UUID id; | ||
| private String name; | ||
| private String description; | ||
| private String tag; | ||
| private String caseName; | ||
| private String caseFormat; | ||
| private Map<String, String> importParameters; | ||
| } |
14 changes: 14 additions & 0 deletions
14
src/main/java/org/gridsuite/study/server/dto/StudyExportInfos.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.gridsuite.study.server.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
|
|
||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public record StudyExportInfos(UUID studyUuid, | ||
| List<RootNetworkExportInfos> rootNetworks, | ||
| StudyTreeNodeExportInfos rootNode) { | ||
| } |
20 changes: 20 additions & 0 deletions
20
src/main/java/org/gridsuite/study/server/dto/StudyImportInfos.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package org.gridsuite.study.server.dto; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import lombok.*; | ||
|
|
||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| @Builder | ||
| public class StudyImportInfos { | ||
| private String exportVersion; | ||
| private UUID studyUuid; | ||
| private String studyName; | ||
| private List<RootNetworkExportInfos> rootNetworks; | ||
| private JsonNode rootNode; | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/main/java/org/gridsuite/study/server/dto/StudyTreeNodeExportInfos.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /** | ||
| * Copyright (c) 2026, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
| package org.gridsuite.study.server.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import org.gridsuite.study.server.networkmodificationtree.entities.NetworkModificationNodeType; | ||
| import org.gridsuite.study.server.networkmodificationtree.entities.NodeType; | ||
|
|
||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * @author Rehili Ghazwa <ghazwa.rehili at rte-france.com> | ||
| */ | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public record StudyTreeNodeExportInfos(UUID uuid, | ||
| String name, | ||
| NodeType type, | ||
| NetworkModificationNodeType nodeType, | ||
| @JsonInclude(JsonInclude.Include.NON_EMPTY) Object modifications, | ||
| List<StudyTreeNodeExportInfos> nodes) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle null HTTP bodies for batch export responses.
Line 106 and Line 477 can return
nullwhen the remote service responds without a body, which can break callers expecting a map. ReturnMap.of()instead.💡 Proposed fix
public Map<UUID, Object> getModificationsInfosToExport(List<UUID> groupUuids) { Objects.requireNonNull(groupUuids); if (groupUuids.isEmpty()) { return Map.of(); @@ - return restTemplate.exchange(getNetworkModificationServerURI(false) + path, HttpMethod.POST, httpEntity, - new ParameterizedTypeReference<Map<UUID, Object>>() { }).getBody(); + Map<UUID, Object> body = restTemplate.exchange( + getNetworkModificationServerURI(false) + path, + HttpMethod.POST, + httpEntity, + new ParameterizedTypeReference<Map<UUID, Object>>() { } + ).getBody(); + return body != null ? body : Map.of(); } @@ public Map<UUID, JsonNode> getModificationsToExportByGroups(List<UUID> groupUuids) { Objects.requireNonNull(groupUuids); if (groupUuids.isEmpty()) { return Map.of(); @@ - return restTemplate.exchange( + Map<UUID, JsonNode> body = restTemplate.exchange( getNetworkModificationServerURI(false) + path, HttpMethod.POST, entity, new ParameterizedTypeReference<Map<UUID, JsonNode>>() { } - ).getBody(); + ).getBody(); + return body != null ? body : Map.of(); }Also applies to: 457-478
🤖 Prompt for AI Agents