Upgrade to java 17 (#144)

* chore: java11->java17 * style: block text format for certain constants * chore: update version number
InseeFr · Feb 19, 2024 · 7fdd9ad · 7fdd9ad
1 parent 99d970e
commit 7fdd9ad
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>${packaging.mode}</packaging>
 	<groupId>fr.insee.rmes</groupId>
 	<artifactId>magma</artifactId>
-	<version>0.2.3</version>
+	<version>0.3.0</version>
 	<name>magma</name>
 	<description>Metadata management API</description>
 	<organization>
@@ -21,7 +21,7 @@
 	</organization>
 	<properties>
 		<packaging.mode>war</packaging.mode>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<keycloak.version>21.0.1</keycloak.version>
 		<json.version>20230227</json.version>
 		<rdf4j.version>4.2.3</rdf4j.version>

diff --git a/src/test/java/fr/insee/rmes/services/codelists/CodeListImplTest.java b/src/test/java/fr/insee/rmes/services/codelists/CodeListImplTest.java
@@ -24,49 +24,53 @@
 @ExtendWith(MockitoExtension.class)
 class CodeListImplTest {
 
-    public static final String RDF_OUTPUT_EXPECTED = " [\n" +
-            "              {\n" +
-            "                \"notation\": \"ISO-639\",\n" +
-            "                \"statutValidation\": \"Publiée\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_SURVEY_UNIT\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_SURVEY_STATUS\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_FREQ\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_COLLECTION_MODE\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_SOURCE_CATEGORY\"\n" +
-            "              }\n" +
-            "            ]";
-
-    public static final String RDF_OUTPUT = " [\n" +
-            "              {\n" +
-            "                \"notation\": \"ISO-639\",\n" +
-            "                \"statutValidation\": \"Validated\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_SURVEY_UNIT\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_SURVEY_STATUS\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_FREQ\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_COLLECTION_MODE\"\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"notation\": \"CL_SOURCE_CATEGORY\"\n" +
-            "              }\n" +
-            "            ]";
+    public static final String RDF_OUTPUT_EXPECTED = """
+            [
+              {
+                "notation": "ISO-639",
+                "statutValidation": "Publiée"
+              },
+              {
+                "notation": "CL_SURVEY_UNIT"
+              },
+              {
+                "notation": "CL_SURVEY_STATUS"
+              },
+              {
+                "notation": "CL_FREQ"
+              },
+              {
+                "notation": "CL_COLLECTION_MODE"
+              },
+              {
+                "notation": "CL_SOURCE_CATEGORY"
+              }
+            ]
+            """;
+
+    public static final String RDF_OUTPUT = """
+            [
+              {
+                "notation": "ISO-639",
+                "statutValidation": "Validated"
+              },
+              {
+                "notation": "CL_SURVEY_UNIT"
+              },
+              {
+                "notation": "CL_SURVEY_STATUS"
+              },
+              {
+                "notation": "CL_FREQ"
+              },
+              {
+                "notation": "CL_COLLECTION_MODE"
+              },
+              {
+                "notation": "CL_SOURCE_CATEGORY"
+              }
+            ]
+            """;
 
     public static final String CODELIST_TEST_WITH_STATUT_VALIDATION = "{\"dateMiseAJour\":\"2023-01-01T00:00:00\",\"dateCreation\":\"2023-01-01T00:00:00\",\"statutValidation\":\"Provisoire, jamais publiée\",\"id\":\"CL_TEST\"}";
     public static final String CODELIST_TEST_WITHOUT_STATUT_VALIDATION = "{\"dateMiseAJour\":\"2023-01-01T00:00:00\",\"dateCreation\":\"2023-01-01T00:00:00\",\"id\":\"CL_TEST\"}";