Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

Commit

Permalink
Adapt GSE to use powsybl-afs instead of all modules in powsybl-core (#…
Browse files Browse the repository at this point in the history 
…261)

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>
  • Loading branch information
Mathieu BAGUE authored Dec 17, 2019
1 parent 3fbde1d commit 50e32fc
Show file tree
Hide file tree
Showing 20 changed files with 62 additions and 48 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ jobs:
run: mvn --batch-mode -DskipTests install
working-directory: ../powsybl-core

- name: Checkout powsybl-afs
uses: actions/checkout@v1
with:
repository: powsybl/powsybl-afs
ref: refs/heads/master

- name: Build powsybl-afs with Maven
run: mvn --batch-mode -DskipTests install
working-directory: ../powsybl-afs

- name: Checkout sources
uses: actions/checkout@v1

Expand Down
8 changes: 4 additions & 4 deletions gse-afs-ext-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-ext-base</artifactId>
<artifactId>powsybl-afs-action-dsl</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm-xml-converter</artifactId>
<artifactId>powsybl-afs-contingency</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action-dsl-afs</artifactId>
<artifactId>powsybl-afs-ext-base</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-contingency-afs</artifactId>
<artifactId>powsybl-iidm-xml-converter</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion gse-afs-ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ActionScriptCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*/
package com.powsybl.gse.afs.ext.base;

import com.powsybl.action.dsl.afs.ActionScriptBuilder;
import com.powsybl.afs.ProjectFolder;
import com.powsybl.afs.action.dsl.ActionScriptBuilder;

import java.util.ResourceBundle;

Expand Down
2 changes: 1 addition & 1 deletion ...fs-ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ActionScriptKeywordsExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.powsybl.action.dsl.afs.ActionScript;
import com.powsybl.afs.action.dsl.ActionScript;
import com.powsybl.gse.spi.AutoCompletionWordsProvider;
import javafx.util.Pair;

Expand Down
2 changes: 1 addition & 1 deletion gse-afs-ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ContingencyStoreCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.powsybl.gse.afs.ext.base;

import com.powsybl.afs.ProjectFolder;
import com.powsybl.contingency.afs.ContingencyStoreBuilder;
import com.powsybl.afs.contingency.ContingencyStoreBuilder;

import java.util.ResourceBundle;

Expand Down
2 changes: 1 addition & 1 deletion ...ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ContingencyStoreCreatorExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import com.google.auto.service.AutoService;
import com.powsybl.afs.ProjectFolder;
import com.powsybl.contingency.afs.ContingencyStore;
import com.powsybl.afs.contingency.ContingencyStore;
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileCreator;
import com.powsybl.gse.spi.ProjectFileCreatorExtension;
Expand Down
2 changes: 1 addition & 1 deletion gse-afs-ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ContingencyStoreEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.powsybl.gse.afs.ext.base;

import com.powsybl.contingency.*;
import com.powsybl.contingency.afs.ContingencyStore;
import com.powsybl.afs.contingency.ContingencyStore;
import com.powsybl.gse.spi.ProjectFileViewer;
import com.powsybl.gse.spi.Savable;
import com.powsybl.gse.util.EquipmentInfo;
Expand Down
2 changes: 1 addition & 1 deletion ...-ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ContingencyStoreEditorExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.powsybl.gse.afs.ext.base;

import com.google.auto.service.AutoService;
import com.powsybl.contingency.afs.ContingencyStore;
import com.powsybl.afs.contingency.ContingencyStore;
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileViewer;
import com.powsybl.gse.spi.ProjectFileViewerExtension;
Expand Down
6 changes: 3 additions & 3 deletions gse-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,13 @@
<!-- Security analysis -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-gse-security-analysis</artifactId>
<version>${project.version}</version>
<artifactId>powsybl-afs-security-analysis-local</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-security-analysis-afs-local</artifactId>
<artifactId>powsybl-gse-security-analysis</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions gse-security-analysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action-dsl-afs</artifactId>
<artifactId>powsybl-afs-action-dsl</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-security-analysis-afs</artifactId>
<artifactId>powsybl-afs-security-analysis</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion gse-security-analysis/src/main/java/com/powsybl/gse/security/LimitViolationsFilterPane.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Sets;
import com.powsybl.afs.security.SubjectInfoExtension;
import com.powsybl.iidm.network.Country;
import com.powsybl.security.LimitViolation;
import com.powsybl.security.LimitViolationType;
import com.powsybl.security.afs.SubjectInfoExtension;
import javafx.beans.binding.Bindings;
import javafx.collections.ListChangeListener;
import javafx.geometry.Insets;
Expand Down
2 changes: 1 addition & 1 deletion ...alysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisExecutionTaskExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
package com.powsybl.gse.security;

import com.google.auto.service.AutoService;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import com.powsybl.gse.spi.ExecutionTaskConfigurator;
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileExecutionTaskExtension;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import javafx.scene.Scene;

import java.util.ResourceBundle;
Expand Down
4 changes: 2 additions & 2 deletions ...-analysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisNodeGraphicProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
package com.powsybl.gse.security;

import com.google.auto.service.AutoService;
import com.powsybl.action.dsl.afs.ActionScript;
import com.powsybl.afs.action.dsl.ActionScript;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import com.powsybl.contingency.ContingenciesProvider;
import com.powsybl.gse.spi.NodeGraphicProvider;
import com.powsybl.gse.util.Glyph;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import javafx.scene.Node;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ecurity-analysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisResultViewer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.powsybl.gse.util.GseUtil;
import com.powsybl.security.LimitViolation;
import com.powsybl.security.SecurityAnalysisResult;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import javafx.collections.ListChangeListener;
import javafx.concurrent.Service;
import javafx.concurrent.Task;
Expand Down
2 changes: 1 addition & 1 deletion ...nalysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisResultViewerExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileViewerExtension;
import com.powsybl.gse.util.Glyph;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import javafx.scene.Node;
import javafx.scene.Scene;

Expand Down
2 changes: 1 addition & 1 deletion ...curity-analysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisRunnerCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectCreationTask;
import com.powsybl.gse.spi.ProjectFileCreator;
import com.powsybl.security.afs.SecurityAnalysisRunnerBuilder;
import com.powsybl.afs.security.SecurityAnalysisRunnerBuilder;
import javafx.scene.Scene;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...alysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisRunnerCreatorExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.powsybl.afs.ProjectFolder;
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileCreatorExtension;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.input.KeyCode;
Expand Down
2 changes: 1 addition & 1 deletion ...ecurity-analysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisRunnerEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileEditor;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import javafx.scene.Scene;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...nalysis/src/main/java/com/powsybl/gse/security/SecurityAnalysisRunnerEditorExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.powsybl.gse.spi.GseContext;
import com.powsybl.gse.spi.ProjectFileEditor;
import com.powsybl.gse.spi.ProjectFileEditorExtension;
import com.powsybl.security.afs.SecurityAnalysisRunner;
import com.powsybl.afs.security.SecurityAnalysisRunner;
import javafx.scene.Scene;

import java.util.ResourceBundle;
Expand Down
50 changes: 27 additions & 23 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<slf4j.version>1.7.22</slf4j.version>
<tiwulfx.version>2.0</tiwulfx.version>

<powsyblafs.version>3.1.0-SNAPSHOT</powsyblafs.version>
<powsyblcore.version>3.1.0-SNAPSHOT</powsyblcore.version>

</properties>
Expand Down Expand Up @@ -429,50 +430,53 @@
<version>${slf4j.version}</version>
</dependency>

<!-- powsybl-core dependencies -->
<!-- powsybl-afs dependencies -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action-dsl</artifactId>
<version>${powsyblcore.version}</version>
<artifactId>powsybl-afs-core</artifactId>
<version>${powsyblafs.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-core</artifactId>
<version>${powsyblcore.version}</version>
<artifactId>powsybl-afs-ext-base</artifactId>
<version>${powsyblafs.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-ext-base</artifactId>
<version>${powsyblcore.version}</version>
<artifactId>powsybl-afs-action-dsl</artifactId>
<version>${powsyblafs.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action-dsl-afs</artifactId>
<version>${powsyblcore.version}</version>
<artifactId>powsybl-afs-contingency</artifactId>
<version>${powsyblafs.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-contingency-afs</artifactId>
<version>${powsyblcore.version}</version>
<artifactId>powsybl-afs-security-analysis</artifactId>
<version>${powsyblafs.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm-api</artifactId>
<version>${powsyblcore.version}</version>
<artifactId>powsybl-afs-ws-client-utils</artifactId>
<version>${powsyblafs.version}</version>
</dependency>


<!-- powsybl-core dependencies -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm-xml-converter</artifactId>
<artifactId>powsybl-action-dsl</artifactId>
<version>${powsyblcore.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-security-analysis-afs</artifactId>
<artifactId>powsybl-iidm-api</artifactId>
<version>${powsyblcore.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-ws-client-utils</artifactId>
<artifactId>powsybl-iidm-xml-converter</artifactId>
<version>${powsyblcore.version}</version>
</dependency>

Expand All @@ -486,15 +490,20 @@
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-local</artifactId>
<version>${powsyblcore.version}</version>
<version>${powsyblafs.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-mapdb</artifactId>
<version>${powsyblcore.version}</version>
<version>${powsyblafs.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-afs-security-analysis-local</artifactId>
<version>${powsyblafs.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cim1-converter</artifactId>
Expand All @@ -513,11 +522,6 @@
<version>${powsyblcore.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-security-analysis-afs-local</artifactId>
<version>${powsyblcore.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-ucte-converter</artifactId>
Expand Down

0 comments on commit 50e32fc

Please sign in to comment.