From d723439b420bbb701a3fdc3e8d2e525afbc3f33f Mon Sep 17 00:00:00 2001 From: Christian AKPONA Date: Sat, 29 Mar 2025 00:09:20 +0100 Subject: [PATCH] Merge avec avec la branche aur-br05-26032025 --- .../fiscad/configuration/ApplicationConfig.java | 1 - .../fiscad/configuration/SwaggerOAS3Config.java | 2 +- .../decoupage/SecteurController.java | 1 - .../infocad/metier/ParcelleGeomController.java | 4 ---- .../fiscad/controllers/user/UserController.java | 1 - .../entities/infocad/metier/ParcelleGeom.java | 5 ++--- .../infocad/metier/ParcelleGeomServiceImpl.java | 17 +++++------------ .../infocad/metier/ParcelleGeomService.java | 2 -- .../decoupage/QuartierRepository.java | 1 - .../infocad/metier/ParcelleGeomRepository.java | 3 --- 10 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java b/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java index 5b949be..88bf47c 100644 --- a/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java +++ b/src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java @@ -10,7 +10,6 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java b/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java index 1858ecb..b355c94 100644 --- a/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java +++ b/src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java @@ -28,7 +28,7 @@ public class SwaggerOAS3Config { private static final String[] INFOCAD_METIER = { //metier - "/api/acteur-concerne/**", "/api/commentaire/**", "/api/enquete/**", "/api/tpe/**", "/api/upload/**", + "/api/acteur-concerne/**", "/api/commentaire/**", "/api/enquete/**", "/api/tpe/**", "/api/upload/**","/api/parcelle-geom/**" }; private static final String[] INFOCAD_PARAMETERS = { diff --git a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java index b4c1fbf..15a8b4b 100644 --- a/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java +++ b/src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java @@ -5,7 +5,6 @@ import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.decoupage.SecteurService; import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.request.SecteurPayload; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.slf4j.Logger; diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java index ec9a99b..4c0d923 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java @@ -1,19 +1,15 @@ package io.gmss.fiscad.controllers.infocad.metier; -import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService; -import io.gmss.fiscad.interfaces.infocad.metier.TpeService; import io.gmss.fiscad.paylaods.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/io/gmss/fiscad/controllers/user/UserController.java b/src/main/java/io/gmss/fiscad/controllers/user/UserController.java index c5bebea..349afd1 100755 --- a/src/main/java/io/gmss/fiscad/controllers/user/UserController.java +++ b/src/main/java/io/gmss/fiscad/controllers/user/UserController.java @@ -9,7 +9,6 @@ import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.Login; import io.gmss.fiscad.security.CurrentUser; import io.gmss.fiscad.security.UserPrincipal; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.slf4j.Logger; diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java index 747791a..c58f422 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java @@ -1,6 +1,8 @@ package io.gmss.fiscad.entities.infocad.metier; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.gmss.fiscad.entities.BaseEntity; import io.gmss.fiscad.entities.decoupage.Quartier; import jakarta.persistence.*; @@ -14,9 +16,6 @@ import org.hibernate.annotations.Where; import org.locationtech.jts.geom.Polygon; import org.n52.jackson.datatype.jts.GeometryDeserializer; import org.n52.jackson.datatype.jts.GeometrySerializer; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import java.io.Serializable; diff --git a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java index b24047e..7766cea 100644 --- a/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java @@ -1,35 +1,28 @@ package io.gmss.fiscad.implementations.infocad.metier; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; +import com.fasterxml.jackson.databind.ObjectMapper; import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService; -import io.gmss.fiscad.paylaods.request.ParcelleGeomPayload; import io.gmss.fiscad.repositories.infocad.metier.ParcelleGeomRepository; import lombok.RequiredArgsConstructor; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Polygon; import org.locationtech.jts.io.ParseException; -import org.locationtech.jts.io.WKTWriter; +import org.locationtech.jts.io.WKTReader; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.List; -import java.util.Optional; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.io.WKTReader; -import org.springframework.stereotype.Service; - import java.io.InputStream; import java.util.Iterator; +import java.util.List; +import java.util.Optional; @Service @RequiredArgsConstructor public class ParcelleGeomServiceImpl implements ParcelleGeomService { diff --git a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleGeomService.java b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleGeomService.java index 44b16b4..5f3a095 100644 --- a/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleGeomService.java +++ b/src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleGeomService.java @@ -1,11 +1,9 @@ package io.gmss.fiscad.interfaces.infocad.metier; import com.fasterxml.jackson.databind.JsonNode; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom; import io.gmss.fiscad.exceptions.BadRequestException; import io.gmss.fiscad.exceptions.NotFoundException; -import io.gmss.fiscad.paylaods.request.ParcellePayLoad; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java b/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java index 74eef73..38b3bfb 100755 --- a/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/decoupage/QuartierRepository.java @@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import java.util.List; -import java.util.Optional; public interface QuartierRepository extends JpaRepository { List getAllByArrondissement(Arrondissement arrondissement); diff --git a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java index f631930..f846663 100644 --- a/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java +++ b/src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java @@ -1,13 +1,10 @@ package io.gmss.fiscad.repositories.infocad.metier; -import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.ParcelleGeom; -import io.gmss.fiscad.paylaods.response.restoration.ParcellePayLoad; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import java.util.List; -import java.util.Optional; public interface ParcelleGeomRepository extends JpaRepository {