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

Añade eventos para resfrescar una capa + tests

Añade tipos nuevos.

Añade a eventFactory los métodos necesarios para obtener el evento según
el tipo enviado.
parent 27c95407
Loading
Loading
Loading
Loading
+73 −3
Original line number Diff line number Diff line
@@ -26,8 +26,11 @@ 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;
@@ -39,6 +42,10 @@ import es.redmic.atlaslib.events.layer.delete.DeleteLayerConfirmedEvent;
import es.redmic.atlaslib.events.layer.delete.DeleteLayerEvent;
import es.redmic.atlaslib.events.layer.delete.DeleteLayerFailedEvent;
import es.redmic.atlaslib.events.layer.delete.LayerDeletedEvent;
import es.redmic.atlaslib.events.layer.refresh.LayerRefreshedEvent;
import es.redmic.atlaslib.events.layer.refresh.RefreshLayerCancelledEvent;
import es.redmic.atlaslib.events.layer.refresh.RefreshLayerConfirmedEvent;
import es.redmic.atlaslib.events.layer.refresh.RefreshLayerFailedEvent;
import es.redmic.atlaslib.events.layer.update.LayerUpdatedEvent;
import es.redmic.atlaslib.events.layer.update.UpdateLayerCancelledEvent;
import es.redmic.atlaslib.events.layer.update.UpdateLayerConfirmedEvent;
@@ -93,6 +100,13 @@ 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);
	}
@@ -102,19 +116,44 @@ public class LayerEventFactory {
		LayerEvent successfulEvent = null;

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

			logger.debug("Creando evento LayerCreatedEvent para: " + source.getAggregateId());
			successfulEvent = new LayerCreatedEvent().buildFrom(source);
		}

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

			logger.debug("Creando evento LayerUpdatedEvent para: " + source.getAggregateId());
			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());
			successfulEvent = new LayerRefreshedEvent().buildFrom(source);
		}

		if (successfulEvent != null) {

			successfulEvent.setLayer(layer);
			return successfulEvent;
		} else {

			logger.error("Tipo de evento no soportado");
			throw new InternalException(ExceptionType.INTERNAL_EXCEPTION);
		}
@@ -127,20 +166,26 @@ public class LayerEventFactory {

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

			logger.debug("No se pudo crear Atlas type en la vista");
			logger.debug("No se pudo crear layer en la vista");
			failedEvent = new CreateLayerFailedEvent().buildFrom(source);
		}
		if (type.equals(LayerEventTypes.UPDATE_FAILED)) {

			logger.debug("No se pudo modificar Atlas type en la vista");
			logger.debug("No se pudo modificar layer en la vista");
			failedEvent = new UpdateLayerFailedEvent().buildFrom(source);
		}
		if (type.equals(LayerEventTypes.DELETE_FAILED)) {

			logger.debug("No se pudo eliminar Atlas type de la vista");
			logger.debug("No se pudo eliminar layer de la vista");
			failedEvent = new DeleteLayerFailedEvent().buildFrom(source);
		}

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

			logger.debug("No se pudo refrescar layer de la vista");
			failedEvent = new RefreshLayerFailedEvent().buildFrom(source);
		}

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

			logger.debug("Checkeo de eliminación fallido, el item está referenciado");
@@ -195,4 +240,29 @@ public class LayerEventFactory {
			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());
			cancelledEvent = new RefreshLayerCancelledEvent().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);
		}
	}
}
+14 −3
Original line number Diff line number Diff line
@@ -24,18 +24,29 @@ import es.redmic.brokerlib.avro.common.EventTypes;

public abstract class LayerEventTypes extends EventTypes {

	public static String
	// @formatter:off
		//REFRESH
		REFRESH = "REFRESH",
		REFRESH_CONFIRMED = "REFRESH_CONFIRMED",
		REFRESHED = "REFRESHED",
		REFRESH_FAILED = "REFRESH_FAILED",
		REFRESH_CANCELLED = "REFRESH_CANCELLED";
	//@formatter:on

	public static boolean isLocked(String eventType) {

		return EventTypes.isLocked(eventType);
		return !(eventType.equals(LayerEventTypes.REFRESHED.toString())
				|| eventType.equals(LayerEventTypes.REFRESHED.toString())) || EventTypes.isLocked(eventType);
	}

	public static boolean isSnapshot(String eventType) {

		return EventTypes.isSnapshot(eventType);
		return eventType.equals(LayerEventTypes.REFRESHED.toString()) || EventTypes.isSnapshot(eventType);
	}

	public static boolean isUpdatable(String eventType) {

		return EventTypes.isUpdatable(eventType);
		return (isSnapshot(eventType) && !eventType.equals(EventTypes.DELETED.toString()));
	}
}
+122 −0
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() + "}";
	}
}
+109 −0
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 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.Event;

public abstract class LayerRefreshEvent extends Event {

	private LayerWMSDTO layer;

	public LayerRefreshEvent(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 getAggregateId();
		case 2:
			return getVersion();
		case 3:
			return getType();
		case 4:
			return getDate().getMillis();
		case 5:
			return getSessionId();
		case 6:
			return getUserId();
		case 7:
			return getId();
		default:
			throw new org.apache.avro.AvroRuntimeException("Bad index");
		}
	}

	@Override
	public void put(int field$, Object value$) {
		switch (field$) {
		case 0:
			layer = (LayerWMSDTO) value$;
			break;
		case 1:
			setAggregateId(value$.toString());
			break;
		case 2:
			setVersion((java.lang.Integer) value$);
			break;
		case 3:
			setType(value$.toString());
			break;
		case 4:
			setDate(new DateTime(value$, DateTimeZone.UTC));
			break;
		case 5:
			setSessionId(value$.toString());
			break;
		case 6:
			setUserId(value$.toString());
			break;
		case 7:
			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() + "}";
	}
}
+0 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ package es.redmic.atlaslib.events.layer.create;

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.EventError;

@@ -43,10 +42,6 @@ public class CreateLayerCancelledEvent extends EventError {
		super(type);
	}

	public CreateLayerCancelledEvent(LayerDTO themeInspireType) {
		super(type);
	}

	@Override
	public Schema getSchema() {
		return SCHEMA$;
Loading