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

Pasa factoría de eventos a librería 

Actualiza referencias a la factoría
parent 6e0e2701

vessels-view/src/main/java/es/redmic/vesselsview/controller/VesselController.java

+18 −21
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ import es.redmic.exception.common.ExceptionType; 
import es.redmic.models.es.common.dto.EventApplicationResult;

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

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

import es.redmic.vesselslib.events.vessel.VesselEventFactory;

import es.redmic.vesselslib.events.vessel.VesselEventTypes;

import es.redmic.vesselslib.events.vessel.create.CreateVesselConfirmedEvent;

import es.redmic.vesselslib.events.vessel.create.CreateVesselEvent;

import es.redmic.vesselslib.events.vessel.delete.DeleteVesselConfirmedEvent;
@@ -22,7 +24,6 @@ import es.redmic.vesselslib.events.vessel.update.UpdateVesselEvent; 
import es.redmic.vesselsview.model.Vessel;

import es.redmic.vesselsview.model.VesselType;

import es.redmic.vesselsview.service.VesselESService;

import es.redmic.vesselsview.utils.VesselEventFactory;

import es.redmic.viewlib.common.controller.RWController;

import es.redmic.viewlib.config.MapperScanBeanItfc;
@@ -58,17 +59,16 @@ public class VesselController extends RWController<Vessel, VesselDTO, MetadataQu 
		} catch (Exception e) {

			logger.error(

					"Error al procesar CreateVesselEvent para vessel " + event.getAggregateId() + " " + e.getMessage());

			publishFailedEvent(

					VesselEventFactory.getCreateVesselFailedEvent(event, ExceptionType.INTERNAL_EXCEPTION.name(), null),

					vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.CREATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_topic);

		}



		if (result.isSuccess()) {

			logger.info("Vessel creado en la vista");

			publishConfirmedEvent(new CreateVesselConfirmedEvent().buildFrom(event), vessel_topic);

		} else {

			publishFailedEvent(VesselEventFactory.getCreateVesselFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.CREATE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_topic);

		}

	}
@@ -82,17 +82,16 @@ public class VesselController extends RWController<Vessel, VesselDTO, MetadataQu 
		try {

			result = service.update(mapper.getMapperFacade().map(event.getVessel(), Vessel.class));

		} catch (Exception e) {

			publishFailedEvent(

					VesselEventFactory.getUpdateVesselFailedEvent(event, ExceptionType.INTERNAL_EXCEPTION.name(), null),

					vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.UPDATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_topic);

		}



		if (result.isSuccess()) {

			logger.info("Vessel modificado en la vista");

			publishConfirmedEvent(new UpdateVesselConfirmedEvent().buildFrom(event), vessel_topic);

		} else {

			publishFailedEvent(VesselEventFactory.getUpdateVesselFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.UPDATE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_topic);

		}

	}
@@ -107,17 +106,16 @@ public class VesselController extends RWController<Vessel, VesselDTO, MetadataQu 
			result = service.updateVesselTypeInVessel(event.getAggregateId(),

					mapper.getMapperFacade().map(event.getVesselType(), VesselType.class));

		} catch (Exception e) {

			publishFailedEvent(

					VesselEventFactory.getUpdateVesselFailedEvent(event, ExceptionType.INTERNAL_EXCEPTION.name(), null),

					vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.UPDATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_topic);

		}



		if (result.isSuccess()) {

			logger.info("Vessel modificado en la vista");

			publishConfirmedEvent(new UpdateVesselConfirmedEvent().buildFrom(event), vessel_topic);

		} else {

			publishFailedEvent(VesselEventFactory.getUpdateVesselFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.UPDATE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_topic);

		}

	}
@@ -131,9 +129,8 @@ public class VesselController extends RWController<Vessel, VesselDTO, MetadataQu 
		try {

			result = service.delete(event.getAggregateId());

		} catch (Exception e) {

			publishFailedEvent(

					VesselEventFactory.getDeleteVesselFailedEvent(event, ExceptionType.INTERNAL_EXCEPTION.name(), null),

					vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.DELETE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_topic);

		}



		if (result.isSuccess()) {
@@ -141,8 +138,8 @@ public class VesselController extends RWController<Vessel, VesselDTO, MetadataQu 
			logger.info("Vessel eliminado de la vista");

			publishConfirmedEvent(new DeleteVesselConfirmedEvent().buildFrom(event), vessel_topic);

		} else {

			publishFailedEvent(VesselEventFactory.getDeleteVesselFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_topic);

			publishFailedEvent(VesselEventFactory.getEvent(event, VesselEventTypes.DELETE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_topic);

		}

	}

vessels-view/src/main/java/es/redmic/vesselsview/controller/VesselTypeController.java

+11 −10
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ import es.redmic.exception.common.ExceptionType; 
import es.redmic.models.es.common.dto.EventApplicationResult;

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

import es.redmic.vesselslib.dto.vesseltype.VesselTypeDTO;

import es.redmic.vesselslib.events.vesseltype.VesselTypeEventFactory;

import es.redmic.vesselslib.events.vesseltype.VesselTypeEventTypes;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeConfirmedEvent;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeEvent;

import es.redmic.vesselslib.events.vesseltype.delete.DeleteVesselTypeConfirmedEvent;
@@ -22,7 +24,6 @@ import es.redmic.vesselslib.events.vesseltype.update.UpdateVesselTypeEvent; 
import es.redmic.vesselsview.config.MapperScanBean;

import es.redmic.vesselsview.model.VesselType;

import es.redmic.vesselsview.service.VesselTypeESService;

import es.redmic.vesselsview.utils.VesselTypeEventFactory;

import es.redmic.viewlib.common.controller.RWController;



@Controller
@@ -56,7 +57,7 @@ public class VesselTypeController extends RWController<VesselType, VesselTypeDTO 
		try {

			result = service.save(mapper.getMapperFacade().map(event.getVesselType(), VesselType.class));

		} catch (Exception e) {

			publishFailedEvent(VesselTypeEventFactory.getCreateVesselTypeFailedEvent(event,

			publishFailedEvent(VesselTypeEventFactory.getEvent(event, VesselTypeEventTypes.CREATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_type_topic);

		}
@@ -65,8 +66,8 @@ public class VesselTypeController extends RWController<VesselType, VesselTypeDTO 
			logger.info("Vessel type creado de la vista");

			publishConfirmedEvent(new CreateVesselTypeConfirmedEvent().buildFrom(event), vessel_type_topic);

		} else {

			publishFailedEvent(VesselTypeEventFactory.getCreateVesselTypeFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_type_topic);

			publishFailedEvent(VesselTypeEventFactory.getEvent(event, VesselTypeEventTypes.CREATE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_type_topic);

		}

	}
@@ -80,7 +81,7 @@ public class VesselTypeController extends RWController<VesselType, VesselTypeDTO 
		try {

			result = service.update(mapper.getMapperFacade().map(event.getVesselType(), VesselType.class));

		} catch (Exception e) {

			publishFailedEvent(VesselTypeEventFactory.getUpdateVesselTypeFailedEvent(event,

			publishFailedEvent(VesselTypeEventFactory.getEvent(event, VesselTypeEventTypes.UPDATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_type_topic);

		}
@@ -89,8 +90,8 @@ public class VesselTypeController extends RWController<VesselType, VesselTypeDTO 
			logger.info("Vessel type modificado en la vista");

			publishConfirmedEvent(new UpdateVesselTypeConfirmedEvent().buildFrom(event), vessel_type_topic);

		} else {

			publishFailedEvent(VesselTypeEventFactory.getUpdateVesselTypeFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_type_topic);

			publishFailedEvent(VesselTypeEventFactory.getEvent(event, VesselTypeEventTypes.UPDATE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_type_topic);

		}

	}
@@ -104,7 +105,7 @@ public class VesselTypeController extends RWController<VesselType, VesselTypeDTO 
		try {

			result = service.delete(event.getAggregateId());

		} catch (Exception e) {

			publishFailedEvent(VesselTypeEventFactory.getDeleteVesselTypeFailedEvent(event,

			publishFailedEvent(VesselTypeEventFactory.getEvent(event, VesselTypeEventTypes.DELETE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vessel_type_topic);

		}
@@ -113,8 +114,8 @@ public class VesselTypeController extends RWController<VesselType, VesselTypeDTO 
			logger.info("Vessel type eliminado de la vista");

			publishConfirmedEvent(new DeleteVesselTypeConfirmedEvent().buildFrom(event), vessel_type_topic);

		} else {

			publishFailedEvent(VesselTypeEventFactory.getDeleteVesselTypeFailedEvent(event, result.getExeptionType(),

					result.getExceptionArguments()), vessel_type_topic);

			publishFailedEvent(VesselTypeEventFactory.getEvent(event, VesselTypeEventTypes.DELETE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vessel_type_topic);

		}

	}

vessels-view/src/main/java/es/redmic/vesselsview/utils/VesselEventFactory.java

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
package es.redmic.vesselsview.utils;



import java.util.Map;



import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;



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

import es.redmic.vesselslib.events.vessel.create.CreateVesselFailedEvent;

import es.redmic.vesselslib.events.vessel.delete.DeleteVesselFailedEvent;

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



public abstract class VesselEventFactory {



	private static Logger logger = LogManager.getLogger();



	public static CreateVesselFailedEvent getCreateVesselFailedEvent(Event event, String exceptionType,

			Map<String, String> exceptionArguments) {



		logger.info("No se pudo crear Vessel en la vista");

		CreateVesselFailedEvent failedEvent = new CreateVesselFailedEvent().buildFrom(event);

		failedEvent.setExceptionType(exceptionType);

		failedEvent.setArguments(exceptionArguments);



		return failedEvent;

	}



	public static UpdateVesselFailedEvent getUpdateVesselFailedEvent(Event event, String exceptionType,

			Map<String, String> exceptionArguments) {



		logger.info("No se pudo modificar Vessel en la vista");

		UpdateVesselFailedEvent failedEvent = new UpdateVesselFailedEvent().buildFrom(event);

		failedEvent.setExceptionType(exceptionType);

		failedEvent.setArguments(exceptionArguments);



		return failedEvent;

	}



	public static DeleteVesselFailedEvent getDeleteVesselFailedEvent(Event event, String exceptionType,

			Map<String, String> exceptionArguments) {



		logger.info("No se pudo eliminar Vessel de la vista");

		DeleteVesselFailedEvent failedEvent = new DeleteVesselFailedEvent().buildFrom(event);

		failedEvent.setExceptionType(exceptionType);

		failedEvent.setArguments(exceptionArguments);



		return failedEvent;

	}

}

vessels-view/src/main/java/es/redmic/vesselsview/utils/VesselTypeEventFactory.java

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
package es.redmic.vesselsview.utils;



import java.util.Map;



import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;



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

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeFailedEvent;

import es.redmic.vesselslib.events.vesseltype.delete.DeleteVesselTypeFailedEvent;

import es.redmic.vesselslib.events.vesseltype.update.UpdateVesselTypeFailedEvent;



public abstract class VesselTypeEventFactory {



	private static Logger logger = LogManager.getLogger();



	public static CreateVesselTypeFailedEvent getCreateVesselTypeFailedEvent(Event event, String exceptionType,

			Map<String, String> exceptionArguments) {



		logger.info("No se pudo crear Vessel type en la vista");

		CreateVesselTypeFailedEvent failedEvent = new CreateVesselTypeFailedEvent().buildFrom(event);

		failedEvent.setExceptionType(exceptionType);

		failedEvent.setArguments(exceptionArguments);



		return failedEvent;

	}



	public static UpdateVesselTypeFailedEvent getUpdateVesselTypeFailedEvent(Event event, String exceptionType,

			Map<String, String> exceptionArguments) {



		logger.info("No se pudo modificar Vessel type en la vista");

		UpdateVesselTypeFailedEvent failedEvent = new UpdateVesselTypeFailedEvent().buildFrom(event);

		failedEvent.setExceptionType(exceptionType);

		failedEvent.setArguments(exceptionArguments);



		return failedEvent;

	}



	public static DeleteVesselTypeFailedEvent getDeleteVesselTypeFailedEvent(Event event, String exceptionType,

			Map<String, String> exceptionArguments) {



		logger.info("No se pudo eliminar Vessel type de la vista");

		DeleteVesselTypeFailedEvent failedEvent = new DeleteVesselTypeFailedEvent().buildFrom(event);

		failedEvent.setExceptionType(exceptionType);

		failedEvent.setArguments(exceptionArguments);



		return failedEvent;

	}

}