fix(units) : ignore unknown fields from unit file

InseeFr · Jul 6, 2022 · 657f8be · 657f8be
1 parent 77d898e
commit 657f8be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/fr/insee/rmes/metadata/client/MetadataClientImpl.java b/src/main/java/fr/insee/rmes/metadata/client/MetadataClientImpl.java
@@ -89,10 +89,9 @@ public List<Unit> getUnits() throws Exception {
 		//Change this method when units are available in repository
 		final ObjectMapper objectMapper = new ObjectMapper();
         URL resource = getClass().getClassLoader().getResource("measure-units.json");
-		List<Unit> unitList = objectMapper.readValue(
+		return objectMapper.readValue(
 				new File(resource.toURI()), 
 		        new TypeReference<List<Unit>>(){});
-		return unitList;
 	}
 
 	@Override

diff --git a/src/main/java/fr/insee/rmes/metadata/model/Unit.java b/src/main/java/fr/insee/rmes/metadata/model/Unit.java
@@ -1,7 +1,9 @@
 package fr.insee.rmes.metadata.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Unit {
 
 	@JsonProperty("uri")

diff --git a/src/main/java/fr/insee/rmes/metadata/service/MetadataServiceImpl.java b/src/main/java/fr/insee/rmes/metadata/service/MetadataServiceImpl.java
@@ -47,8 +47,6 @@ public class MetadataServiceImpl implements MetadataService {
 
 	@Override
 	public List<Unit> getUnits() throws Exception {
-		// getCodeList("a72e6e56-12a1-49b7-96c4-c724da3da5da",
-		// "c265b595-ced2-4526-88dc-151471de885d");
 		return metadataRepository.getUnits();
 	}