Commit 0bcdc29a authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta código a nuevas dependencias

parent b7fee566

src/main/java/es/redmic/models/es/common/model/ReferencesES.java

+8 −8
Original line number Diff line number Diff line
@@ -35,19 +35,19 @@ import org.locationtech.jts.geom.Polygon; 
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.bedatadriven.jackson.datatype.jts.JtsModule;

import com.fasterxml.jackson.databind.DeserializationFeature;

import com.fasterxml.jackson.databind.ObjectMapper;



import es.redmic.exception.common.ExceptionType;

import es.redmic.exception.common.InternalException;

import es.redmic.exception.elasticsearch.ESUpdateException;

import es.redmic.jts4jackson.module.JTSModule;

import es.redmic.models.es.geojson.common.model.Properties;



@SuppressWarnings("rawtypes")

public class ReferencesES<TModel extends BaseES> {



	protected ObjectMapper objectMapper = new ObjectMapper().registerModule(new JTSModule())

	protected ObjectMapper objectMapper = new ObjectMapper().registerModule(new JtsModule())

			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);



	private final Logger LOGGER = LoggerFactory.getLogger(ReferencesES.class);

src/test/java/es/redmic/test/unit/geodata/common/model/GeoSearchWrapperMapperTest.java

+2 −2
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ import org.junit.BeforeClass; 
import org.junit.Test;

import org.locationtech.jts.geom.Point;



import com.bedatadriven.jackson.datatype.jts.JtsModule;

import com.fasterxml.jackson.core.JsonParseException;

import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.DeserializationFeature;

import com.fasterxml.jackson.databind.JsonMappingException;

import com.fasterxml.jackson.databind.ObjectMapper;



import es.redmic.jts4jackson.module.JTSModule;

import es.redmic.models.es.geojson.common.model.GeoHitWrapper;

import es.redmic.models.es.geojson.common.model.GeoSearchWrapper;

import es.redmic.models.es.geojson.properties.model.GeoDataProperties;
@@ -62,7 +62,7 @@ public class GeoSearchWrapperMapperTest { 
	public void deserializeAndSerializeModel()

			throws JsonParseException, JsonMappingException, IOException, JSONException {



		mapper.registerModule(new JTSModule());

		mapper.registerModule(new JtsModule());

		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);



		TypeReference<GeoSearchWrapper<GeoDataProperties, Point>> typeRef = new TypeReference<GeoSearchWrapper<GeoDataProperties, Point>>() {

src/test/java/es/redmic/test/unit/geodata/common/model/ModelMapperTest.java

+4 −4
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import org.junit.Test; 
import org.skyscreamer.jsonassert.JSONAssert;

import org.springframework.core.io.ClassPathResource;



import com.bedatadriven.jackson.datatype.jts.JtsModule;

import com.fasterxml.jackson.core.JsonParseException;

import com.fasterxml.jackson.databind.DeserializationFeature;

import com.fasterxml.jackson.databind.JsonMappingException;

import com.fasterxml.jackson.databind.ObjectMapper;



import es.redmic.jts4jackson.module.JTSModule;

import es.redmic.models.es.geojson.common.model.GeoPointData;



public class ModelMapperTest {
@@ -57,7 +57,7 @@ public class ModelMapperTest { 
	public void deserializeAndSerializeModel()

			throws JsonParseException, JsonMappingException, IOException, JSONException {



		mapper.registerModule(new JTSModule());

		mapper.registerModule(new JtsModule());

		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);



		GeoPointData model = mapper.readValue(getClass().getResource(dataFile).openStream(), GeoPointData.class);