Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import com.powsybl.contingency.json.ContingencyJsonModule;
import com.powsybl.loadflow.json.LoadFlowParametersJsonModule;
import com.powsybl.loadflow.json.LoadFlowResultJsonModule;
import com.powsybl.sensitivity.json.SensitivityJsonModule;
import com.powsybl.security.json.SecurityAnalysisJsonModule;
import com.powsybl.sensitivity.json.SensitivityJsonModule;
import com.powsybl.shortcircuit.json.ShortCircuitAnalysisJsonModule;
import com.powsybl.timeseries.json.TimeSeriesJsonModule;
import org.springframework.boot.web.client.RestTemplateBuilder;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@
import org.apache.http.HttpHost;
import org.elasticsearch.client.RestClient;
import org.gridsuite.study.server.StudyApi;
import org.gridsuite.study.server.dto.ComputationType;
import org.gridsuite.study.server.dto.supervision.SupervisionStudyInfos;
import org.gridsuite.study.server.elasticsearch.EquipmentInfosService;
import org.gridsuite.study.server.service.RootNetworkService;
import org.gridsuite.study.server.service.StudyService;
import org.gridsuite.study.server.service.SupervisionService;

import java.util.List;
import java.util.UUID;

import org.gridsuite.study.server.dto.ComputationType;
import org.gridsuite.study.server.elasticsearch.EquipmentInfosService;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.UUID;

/**
* @author Hugo Marcellin <hugo.marcelin at rte-france.com>
Expand All @@ -45,7 +43,8 @@ public class SupervisionController {

private final RestClient restClient;

public SupervisionController(SupervisionService supervisionService, StudyService studyService, RootNetworkService rootNetworkService, EquipmentInfosService equipmentInfosService, RestClient restClient) {
public SupervisionController(SupervisionService supervisionService, StudyService studyService, RootNetworkService rootNetworkService, EquipmentInfosService equipmentInfosService, RestClient
restClient) {
this.supervisionService = supervisionService;
this.studyService = studyService;
this.rootNetworkService = rootNetworkService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.util.UUID;

/**
* @author Slimane amar <slimane.amar at rte-france.com
* @author Slimane amar <slimane.amar at rte-france.com>
*/
@AllArgsConstructor
@NoArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;

import org.gridsuite.study.server.elasticsearch.ESConfig;
import org.springframework.data.annotation.TypeAlias;
import org.springframework.data.elasticsearch.annotations.Document;


/**
* @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
* @author Slimane Amar <slimane.amar at rte-france.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import lombok.Builder;

/**
* @author Slimane amar <slimane.amar at rte-france.com
* @author Slimane amar <slimane.amar at rte-france.com>
*/
@Schema(description = "Invalidation node parameters")
@Builder
Expand All @@ -20,8 +20,11 @@ public record InvalidateNodeTreeParameters(
ComputationsInvalidationMode computationsInvalidationMode // Only for the first node (root node)
) {
public static InvalidateNodeTreeParameters ALL = new InvalidateNodeTreeParameters(InvalidationMode.ALL, false, ComputationsInvalidationMode.ALL);
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static InvalidateNodeTreeParameters ALL_WITH_BLOCK_NODES = new InvalidateNodeTreeParameters(InvalidationMode.ALL, true, ComputationsInvalidationMode.ALL);
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static InvalidateNodeTreeParameters ONLY_CHILDREN = new InvalidateNodeTreeParameters(InvalidationMode.ONLY_CHILDREN, false, ComputationsInvalidationMode.ALL);
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static InvalidateNodeTreeParameters ONLY_CHILDREN_BUILD_STATUS = new InvalidateNodeTreeParameters(InvalidationMode.ONLY_CHILDREN_BUILD_STATUS, false, ComputationsInvalidationMode.ALL);

public enum InvalidationMode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.Map;

/**
* @author David Braquart <david.braquart@rte-france.com>
* @author David Braquart <david.braquart at rte-france.com>
*/
@Getter
@AllArgsConstructor
Expand All @@ -31,5 +31,4 @@ public class LoadFlowParametersInfos {

private List<LimitReductionsByVoltageLevel> limitReductions;


}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.util.UUID;

/**
* @author David Braquart <david.braquart@rte-france.com>
* @author David Braquart <david.braquart at rte-france.com>
*/
@Getter
@AllArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
*/

import java.util.UUID;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import java.util.UUID;

@Getter
@AllArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;

import org.gridsuite.study.server.dto.VoltageLevelInfos;
import org.gridsuite.study.server.elasticsearch.ESConfig;
import org.springframework.data.annotation.TypeAlias;
Expand All @@ -19,7 +18,6 @@
import org.springframework.data.elasticsearch.annotations.InnerField;
import org.springframework.data.elasticsearch.annotations.MultiField;
import org.springframework.data.elasticsearch.annotations.Setting;

import java.util.Set;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;

import org.gridsuite.study.server.elasticsearch.ESConfig;
import org.springframework.data.annotation.TypeAlias;
import org.springframework.data.elasticsearch.annotations.Document;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.powsybl.iidm.network.IdentifiableType;

import lombok.*;
import lombok.experimental.SuperBuilder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
*/
package org.gridsuite.study.server.dto.impacts;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.*;
import lombok.experimental.SuperBuilder;

import java.util.Set;

import com.fasterxml.jackson.annotation.JsonIgnore;

/**
* This class describes an element type network impact
* This type of network impact only describes an individual impacted item and the list of associated substations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

import java.util.*;
import java.util.stream.Collectors;

import org.gridsuite.study.server.dto.impacts.AbstractBaseImpact;
import org.gridsuite.study.server.dto.impacts.SimpleElementImpact;
import java.util.*;
import java.util.stream.Collectors;

/**
* @author Slimane Amar <slimane.amar at rte-france.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* More detailed version of {@code StudyInfos} used for supervision and admin tools operations.
*
* @author Mathieu Deharbe <mathieu.deharbe@rte-france.com>
* @author Mathieu Deharbe <mathieu.deharbe at rte-france.com>
*/
@SuperBuilder
@NoArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
import co.elastic.clients.elasticsearch._types.query_dsl.*;
import co.elastic.clients.json.JsonData;
import lombok.Getter;

import com.powsybl.iidm.network.VariantManagerConstants;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.gridsuite.study.server.dto.elasticsearch.BasicEquipmentInfos;
Expand All @@ -29,12 +28,10 @@
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;

import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

import static java.util.Map.entry;

/**
Expand Down Expand Up @@ -99,7 +96,8 @@ public enum FieldSelector {
@Getter
private String tombstonedEquipmentsIndexName;

public EquipmentInfosService(EquipmentInfosRepository equipmentInfosRepository, TombstonedEquipmentInfosRepository tombstonedEquipmentInfosRepository, ElasticsearchOperations elasticsearchOperations) {
public EquipmentInfosService(EquipmentInfosRepository equipmentInfosRepository, TombstonedEquipmentInfosRepository tombstonedEquipmentInfosRepository, ElasticsearchOperations
elasticsearchOperations) {
this.equipmentInfosRepository = equipmentInfosRepository;
this.tombstonedEquipmentInfosRepository = tombstonedEquipmentInfosRepository;
this.elasticsearchOperations = elasticsearchOperations;
Expand Down Expand Up @@ -313,7 +311,8 @@ private BoolQuery buildSearchEquipmentsQuery(String userInput, EquipmentInfosSer
TermQuery networkUuidSearchQuery = Queries.termQuery(NETWORK_UUID, networkUuid.toString());
TermsQuery variantIdSearchQuery = variantId.equals(VariantManagerConstants.INITIAL_VARIANT_ID) ?
new TermsQuery.Builder().field(VARIANT_ID).terms(new TermsQueryField.Builder().value(List.of(FieldValue.of(VariantManagerConstants.INITIAL_VARIANT_ID))).build()).build() :
new TermsQuery.Builder().field(VARIANT_ID).terms(new TermsQueryField.Builder().value(List.of(FieldValue.of(VariantManagerConstants.INITIAL_VARIANT_ID), FieldValue.of(variantId))).build()).build();
new TermsQuery.Builder().field(VARIANT_ID).terms(new TermsQueryField.Builder().value(List.of(FieldValue.of(VariantManagerConstants.INITIAL_VARIANT_ID), FieldValue.of(
variantId))).build()).build();

BoolQuery.Builder boolQueryBuilder = new BoolQuery.Builder()
.filter(
Expand Down Expand Up @@ -405,7 +404,8 @@ private List<EquipmentInfos> cleanModifiedAndRemovedEquipments(UUID networkUuid,
return cleanRemovedEquipments(networkUuid, variantId, equipmentInfos);
}

public List<EquipmentInfos> searchEquipments(@lombok.NonNull UUID networkUuid, @lombok.NonNull String variantId, @lombok.NonNull String userInput, @lombok.NonNull FieldSelector fieldSelector, String equipmentType) {
public List<EquipmentInfos> searchEquipments(@lombok.NonNull UUID networkUuid, @lombok.NonNull String variantId, @lombok.NonNull String userInput, @lombok.NonNull FieldSelector fieldSelector,
String equipmentType) {
String effectiveVariantId = variantId.isEmpty() ? VariantManagerConstants.INITIAL_VARIANT_ID : variantId;

BoolQuery query = buildSearchEquipmentsQuery(userInput, fieldSelector, networkUuid,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
package org.gridsuite.study.server.elasticsearch;

import co.elastic.clients.elasticsearch._types.query_dsl.QueryStringQuery;

import org.gridsuite.study.server.dto.CreatedStudyBasicInfos;
import org.springframework.data.elasticsearch.client.elc.NativeQuery;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.SearchHit;
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
import java.util.StringJoiner;

import lombok.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,6 +18,8 @@
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import org.springframework.web.servlet.HandlerExceptionResolver;
import org.springframework.web.servlet.ModelAndView;
import java.util.Map;
import java.util.StringJoiner;

/**
* @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
package org.gridsuite.study.server.networkmodificationtree.dto;

/**
* @author Jacques Borsenberger <jacques.borsenberger at rte-france.com
* @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
*/
public enum InsertMode {
BEFORE,
AFTER,
CHILD;
CHILD
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@
package org.gridsuite.study.server.networkmodificationtree.dto;

import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.EqualsAndHashCode;
import lombok.experimental.SuperBuilder;
import org.gridsuite.study.server.networkmodificationtree.entities.NodeType;

import java.util.UUID;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
*/
package org.gridsuite.study.server.networkmodificationtree.entities;

import lombok.*;
import org.gridsuite.study.server.networkmodificationtree.dto.BuildStatus;
import org.gridsuite.study.server.networkmodificationtree.dto.NodeBuildStatus;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import lombok.*;
import org.gridsuite.study.server.networkmodificationtree.dto.BuildStatus;
import org.gridsuite.study.server.networkmodificationtree.dto.NodeBuildStatus;

/**
* @author Hugo Marcellin <hugo.marcelin at rte-france.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import lombok.experimental.SuperBuilder;
import org.gridsuite.study.server.networkmodificationtree.dto.RootNode;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.*;

/**
* @author Nicolas Noir <nicolas.noir at rte-france.com
* @author Nicolas Noir <nicolas.noir at rte-france.com>
*/
@Service
public class NotificationService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@

package org.gridsuite.study.server.notification.dto;

import java.util.Set;

import com.fasterxml.jackson.annotation.JsonInclude;

import lombok.*;
import java.util.Set;

@AllArgsConstructor
@Setter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import jakarta.persistence.PostLoad;
import jakarta.persistence.PrePersist;
import jakarta.persistence.Transient;

import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.springframework.data.domain.Persistable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
*/
package org.gridsuite.study.server.repository;

import java.util.UUID;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.UUID;

/**
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
*/
package org.gridsuite.study.server.repository;

import java.util.UUID;

import lombok.*;

import jakarta.persistence.*;
import lombok.*;
import java.util.UUID;

/**
* @author Slimane Amar <slimane.amar at rte-france.com>
Expand Down
Loading
Loading