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

Añade layer en evento para retornarlo de la vista 

Adapta tests
parent 9ff360d0

atlas-lib/src/main/java/es/redmic/atlaslib/events/layer/LayerEventFactory.java

+7 −7
Original line number Diff line number Diff line
@@ -97,13 +97,6 @@ public class LayerEventFactory { 
			return new LayerDeletedEvent().buildFrom(source);

		}



		if (type.equals(LayerEventTypes.REFRESH_CONFIRMED)) {



			logger.debug("Creando evento RefreshLayerConfirmedEvent para: " + source.getAggregateId());



			return new RefreshLayerConfirmedEvent().buildFrom(source);

		}



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

		throw new InternalException(ExceptionType.INTERNAL_EXCEPTION);

	}
@@ -124,6 +117,13 @@ public class LayerEventFactory { 
			successfulEvent = new LayerUpdatedEvent().buildFrom(source);

		}



		if (type.equals(LayerEventTypes.REFRESH_CONFIRMED)) {



			logger.debug("Creando evento RefreshLayerConfirmedEvent para: " + source.getAggregateId());



			successfulEvent = new RefreshLayerConfirmedEvent().buildFrom(source);

		}



		if (type.equals(LayerEventTypes.REFRESHED)) {



			logger.debug("Creando evento LayerRefreshedEvent para: " + source.getAggregateId());

atlas-lib/src/main/java/es/redmic/atlaslib/events/layer/refresh/RefreshLayerConfirmedEvent.java

+9 −3
Original line number Diff line number Diff line
@@ -22,17 +22,18 @@ package es.redmic.atlaslib.events.layer.refresh; 


import org.apache.avro.Schema;



import es.redmic.atlaslib.dto.layer.LayerDTO;

import es.redmic.atlaslib.events.layer.LayerEventTypes;

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

import es.redmic.atlaslib.events.layer.common.LayerEvent;



public class RefreshLayerConfirmedEvent extends SimpleEvent {

public class RefreshLayerConfirmedEvent extends LayerEvent {



	// @formatter:off



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

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

				+ "\"namespace\":\"es.redmic.atlaslib.events.layer.refresh\",\"fields\":["

			+ getEventBaseSchema() + "]}");

			+ getLayerEventSchema() + "," + getEventBaseSchema() + "]}");

	// @formatter:on



	static String type = LayerEventTypes.REFRESH_CONFIRMED;
@@ -41,6 +42,11 @@ public class RefreshLayerConfirmedEvent extends SimpleEvent { 
		super(type);

	}



	public RefreshLayerConfirmedEvent(LayerDTO layer) {

		super(type);

		this.setLayer(layer);

	}



	@Override

	public Schema getSchema() {

		return SCHEMA$;

atlas-lib/src/test/java/es/redmic/atlaslib/unit/events/layer/LayerEventFactoryTest.java

+12 −12
Original line number Diff line number Diff line
@@ -122,18 +122,6 @@ public class LayerEventFactoryTest { 
		checkMetadataFields(source, event);

	}



	@Test

	public void GetEvent_ReturnRefreshLayerConfirmedEvent_IfTypeIsRefreshConfirmed() {



		Event source = LayerDataUtil.getRefreshLayerConfirmedEvent();

		RefreshLayerConfirmedEvent event = (RefreshLayerConfirmedEvent) LayerEventFactory.getEvent(source,

				LayerEventTypes.REFRESH_CONFIRMED);



		assertEquals(LayerEventTypes.REFRESH_CONFIRMED, event.getType());



		checkMetadataFields(source, event);

	}



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



	@Test
@@ -175,6 +163,18 @@ public class LayerEventFactoryTest { 
		checkMetadataFields(source, event);

	}



	@Test

	public void GetEvent_ReturnRefreshLayerConfirmedEvent_IfTypeIsRefreshConfirmed() {



		Event source = LayerDataUtil.getRefreshLayerConfirmedEvent();

		RefreshLayerConfirmedEvent event = (RefreshLayerConfirmedEvent) LayerEventFactory.getEvent(source,

				LayerEventTypes.REFRESH_CONFIRMED, LayerDataUtil.getLayer());



		assertEquals(LayerEventTypes.REFRESH_CONFIRMED, event.getType());



		checkMetadataFields(source, event);

	}



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



	@Test

atlas-lib/src/test/java/es/redmic/atlaslib/unit/utils/LayerDataUtil.java

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ public abstract class LayerDataUtil { 


		RefreshLayerConfirmedEvent event = new RefreshLayerConfirmedEvent().buildFrom(getRefreshEvent());

		event.setType(LayerEventTypes.REFRESH_CONFIRMED);

		event.setLayer(getLayer());

		return event;

	}