Commit 9ff360d0 authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia eventos finales para contener layer + tests 

De este modo, se mantiene el último layer dentro de topic para poder
usarlo en futuros cambios.
parent d9a6849a

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

+0 −37
Original line number Diff line number Diff line
@@ -26,11 +26,8 @@ import org.apache.logging.log4j.LogManager; 
import org.apache.logging.log4j.Logger;



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

import es.redmic.atlaslib.dto.layerwms.LayerWMSDTO;

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

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

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

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

import es.redmic.atlaslib.events.layer.create.CreateLayerCancelledEvent;

import es.redmic.atlaslib.events.layer.create.CreateLayerConfirmedEvent;

import es.redmic.atlaslib.events.layer.create.CreateLayerFailedEvent;
@@ -127,21 +124,6 @@ public class LayerEventFactory { 
			successfulEvent = new LayerUpdatedEvent().buildFrom(source);

		}



		if (successfulEvent != null) {



			successfulEvent.setLayer(layer);

			return successfulEvent;

		} else {



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

			throw new InternalException(ExceptionType.INTERNAL_EXCEPTION);

		}

	}



	public static Event getEvent(Event source, String type, LayerWMSDTO layer) {



		LayerRefreshEvent successfulEvent = null;



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



			logger.debug("Creando evento LayerRefreshedEvent para: " + source.getAggregateId());
@@ -227,25 +209,6 @@ public class LayerEventFactory { 
			cancelledEvent = new DeleteLayerCancelledEvent().buildFrom(source);

		}



		if (cancelledEvent != null) {



			cancelledEvent.setLayer(layer);

			cancelledEvent.setExceptionType(exceptionType);

			cancelledEvent.setArguments(exceptionArguments);

			return cancelledEvent;



		} else {



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

			throw new InternalException(ExceptionType.INTERNAL_EXCEPTION);

		}

	}



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

			Map<String, String> exceptionArguments) {



		LayerRefreshCancelledEvent cancelledEvent = null;



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



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

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

deleted100644 → 0
+0 −122
Original line number Diff line number Diff line 
package es.redmic.atlaslib.events.layer.common;



/*-

 * #%L

 * Atlas-lib

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import java.util.Map;



import org.joda.time.DateTime;

import org.joda.time.DateTimeZone;



import com.fasterxml.jackson.annotation.JsonIgnore;



import es.redmic.atlaslib.dto.layerwms.LayerWMSDTO;

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



public abstract class LayerRefreshCancelledEvent extends EventError {



	private LayerWMSDTO layer;



	public LayerRefreshCancelledEvent(String type) {

		super(type);

		this.setLayer(layer);

	}



	public LayerWMSDTO getLayer() {

		return layer;

	}



	public void setLayer(LayerWMSDTO layer) {

		this.layer = layer;

	}



	@Override

	public Object get(int field$) {

		switch (field$) {

		case 0:

			return getLayer();

		case 1:

			return getExceptionType();

		case 2:

			return getArguments();

		case 3:

			return getAggregateId();

		case 4:

			return getVersion();

		case 5:

			return getType();

		case 6:

			return getDate().getMillis();

		case 7:

			return getSessionId();

		case 8:

			return getUserId();

		case 9:

			return getId();

		default:

			throw new org.apache.avro.AvroRuntimeException("Bad index");

		}

	}



	@SuppressWarnings("rawtypes")

	@Override

	public void put(int field$, Object value$) {

		switch (field$) {

		case 0:

			layer = (LayerWMSDTO) value$;

			break;

		case 1:

			setExceptionType(value$.toString());

			break;

		case 2:

			setArguments((Map) value$);

			break;

		case 3:

			setAggregateId(value$.toString());

			break;

		case 4:

			setVersion((java.lang.Integer) value$);

			break;

		case 5:

			setType(value$.toString());

			break;

		case 6:

			setDate(new DateTime(value$, DateTimeZone.UTC));

			break;

		case 7:

			setSessionId(value$.toString());

			break;

		case 8:

			setUserId(value$.toString());

			break;

		case 9:

			setId(value$.toString());

			break;

		default:

			throw new org.apache.avro.AvroRuntimeException("Bad index");

		}

	}



	@JsonIgnore

	public static String getLayerEventSchema() {



		return "{\"name\":\"layer\", \"type\": " + LayerWMSDTO.SCHEMA$.toString() + "}";

	}

}

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

+4 −4
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ package es.redmic.atlaslib.events.layer.refresh; 


import org.apache.avro.Schema;



import es.redmic.atlaslib.dto.layerwms.LayerWMSDTO;

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

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

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

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



public class LayerRefreshedEvent extends LayerRefreshEvent {

public class LayerRefreshedEvent extends LayerEvent {



	// @formatter:off
@@ -42,7 +42,7 @@ public class LayerRefreshedEvent extends LayerRefreshEvent { 
		super(type);

	}



	public LayerRefreshedEvent(LayerWMSDTO layer) {

	public LayerRefreshedEvent(LayerDTO layer) {

		super(type);

		this.setLayer(layer);

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ package es.redmic.atlaslib.events.layer.refresh; 


import org.apache.avro.Schema;



import es.redmic.atlaslib.dto.layerwms.LayerWMSDTO;

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

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

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

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



public class RefreshLayerCancelledEvent extends LayerRefreshCancelledEvent {

public class RefreshLayerCancelledEvent extends LayerCancelledEvent {



	// @formatter:off
@@ -44,7 +44,7 @@ public class RefreshLayerCancelledEvent extends LayerRefreshCancelledEvent { 
		super(type);

	}



	public RefreshLayerCancelledEvent(LayerWMSDTO layer) {

	public RefreshLayerCancelledEvent(LayerDTO layer) {

		super(type);

		this.setLayer(layer);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public class LayerEventFactoryTest { 


		Event source = LayerDataUtil.getLayerRefreshedEvent();

		LayerRefreshedEvent event = (LayerRefreshedEvent) LayerEventFactory.getEvent(source, LayerEventTypes.REFRESHED,

				LayerDataUtil.getLayerWMS());

				LayerDataUtil.getLayer());



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

		assertNotNull(event.getLayer());
@@ -319,7 +319,7 @@ public class LayerEventFactoryTest { 
		Event source = LayerDataUtil.getRefreshEvent();



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

				LayerEventTypes.REFRESH_CANCELLED, LayerDataUtil.getLayerWMS(), exception.getExceptionType(),

				LayerEventTypes.REFRESH_CANCELLED, LayerDataUtil.getLayer(), exception.getExceptionType(),

				exception.getArguments());



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