Skip to content

Upgrade to powsybl-dependencies v2025.0.0 #731

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
</developers>

<properties>
<gridsuite-dependencies.version>38.0.0</gridsuite-dependencies.version>
<gridsuite-dependencies.version>38.1.0-SNAPSHOT</gridsuite-dependencies.version>
<liquibase-hibernate-package>org.gridsuite.study.server</liquibase-hibernate-package>
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
<apache.httpclient.version>5.3</apache.httpclient.version>
<network-modification.version>0.14.0</network-modification.version>
<network-modification.version>0.15.0-SNAPSHOT</network-modification.version>
<db-util.version>1.0.5</db-util.version>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:study-server</sonar.projectKey>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Copyright (c) 2025, 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/.
* SPDX-License-Identifier: MPL-2.0
*/
package org.gridsuite.study.server.report;

import com.google.auto.service.AutoService;
import com.powsybl.commons.report.ReportResourceBundle;

/**
* @author Charly Boutier {@literal <charly.boutier at rte-france.com>}
*/
@AutoService(ReportResourceBundle.class)
public final class StudyServerReportResourceBundle implements ReportResourceBundle {

public static final String BASE_NAME = "org.gridsuite.study.server.reports";

public String getBaseName() {
return BASE_NAME;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,10 @@ public void createBasicTree(StudyEntity studyEntity) {
.build();

NetworkModificationNode networkModificationNode = createNode(studyEntity, rootNodeEntity.getIdNode(), modificationNode, InsertMode.AFTER, null);
ReportNode reportNode = ReportNode.newRootReportNode().withMessageTemplate(modificationNode.getId().toString(), modificationNode.getId().toString()).build();
ReportNode reportNode = ReportNode.newRootReportNode()
.withAllResourceBundlesFromClasspath()
.withMessageTemplate("study.server.modificationNodeId")
.withUntypedValue("modificationNodeId", modificationNode.getId().toString()).build();
reportService.sendReport(getModificationReportUuid(networkModificationNode.getId(), firstRootNetworkUuid, networkModificationNode.getId()), reportNode);

BuildInfos buildInfos = getBuildInfos(modificationNode.getId(), firstRootNetworkUuid);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
study.server.modificationNodeId = ${modificationNodeId}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Loading