From 78795a85a9d3b5d4723081f1af6f5316893bcf94 Mon Sep 17 00:00:00 2001 From: "sonarqube-agent[bot]" <210722872+sonarqube-agent[bot]@users.noreply.github.com> Date: Sun, 10 May 2026 09:03:17 +0000 Subject: [PATCH] fix: Address SonarQube issues Generated by SonarQube Agent (task: 68a9ab8b-02a9-468a-9322-d9fc816ca3fb) --- .../psc/pscapimajv2/api/PsOperationTest.java | 62 +++++++++---------- .../pscapimajv2/api/ToggleOperationTest.java | 8 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java b/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java index 714599f..e12e825 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java @@ -215,7 +215,7 @@ public void createNewPs() throws Exception { ResultActions createdPs2 = mockMvc.perform(post("/api/v2/ps").header("Accept", "application/json") .contentType("application/json").content("{\"idType\":\"8\",\"id\":\"00000000002\"," +"\"ids\":[\"800000000002\",\"855e8700-e29b-41d4-a716-44665544111\"],"+ - "\"alternativeIds\":[{\"identifier\":\"800000000002\",\"origine\":\"RPPS\",\"quality\":1},{\"identifier\":\"855e8700-e29b-41d4-a716-44665544111\",\"origine\":\"PSI\",\"quality\":2}]," + "\"quality\":0," + + "\"alternativeIds\":[{\"identifier\":\"800000000002\",\"origine\":\"RPPS\",\"quality\":1},{\"identifier\":\"855e8700-e29b-41d4-a716-44665544111\",\"origine\":\"PSI\",\"quality\":2}]," + "\"quality\":0," + "\"nationalId\":\"855e8700-e29b-41d4-a716-44665544111\",\"lastName\":\"DUPONT\",\"firstNames\":[{\"firstName\":\"JIMMY\",\"order\":1}],\"dateOfBirth\":\"17/12/1983\"," + "\"birthAddressCode\":\"57463\",\"birthCountryCode\":\"99000\",\"birthAddress\":\"METZ\",\"genderCode\":\"M\"," + "\"phone\":\"0601020304\",\"email\":\"toto57@hotmail.fr\",\"salutationCode\":\"MME\",\"professions\":[{\"exProId\":\"50C\"," + @@ -388,10 +388,10 @@ public void deletePsFailed() throws Exception { @DisplayName(value = "Search a PS by identity") @MongoDataSet(value = "/dataset/ps_search_by_identity.json", cleanBefore = true, cleanAfter = true) public void searchPs() throws Exception { - - // Only required criterias (and only one firstName) - ResultActions result = mockMvc.perform( - get("/api/v2/ps/search") + + // Only required criterias (and only one firstName) + ResultActions result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY") @@ -399,13 +399,13 @@ public void searchPs() throws Exception { .param("birthdate", "1983-12-17") ) .andExpect(status().is(200)); - String responseBody = result.andReturn().getResponse().getContentAsString(); + String responseBody = result.andReturn().getResponse().getContentAsString(); assertTrue(responseBody.contains("800000000001") && responseBody.contains("800000000002")); // Only required criterias (and all firstnames) - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB") @@ -413,13 +413,13 @@ public void searchPs() throws Exception { .param("birthdate", "1983-12-17") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); assertTrue(responseBody.contains("800000000001")); // Only required criterias + birthCountryCode - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB") @@ -428,13 +428,13 @@ public void searchPs() throws Exception { .param("birthCountryCode","99000") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); assertTrue(responseBody.contains("800000000001")); // Only required criterias + birthCountryCode + birthAddressCode - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB") @@ -444,13 +444,13 @@ public void searchPs() throws Exception { .param("birthTownCode","57463") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); assertTrue(responseBody.contains("800000000001")); // All criterias (+ optionals birthCountryCode, birthAddressCode, birthAddress) - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB") @@ -461,13 +461,13 @@ public void searchPs() throws Exception { .param("birthplace","METZ") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); assertTrue(responseBody.contains("800000000001")); // All criterias, fake firstname - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB TOTO") @@ -478,13 +478,13 @@ public void searchPs() throws Exception { .param("birthplace","METZ") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); assertEquals("[]", responseBody); // All criterias, fake birthCountryCode - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB") @@ -495,13 +495,13 @@ public void searchPs() throws Exception { .param("birthplace","METZ") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); - assertEquals("[]", responseBody); - + assertEquals("[]", responseBody); + // All criterias, fake birthCountryCode - result = mockMvc.perform( - get("/api/v2/ps/search") + result = mockMvc.perform( + get("/api/v2/ps/search") .header("Accept", "application/json") .param("lastName", "DUPONT") .param("firstNames", "JIMMY BOB") @@ -512,9 +512,9 @@ public void searchPs() throws Exception { .param("birthplace","METZ") ) .andExpect(status().is(200)); - responseBody = result.andReturn().getResponse().getContentAsString(); + responseBody = result.andReturn().getResponse().getContentAsString(); - assertEquals("[]", responseBody); + assertEquals("[]", responseBody); } @Test @@ -910,7 +910,7 @@ public void createNewPsNonPsi_noRppsPractice_fallbackOnLastName() throws Excepti @Test @DisplayName(value = "createNewPs: usualLastName fourni explicitement → respecté (pas de fallback)") - public void createNewPs_explicitUsualLastNameIsKept() throws Exception { + void createNewPs_explicitUsualLastNameIsKept() throws Exception { String json = "{" + "\"idType\":\"8\"," + "\"id\":\"00000000098\"," diff --git a/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java b/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java index 65104c4..f956e5a 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java @@ -69,7 +69,7 @@ public void setUp(WebApplicationContext context, RestDocumentationContextProvide @Test @DisplayName(value = "should toggle PsRef, PSI_RPPS case") @MongoDataSet(value = "/dataset/toggle_PSI_RPPS.json", cleanBefore = true, cleanAfter = true) - public void PSIandRPPStogglePsRef() throws Exception { + void PSIandRPPStogglePsRef() throws Exception { Ps ps1 = psRepository.findByNationalId("550e8400-e29b-41d4-a716-446655440000"); Ps ps2 = psRepository.findByNationalId("81"); @@ -103,7 +103,7 @@ public void PSIandRPPStogglePsRef() throws Exception { @Test @DisplayName(value = "should toggle PsRef, PSI only case") @MongoDataSet(value = "/dataset/toggle_PSI_only.json", cleanBefore = true, cleanAfter = true) - public void psiTogglePsRef() throws Exception { + void psiTogglePsRef() throws Exception { Ps ps1 = psRepository.findByNationalId("855e8700-e29b-41d4-a716-44665544111"); Ps ps2 = psRepository.findByNationalId("3 110000056/000000001"); @@ -139,7 +139,7 @@ public void psiTogglePsRef() throws Exception { @Test @DisplayName(value = "should toggle PsRef, RPPS only case") @MongoDataSet(value = "/dataset/toggle_RPPS_only.json", cleanBefore = true, cleanAfter = true) - public void rppsTogglePsRef() throws Exception { + void rppsTogglePsRef() throws Exception { Ps ps1 = psRepository.findByNationalId("4380527788/8165"); Ps ps2 = psRepository.findByNationalId("811234567896"); @@ -170,7 +170,7 @@ public void rppsTogglePsRef() throws Exception { @Test @DisplayName(value = "should toggle PsRef, Adeli case") @MongoDataSet(value = "/dataset/toggle_Adeli.json", cleanBefore = true, cleanAfter = true) - public void adeliTogglePsRef() throws Exception { + void adeliTogglePsRef() throws Exception { Ps ps1 = psRepository.findByNationalId("000327008728"); Ps ps2 = psRepository.findByNationalId("538052778800034/8165");