Commit 17b8640c authored by Noel Alonso's avatar Noel Alonso
Browse files

Elimina eventos usados en postUpdate de tracking

parent 91dbe820

vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltracking/VesselTrackingEventFactory.java

+0 −22
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ import es.redmic.brokerlib.avro.common.EventError; 
import es.redmic.exception.common.ExceptionType;

import es.redmic.exception.common.InternalException;

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

import es.redmic.vesselslib.events.vessel.common.VesselEvent;

import es.redmic.vesselslib.events.vesseltracking.common.VesselTrackingCancelledEvent;

import es.redmic.vesselslib.events.vesseltracking.common.VesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.create.CreateVesselTrackingCancelledEvent;
@@ -26,7 +25,6 @@ import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingCon 
import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingFailedEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.VesselTrackingDeletedEvent;

import es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel.UpdateVesselInVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingCancelledEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingConfirmedEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingEnrichedEvent;
@@ -139,26 +137,6 @@ public class VesselTrackingEventFactory { 
		}

	}



	//////////////



	public static Event getEvent(Event source, Event trigger, String type) {



		if (type.equals(VesselTrackingEventTypes.UPDATE_VESSEL)) {



			logger.info("Creando evento UpdateVesselInVesselTrackingEvent para: " + source.getAggregateId());



			UpdateVesselInVesselTrackingEvent requestEvent = new UpdateVesselInVesselTrackingEvent();

			requestEvent.setAggregateId(source.getAggregateId());

			requestEvent.setUserId(trigger.getUserId());

			requestEvent.setVersion(source.getVersion() + 1);

			requestEvent.setVessel(((VesselEvent) trigger).getVessel());

			return requestEvent;

		}



		logger.error("Tipo de evento no soportado");

		throw new InternalException(ExceptionType.INTERNAL_EXCEPTION);

	}



	/////////////////



	public static Event getEvent(Event source, String type, String exceptionType,

vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltracking/partialupdate/vessel/AggregationVesselInVesselTrackingPostUpdateEvent.java

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
package es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel;



import java.util.UUID;



import org.apache.avro.Schema;



import es.redmic.vesselslib.dto.vessel.VesselDTO;

import es.redmic.vesselslib.events.vessel.common.VesselEvent;



public class AggregationVesselInVesselTrackingPostUpdateEvent extends VesselEvent {



	// @formatter:off



		public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{"

			+ "\"type\":\"record\",\"name\":\"AggregationVesselInVesselTrackingPostUpdateEvent\","

					+ "\"namespace\":\"es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel\",\"fields\":["

				+ getVesselEventSchema() + ","

				+ getEventBaseSchema() + "]}");

		// @formatter:on



	static String type = "AGGREGATION";



	public AggregationVesselInVesselTrackingPostUpdateEvent() {

		super(type);

		setSessionId(UUID.randomUUID().toString());

	}



	public AggregationVesselInVesselTrackingPostUpdateEvent(String type) {

		super(type);

		setSessionId(UUID.randomUUID().toString());

	}



	public AggregationVesselInVesselTrackingPostUpdateEvent(String type, VesselDTO vessel) {

		super(type);

		this.setVessel(vessel);

		setSessionId(UUID.randomUUID().toString());

	}



	@Override

	public Schema getSchema() {

		return SCHEMA$;

	}

}

vessels-lib/src/main/java/es/redmic/vesselslib/events/vesseltracking/partialupdate/vessel/UpdateVesselInVesselTrackingEvent.java

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
package es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel;



import java.util.UUID;



import org.apache.avro.Schema;



import es.redmic.vesselslib.dto.vessel.VesselDTO;

import es.redmic.vesselslib.events.vessel.common.VesselEvent;

import es.redmic.vesselslib.events.vesseltracking.VesselTrackingEventTypes;



public class UpdateVesselInVesselTrackingEvent extends VesselEvent {



	// @formatter:off



		public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{"

			+ "\"type\":\"record\",\"name\":\"UpdateVesselInVesselTrackingEvent\","

					+ "\"namespace\":\"es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel\",\"fields\":["

				+ getVesselEventSchema() + ","

				+ getEventBaseSchema() + "]}");

		// @formatter:on



	static String type = VesselTrackingEventTypes.UPDATE_VESSEL;



	public UpdateVesselInVesselTrackingEvent() {

		super(type);

		setSessionId(UUID.randomUUID().toString());

	}



	public UpdateVesselInVesselTrackingEvent(VesselDTO vessel) {

		super(type);

		this.setVessel(vessel);

		setSessionId(UUID.randomUUID().toString());

	}



	@Override

	public Schema getSchema() {

		return SCHEMA$;

	}

}

vessels-lib/src/test/java/es/redmic/vesselslib/unit/events/tracking/VesselTrackingEventFactoryTest.java

+0 −23
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import org.junit.Test; 


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

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

import es.redmic.vesselslib.events.vessel.update.VesselUpdatedEvent;

import es.redmic.vesselslib.events.vesseltracking.VesselTrackingEventFactory;

import es.redmic.vesselslib.events.vesseltracking.VesselTrackingEventTypes;

import es.redmic.vesselslib.events.vesseltracking.common.VesselTrackingEvent;
@@ -24,14 +23,12 @@ import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingCon 
import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingFailedEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.VesselTrackingDeletedEvent;

import es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel.UpdateVesselInVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingCancelledEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingConfirmedEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingEnrichedEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingFailedEvent;

import es.redmic.vesselslib.events.vesseltracking.update.VesselTrackingUpdatedEvent;

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

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



public class VesselTrackingEventFactoryTest {
@@ -190,26 +187,6 @@ public class VesselTrackingEventFactoryTest { 


	///////////////////



	@Test

	public void GetEvent_ReturnUpdateVesselInVesselTrackingEvent_IfTypeIsUpdatedVessel() {



		Event source = VesselTrackingDataUtil.getVesselTrackingUpdatedEvent();

		VesselUpdatedEvent vesselUpdated = VesselDataUtil.getVesselUpdatedEvent();



		UpdateVesselInVesselTrackingEvent event = (UpdateVesselInVesselTrackingEvent) VesselTrackingEventFactory

				.getEvent(source, vesselUpdated, VesselTrackingEventTypes.UPDATE_VESSEL);



		assertEquals(VesselTrackingEventTypes.UPDATE_VESSEL, event.getType());

		assertNotNull(event.getVessel());

		assertEquals(source.getAggregateId(), event.getAggregateId());

		assertEquals(vesselUpdated.getUserId(), event.getUserId());



		Integer versionExpected = source.getVersion() + 1;

		assertEquals(versionExpected.toString(), event.getVersion().toString());

	}



	///////////////////



	@Test

	public void GetEvent_ReturnCreateVesselTrackingFailedEvent_IfTypeIsCreateFailed() {

vessels-lib/src/test/java/es/redmic/vesselslib/unit/events/tracking/VesselTrackingEventsCheckAvroSchemaTest.java

+0 −16
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingCon 
import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingFailedEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.VesselTrackingDeletedEvent;

import es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel.UpdateVesselInVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.EnrichUpdateVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingCancelledEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingConfirmedEvent;
@@ -326,19 +325,4 @@ public class VesselTrackingEventsCheckAvroSchemaTest extends VesselAvroBaseTest 


		assertEquals(result, event);

	}



	// UpdateVesselTrackingTypeInVesselTracking



	@Test

	public void UpdateVesselInVesselTrackingEventSerializeAndDeserialize_IsSuccessful_IfSchemaAndDataAreCorrect() {



		UpdateVesselInVesselTrackingEvent event = VesselTrackingDataUtil.getUpdateVesselInVesselTrackingEvent();



		Object result = serializerAndDeserializer(event);



		assertTrue("El objeto obtenido debe ser una instancia de UpdateVesselInVesselTrackingEvent",

				UpdateVesselInVesselTrackingEvent.class.isInstance(result));



		assertEquals(result, event);

	}

}