fix: solve sonar issues

InseeFr · Dec 9, 2024 · 069c7fc · 069c7fc
1 parent 1c42830
commit 069c7fc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/ConceptsCollectionService.java b/src/main/java/fr/insee/rmes/bauhaus_services/ConceptsCollectionService.java
@@ -14,9 +14,9 @@ public interface ConceptsCollectionService {
 
     String getCollectionMembersByID(String id) throws RmesException;
 
-    ResponseEntity<?> getCollectionExportODT(String id, String accept, ConceptsCollectionsResources.Language lg, boolean withConcepts, HttpServletResponse response) throws RmesException;
+    ResponseEntity getCollectionExportODT(String id, String accept, ConceptsCollectionsResources.Language lg, boolean withConcepts, HttpServletResponse response) throws RmesException;
 
-    ResponseEntity<?>  getCollectionExportODS(String id, String accept, boolean withConcepts, HttpServletResponse response) throws RmesException;
+    ResponseEntity getCollectionExportODS(String id, String accept, boolean withConcepts, HttpServletResponse response) throws RmesException;
 
     void exportZipCollection(String id, String accept, HttpServletResponse response, ConceptsCollectionsResources.Language lg, String type, boolean withConcepts) throws RmesException;
 }
diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/ConceptsService.java b/src/main/java/fr/insee/rmes/bauhaus_services/ConceptsService.java
@@ -39,7 +39,7 @@ public interface ConceptsService {
 
 	void setConceptsValidation(String body) throws  RmesException ;
 
-	ResponseEntity<?> exportConcept(String id, String acceptHeader) throws RmesException;
+	ResponseEntity exportConcept(String id, String acceptHeader) throws RmesException;
 
 	void exportZipConcept(String id, String acceptHeader, HttpServletResponse response, ConceptsCollectionsResources.Language lg, String type, boolean withConcepts) throws RmesException;
 
@@ -49,7 +49,7 @@ public interface ConceptsService {
 
 	void setCollectionsValidation(String body) throws  RmesException ;
 
-	ResponseEntity<?> getCollectionExport(String id, String acceptHeader) throws RmesException ;
+	ResponseEntity getCollectionExport(String id, String acceptHeader) throws RmesException ;
 
 	String getRelatedConcepts(String id) throws RmesException;
 

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/StampAuthorizationChecker.java b/src/main/java/fr/insee/rmes/bauhaus_services/StampAuthorizationChecker.java
@@ -28,12 +28,10 @@ public class StampAuthorizationChecker extends StampsRestrictionServiceImpl {
     private static final Logger logger = LoggerFactory.getLogger(StampAuthorizationChecker.class);
     public static final String CHECKING_AUTHORIZATION_ERROR_MESSAGE = "Error while checking authorization for user with stamp {} to modify or delete {}";
     public static final String ERROR_AUTHORIZATION = "Error while checking authorization for user with stamp {} to modify {}";
-    private final String baseInternalUri;
 
     @Autowired
-    public StampAuthorizationChecker(RepositoryGestion repoGestion, AuthorizeMethodDecider authorizeMethodDecider, UserProvider userProvider, @Value("${fr.insee.rmes.bauhaus.sesame.gestion.baseInternalURI}") String baseInternalUri) {
+    public StampAuthorizationChecker(RepositoryGestion repoGestion, AuthorizeMethodDecider authorizeMethodDecider, UserProvider userProvider) {
         super(repoGestion, authorizeMethodDecider, userProvider);
-        this.baseInternalUri = baseInternalUri;
     }
 
     public boolean isSeriesManagerWithStamp(String seriesId, Stamp stamp) {

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/concepts/ConceptsCollectionServiceImpl.java b/src/main/java/fr/insee/rmes/bauhaus_services/concepts/ConceptsCollectionServiceImpl.java
@@ -89,7 +89,7 @@ public ResponseEntity<?> getCollectionExportODT(String id, String accept, Concep
 
             String fileName = getFileNameForExport(collection, lg);
             if(conceptsIds.isEmpty()){
-                return collectionExport.exportAsResponseODT(fileName, xmlContent,true,true,true, lg);
+                return collectionExport.exportAsResponseODT(fileName, xmlContent,true, lg);
             }
 
             Map<String, InputStream> concepts = conceptsService.getConceptsExportIS(conceptsIds, null);

diff --git a/...ain/java/fr/insee/rmes/bauhaus_services/concepts/collections/CollectionExportBuilder.java b/...ain/java/fr/insee/rmes/bauhaus_services/concepts/collections/CollectionExportBuilder.java
@@ -109,7 +109,7 @@ public ResponseEntity<Resource> exportAsResponse(String fileName, Map<String, St
 	}
 
 
-	public ResponseEntity<Resource> exportAsResponseODT(String fileName, Map<String, String> xmlContent, boolean lg1, boolean lg2, boolean includeEmptyFields, ConceptsCollectionsResources.Language lg) throws RmesException {
+	public ResponseEntity<Resource> exportAsResponseODT(String fileName, Map<String, String> xmlContent, boolean includeEmptyFields, ConceptsCollectionsResources.Language lg) throws RmesException {
 		String parametersXML = XsltUtils.buildParams(true, true, includeEmptyFields, Constants.COLLECTION);
 		xmlContent.put(Constants.PARAMETERS_FILE, parametersXML);
 		String xmlPattern = lg == ConceptsCollectionsResources.Language.lg1 ? xmlPatternFR : xmlPatternEN;