Commit 722b5f0e authored by Noel Alonso's avatar Noel Alonso
Browse files

Elimina vividsolution, cambia módulo JTS jackson

parent 0ab970fa

vessels-lib/pom.xml

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ 
			<scope>provided</scope>

		</dependency>

		

		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-databind</artifactId>

			<scope>provided</scope>

		</dependency>

		

		<!-- Test -->

		

		<dependency>

vessels-lib/src/main/java/es/redmic/vesselslib/dto/tracking/VesselTrackingDTO.java

+1 −1
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ import java.io.IOException; 
import java.nio.ByteBuffer;



import org.apache.avro.Schema;

import org.locationtech.jts.geom.Point;



import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.core.JsonProcessingException;

import com.vividsolutions.jts.geom.Point;



import es.redmic.brokerlib.avro.geodata.common.FeatureDTO;

import es.redmic.brokerlib.avro.geodata.utils.GeoJSONFeatureType;

vessels-lib/src/main/java/es/redmic/vesselslib/utils/VesselTrackingUtil.java

+4 −6
Original line number Diff line number Diff line 
package es.redmic.vesselslib.utils;



import org.geotools.geometry.jts.JTSFactoryFinder;



import com.vividsolutions.jts.geom.Coordinate;

import com.vividsolutions.jts.geom.GeometryFactory;

import com.vividsolutions.jts.geom.Point;

import org.locationtech.jts.geom.Coordinate;

import org.locationtech.jts.geom.GeometryFactory;

import org.locationtech.jts.geom.Point;



import es.redmic.exception.databinding.FieldNotValidException;

import es.redmic.vesselslib.dto.ais.AISTrackingDTO;
@@ -29,7 +27,7 @@ public class VesselTrackingUtil { 
		if (aisTracking.getTstamp() == null)

			throw new FieldNotValidException("date", "null");



		GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();

		GeometryFactory geometryFactory = new GeometryFactory();



		VesselTrackingDTO vesselTracking = new VesselTrackingDTO();

vessels-lib/src/test/java/es/redmic/vesselslib/unit/dto/vesseltracking/VesselTrackingCheckAvroSchemaTest.java

+2 −2
Original line number Diff line number Diff line
@@ -6,17 +6,17 @@ import org.json.JSONException; 
import org.junit.Test;

import org.skyscreamer.jsonassert.JSONAssert;



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

import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;



import es.redmic.jts4jackson.module.JTSModule;

import es.redmic.vesselslib.dto.tracking.VesselTrackingDTO;

import es.redmic.vesselslib.unit.utils.VesselAvroBaseTest;

import es.redmic.vesselslib.unit.utils.VesselTrackingDataUtil;



public class VesselTrackingCheckAvroSchemaTest extends VesselAvroBaseTest {



	ObjectMapper mapper = new ObjectMapper().registerModule(new JtsModule());

	ObjectMapper mapper = new ObjectMapper().registerModule(new JTSModule());



	@Test

	public void serializeAndDeserialize_IsSuccessful_IfSchemaAndDataAreCorrect()

vessels-lib/src/test/java/es/redmic/vesselslib/unit/utils/VesselTrackingDataUtil.java

+6 −5
Original line number Diff line number Diff line
@@ -4,11 +4,10 @@ import java.util.HashMap; 
import java.util.Map;

import java.util.UUID;



import org.geotools.geometry.jts.JTSFactoryFinder;

import org.joda.time.DateTime;



import com.vividsolutions.jts.geom.Coordinate;

import com.vividsolutions.jts.geom.Point;

import org.locationtech.jts.geom.Coordinate;

import org.locationtech.jts.geom.GeometryFactory;

import org.locationtech.jts.geom.Point;



import es.redmic.vesselslib.dto.tracking.VesselTrackingDTO;

import es.redmic.vesselslib.dto.tracking.VesselTrackingPropertiesDTO;
@@ -261,7 +260,9 @@ public abstract class VesselTrackingDataUtil { 
		vesselTracking.setId(PREFIX + MMSI + TSTAMP);

		vesselTracking.setUuid(UUID.randomUUID().toString());



		Point geometry = JTSFactoryFinder.getGeometryFactory().createPoint(new Coordinate(44.56433, 37.94388));

		GeometryFactory geometryFactory = new GeometryFactory();



		Point geometry = geometryFactory.createPoint(new Coordinate(44.56433, 37.94388));

		vesselTracking.setGeometry(geometry);



		VesselTrackingPropertiesDTO properties = new VesselTrackingPropertiesDTO();