Commit e792684e authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia vividsolution por locationtech

parent 722b5f0e

vessels-view/src/main/java/es/redmic/vesselsview/config/MapperScanBean.java

+1 −2
Original line number Diff line number Diff line 
package es.redmic.vesselsview.config;



import org.joda.time.DateTime;

import org.locationtech.jts.geom.Point;

import org.springframework.stereotype.Component;



import com.vividsolutions.jts.geom.Point;



import es.redmic.viewlib.config.MapperScanBeanBase;

import es.redmic.viewlib.config.MapperScanBeanItfc;

import ma.glasnost.orika.converter.builtin.PassThroughConverter;

vessels-view/src/main/java/es/redmic/vesselsview/model/vesseltracking/VesselTracking.java

+1 −1
Original line number Diff line number Diff line 
package es.redmic.vesselsview.model.vesseltracking;



import com.vividsolutions.jts.geom.Point;

import org.locationtech.jts.geom.Point;



import es.redmic.models.es.geojson.GeoJSONFeatureType;

import es.redmic.models.es.geojson.base.Feature;;

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/controller/VesselTrackingControllerTest.java

+6 −5
Original line number Diff line number Diff line
@@ -17,13 +17,15 @@ import java.util.UUID; 


import javax.annotation.PostConstruct;



import org.geotools.geometry.jts.JTSFactoryFinder;

import org.joda.time.DateTime;

import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.locationtech.jts.geom.Coordinate;

import org.locationtech.jts.geom.GeometryFactory;

import org.locationtech.jts.geom.Point;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.boot.test.context.SpringBootTest;
@@ -34,9 +36,6 @@ import org.springframework.test.context.TestPropertySource; 
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import org.springframework.test.web.servlet.setup.MockMvcBuilders;



import com.vividsolutions.jts.geom.Coordinate;

import com.vividsolutions.jts.geom.Point;



import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.models.es.common.query.dto.MgetDTO;

import es.redmic.testutils.documentation.DocumentationViewBaseTest;
@@ -109,7 +108,9 @@ public class VesselTrackingControllerTest extends DocumentationViewBaseTest { 
		vesselTracking.setId(PREFIX + MMSI + "-" + new DateTime().getMillis());

		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);



		VesselTrackingProperties properties = new VesselTrackingProperties();

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/handler/VesselTrackingEventHandlerTest.java

+6 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import java.util.concurrent.TimeUnit; 


import javax.annotation.PostConstruct;



import org.geotools.geometry.jts.JTSFactoryFinder;

import org.joda.time.DateTime;

import org.json.JSONException;

import org.junit.Before;
@@ -21,6 +20,9 @@ import org.junit.BeforeClass; 
import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.locationtech.jts.geom.Coordinate;

import org.locationtech.jts.geom.GeometryFactory;

import org.locationtech.jts.geom.Point;

import org.skyscreamer.jsonassert.JSONAssert;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;
@@ -38,8 +40,6 @@ import org.springframework.util.concurrent.ListenableFuture; 


import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.vividsolutions.jts.geom.Coordinate;

import com.vividsolutions.jts.geom.Point;



import es.redmic.brokerlib.avro.common.Event;

import es.redmic.brokerlib.listener.SendListener;
@@ -349,7 +349,9 @@ public class VesselTrackingEventHandlerTest extends DocumentationViewBaseTest { 
		vesselTracking.setId(PREFIX + MMSI + TSTAMP);

		vesselTracking.setUuid(_UUID);



		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();