Skip to content

Fix DGS import issue with BOM #3864

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.

Sign up for GitHub

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

Merged
olperr1 merged 4 commits into from
Apr 13, 2026
+10 −5
Merged

Fix DGS import issue with BOM #3864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
077dc10
Fix DGS import issue with BOM
geofjamg Apr 7, 2026
0115efe
Add missing BOM in BOMTest.dgs
rolnico Apr 10, 2026
eb0d524
Merge branch 'main' into dgs_import_bom_issue
olperr1 Apr 10, 2026
375f1e1
Merge branch 'main' into dgs_import_bom_issue
olperr1 Apr 13, 2026
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
8 changes: 3 additions & 5 deletions powerfactory/powerfactory-dgs/src/main/java/com/powsybl/powerfactory/dgs/DgsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@
import com.powsybl.commons.PowsyblException;
import com.powsybl.powerfactory.model.DataAttributeType;
import com.powsybl.powerfactory.model.PowerFactoryException;
import org.apache.commons.io.input.BOMInputStream;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.math3.linear.BlockRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.io.UncheckedIOException;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -243,7 +241,7 @@ private static void readObjectTableRow(String trimmedLine, DgsHandler handler, P
public void read(Reader reader, DgsHandler handler) {
Objects.requireNonNull(reader);
Objects.requireNonNull(handler);
try (BufferedReader bufferedReader = new BufferedReader(reader)) {
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(BOMInputStream.builder().setReader(reader).get()))) {
String line;
ParsingContext context = new ParsingContext();
while ((line = bufferedReader.readLine()) != null) {
Expand Down
5 changes: 5 additions & 0 deletions powerfactory/powerfactory-dgs/src/test/java/com/powsybl/powerfactory/dgs/DgsDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ void missingElementInLineTest() {
assertEquals("Not enough fields in the line: '1;Version'", exception.getMessage());
}

@Test
void bomTest() {
assertDoesNotThrow(() -> loadCase("/BOMTest.dgs"));
}

private boolean test(String dgs, String json) throws IOException {
StudyCase studyCase = loadCase(dgs);
String expectedJson = loadReference(json);
Expand Down
2 changes: 2 additions & 0 deletions powerfactory/powerfactory-dgs/src/test/resources/BOMTest.dgs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
$$General;ID(a:40);Descr(a:40);Val(a:40)
1;Version;5.0
Loading