Merge remote-tracking branch 'origin/main' into dbraquart/rename-into…

…-study-config-server # Conflicts: # src/main/java/org/gridsuite/studyconfig/server/controller/NetworkVisualizationsParamController.java # src/main/java/org/gridsuite/studyconfig/server/dto/MapParamInfos.java # src/main/java/org/gridsuite/studyconfig/server/dto/NetworkAreaDiagramParamInfos.java # src/main/java/org/gridsuite/studyconfig/server/dto/NetworkVisualizationParamInfos.java # src/main/java/org/gridsuite/studyconfig/server/dto/SingleLineDiagramParamInfos.java # src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java # src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java # src/main/java/org/gridsuite/studyconfig/server/repositories/NetworkVisualizationParamRepository.java # src/main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java # src/main/resources/config/application.yaml # src/test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java
gridsuite · Dec 19, 2024 · 453d443 · 453d443
2 parents ad2506b + 77373ba
commit 453d443
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 30 deletions.
diff --git a/...ava/org/gridsuite/studyconfig/server/controller/NetworkVisualizationsParamController.java b/...ava/org/gridsuite/studyconfig/server/controller/NetworkVisualizationsParamController.java
@@ -4,7 +4,7 @@
  * 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.studyconfig.server.controller;
+package org.gridsuite.spreadsheetconfig.server.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -14,9 +14,9 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.gridsuite.studyconfig.server.StudyConfigApi;
-import org.gridsuite.studyconfig.server.dto.NetworkVisualizationParamInfos;
-import org.gridsuite.studyconfig.server.service.NetworkVisualizationsParamService;
+import org.gridsuite.spreadsheetconfig.server.SpreadsheetConfigApi;
+import org.gridsuite.spreadsheetconfig.server.dto.NetworkVisualizationParamInfos;
+import org.gridsuite.spreadsheetconfig.server.service.NetworkVisualizationsParamService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -37,7 +37,7 @@
  * @author David BRAQUART <david.braquart at rte-france.com>
  */
 @RestController
-@RequestMapping(value = "/" + StudyConfigApi.API_VERSION + "/network-visualizations-params")
+@RequestMapping(value = "/" + SpreadsheetConfigApi.API_VERSION + "/network-visualizations-params")
 @RequiredArgsConstructor
 @Tag(name = "Network Visualizations Params", description = "Network Visualizations Parameters API")
 public class NetworkVisualizationsParamController {

diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/MapParamInfos.java b/src/main/java/org/gridsuite/studyconfig/server/dto/MapParamInfos.java
@@ -4,7 +4,7 @@
  * 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.studyconfig.server.dto;
+package org.gridsuite.spreadsheetconfig.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/NetworkAreaDiagramParamInfos.java b/src/main/java/org/gridsuite/studyconfig/server/dto/NetworkAreaDiagramParamInfos.java
@@ -4,7 +4,7 @@
  * 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.studyconfig.server.dto;
+package org.gridsuite.spreadsheetconfig.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/NetworkVisualizationParamInfos.java b/src/main/java/org/gridsuite/studyconfig/server/dto/NetworkVisualizationParamInfos.java
@@ -4,7 +4,7 @@
  * 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.studyconfig.server.dto;
+package org.gridsuite.spreadsheetconfig.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/SingleLineDiagramParamInfos.java b/src/main/java/org/gridsuite/studyconfig/server/dto/SingleLineDiagramParamInfos.java
@@ -4,7 +4,7 @@
  * 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.studyconfig.server.dto;
+package org.gridsuite.spreadsheetconfig.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java
@@ -4,7 +4,7 @@
  * 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.studyconfig.server.entities;
+package org.gridsuite.spreadsheetconfig.server.entities;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java b/src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java
@@ -4,13 +4,13 @@
  * 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.studyconfig.server.mapper;
+package org.gridsuite.spreadsheetconfig.server.mapper;
 
-import org.gridsuite.studyconfig.server.dto.MapParamInfos;
-import org.gridsuite.studyconfig.server.dto.NetworkAreaDiagramParamInfos;
-import org.gridsuite.studyconfig.server.dto.NetworkVisualizationParamInfos;
-import org.gridsuite.studyconfig.server.dto.SingleLineDiagramParamInfos;
-import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
+import org.gridsuite.spreadsheetconfig.server.dto.MapParamInfos;
+import org.gridsuite.spreadsheetconfig.server.dto.NetworkAreaDiagramParamInfos;
+import org.gridsuite.spreadsheetconfig.server.dto.NetworkVisualizationParamInfos;
+import org.gridsuite.spreadsheetconfig.server.dto.SingleLineDiagramParamInfos;
+import org.gridsuite.spreadsheetconfig.server.entities.NetworkVisualizationParamEntity;
 
 /**
  * @author David BRAQUART <david.braquart at rte-france.com>

diff --git a/...va/org/gridsuite/studyconfig/server/repositories/NetworkVisualizationParamRepository.java b/...va/org/gridsuite/studyconfig/server/repositories/NetworkVisualizationParamRepository.java
@@ -4,9 +4,9 @@
  * 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.studyconfig.server.repositories;
+package org.gridsuite.spreadsheetconfig.server.repositories;
 
-import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
+import org.gridsuite.spreadsheetconfig.server.entities.NetworkVisualizationParamEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/...main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java b/...main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java
@@ -4,14 +4,14 @@
  * 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.studyconfig.server.service;
+package org.gridsuite.spreadsheetconfig.server.service;
 
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
-import org.gridsuite.studyconfig.server.dto.NetworkVisualizationParamInfos;
-import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
-import org.gridsuite.studyconfig.server.mapper.NetworkVisualizationParamMapper;
-import org.gridsuite.studyconfig.server.repositories.NetworkVisualizationParamRepository;
+import org.gridsuite.spreadsheetconfig.server.dto.NetworkVisualizationParamInfos;
+import org.gridsuite.spreadsheetconfig.server.entities.NetworkVisualizationParamEntity;
+import org.gridsuite.spreadsheetconfig.server.mapper.NetworkVisualizationParamMapper;
+import org.gridsuite.spreadsheetconfig.server.repositories.NetworkVisualizationParamRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java b/...test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java
@@ -4,15 +4,15 @@
  * 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.studyconfig.server;
+package org.gridsuite.spreadsheetconfig.server;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.gridsuite.studyconfig.server.dto.MapParamInfos;
-import org.gridsuite.studyconfig.server.dto.NetworkAreaDiagramParamInfos;
-import org.gridsuite.studyconfig.server.dto.NetworkVisualizationParamInfos;
-import org.gridsuite.studyconfig.server.dto.SingleLineDiagramParamInfos;
-import org.gridsuite.studyconfig.server.repositories.NetworkVisualizationParamRepository;
-import org.gridsuite.studyconfig.server.service.NetworkVisualizationsParamService;
+import org.gridsuite.spreadsheetconfig.server.dto.MapParamInfos;
+import org.gridsuite.spreadsheetconfig.server.dto.NetworkAreaDiagramParamInfos;
+import org.gridsuite.spreadsheetconfig.server.dto.NetworkVisualizationParamInfos;
+import org.gridsuite.spreadsheetconfig.server.dto.SingleLineDiagramParamInfos;
+import org.gridsuite.spreadsheetconfig.server.repositories.NetworkVisualizationParamRepository;
+import org.gridsuite.spreadsheetconfig.server.service.NetworkVisualizationsParamService;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;