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

Renombra clear events

parent 14a3faee
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ import es.redmic.exception.common.ExceptionType;
import es.redmic.exception.common.InternalException;
import es.redmic.usersettingslib.dto.PersistenceDTO;
import es.redmic.usersettingslib.dto.SelectionDTO;
import es.redmic.usersettingslib.events.clear.ClearCancelledEvent;
import es.redmic.usersettingslib.events.clear.ClearConfirmedEvent;
import es.redmic.usersettingslib.events.clear.ClearEvent;
import es.redmic.usersettingslib.events.clear.ClearFailedEvent;
import es.redmic.usersettingslib.events.clear.ClearedEvent;
import es.redmic.usersettingslib.events.clearselection.ClearSelectionCancelledEvent;
import es.redmic.usersettingslib.events.clearselection.ClearSelectionConfirmedEvent;
import es.redmic.usersettingslib.events.clearselection.ClearSelectionEvent;
import es.redmic.usersettingslib.events.clearselection.ClearSelectionFailedEvent;
import es.redmic.usersettingslib.events.clearselection.SelectionClearedEvent;
import es.redmic.usersettingslib.events.common.PersistenceCancelledEvent;
import es.redmic.usersettingslib.events.common.PersistenceEvent;
import es.redmic.usersettingslib.events.common.SelectionCancelledEvent;
@@ -84,7 +84,7 @@ public class SettingsEventFactory {
		if (type.equals(SettingsEventTypes.CLEAR)) {

			logger.debug("Creando evento ClearEvent para: " + source.getAggregateId());
			return new ClearEvent().buildFrom(source);
			return new ClearSelectionEvent().buildFrom(source);
		}

		if (type.equals(SettingsEventTypes.SAVE)) {
@@ -123,7 +123,7 @@ public class SettingsEventFactory {

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

			return new ClearConfirmedEvent().buildFrom(source);
			return new ClearSelectionConfirmedEvent().buildFrom(source);
		}

		if (type.equals(SettingsEventTypes.SAVE_CONFIRMED)) {
@@ -165,7 +165,7 @@ public class SettingsEventFactory {

		if (type.equals(SettingsEventTypes.CLEARED)) {
			logger.debug("Creando evento SettingsUpdatedEvent para: " + source.getAggregateId());
			successfulEvent = new ClearedEvent().buildFrom(source);
			successfulEvent = new SelectionClearedEvent().buildFrom(source);
		}

		if (successfulEvent != null) {
@@ -213,7 +213,7 @@ public class SettingsEventFactory {
		if (type.equals(SettingsEventTypes.CLEAR_FAILED)) {

			logger.debug("No se pudo limpiar la selección");
			failedEvent = new ClearFailedEvent().buildFrom(source);
			failedEvent = new ClearSelectionFailedEvent().buildFrom(source);
		}

		if (type.equals(SettingsEventTypes.SAVE_FAILED)) {
@@ -266,7 +266,7 @@ public class SettingsEventFactory {
		if (type.equals(SettingsEventTypes.CLEAR_CANCELLED)) {

			logger.debug("Creando evento ClearCancelledEvent para: " + source.getAggregateId());
			cancelledEvent = new ClearCancelledEvent().buildFrom(source);
			cancelledEvent = new ClearSelectionCancelledEvent().buildFrom(source);
		}

		if (cancelledEvent != null) {
+6 −6
Original line number Diff line number Diff line
package es.redmic.usersettingslib.events.clear;
package es.redmic.usersettingslib.events.clearselection;

import org.apache.avro.Schema;

@@ -26,13 +26,13 @@ import es.redmic.usersettingslib.events.common.SelectionCancelledEvent;
 * #L%
 */

public class ClearCancelledEvent extends SelectionCancelledEvent {
public class ClearSelectionCancelledEvent extends SelectionCancelledEvent {

	// @formatter:off

	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{"
		+ "\"type\":\"record\",\"name\":\"ClearCancelledEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clear\",\"fields\":["
		+ "\"type\":\"record\",\"name\":\"ClearSelectionCancelledEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clearselection\",\"fields\":["
			+ getSelectionEventSchema() + "," 
			+ getFailEventSchema() + ","
			+ getEventBaseSchema() + "]}");
@@ -40,11 +40,11 @@ public class ClearCancelledEvent extends SelectionCancelledEvent {

	static String type = SettingsEventTypes.CLEAR_CANCELLED;

	public ClearCancelledEvent() {
	public ClearSelectionCancelledEvent() {
		super(type);
	}

	public ClearCancelledEvent(SelectionDTO selection) {
	public ClearSelectionCancelledEvent(SelectionDTO selection) {
		super(type);
		this.setSelection(selection);
	}
+5 −5
Original line number Diff line number Diff line
package es.redmic.usersettingslib.events.clear;
package es.redmic.usersettingslib.events.clearselection;

import org.apache.avro.Schema;

@@ -25,19 +25,19 @@ import es.redmic.usersettingslib.events.SettingsEventTypes;
 * #L%
 */

public class ClearConfirmedEvent extends SimpleEvent {
public class ClearSelectionConfirmedEvent extends SimpleEvent {

	// @formatter:off

	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{"
		+ "\"type\":\"record\",\"name\":\"ClearConfirmedEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clear\",\"fields\":["
		+ "\"type\":\"record\",\"name\":\"ClearSelectionConfirmedEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clearselection\",\"fields\":["
			+ getEventBaseSchema() + "]}");
	// @formatter:on

	static String type = SettingsEventTypes.CLEAR_CONFIRMED;

	public ClearConfirmedEvent() {
	public ClearSelectionConfirmedEvent() {
		super(type);
	}

+6 −6
Original line number Diff line number Diff line
package es.redmic.usersettingslib.events.clear;
package es.redmic.usersettingslib.events.clearselection;

import java.util.UUID;

@@ -28,25 +28,25 @@ import es.redmic.usersettingslib.events.common.SelectionEvent;
 * #L%
 */

public class ClearEvent extends SelectionEvent {
public class ClearSelectionEvent extends SelectionEvent {

	// @formatter:off

	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{"
		+ "\"type\":\"record\",\"name\":\"ClearEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clear\",\"fields\":["
		+ "\"type\":\"record\",\"name\":\"ClearSelectionEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clearselection\",\"fields\":["
			+ getSelectionEventSchema() + ","
			+ getEventBaseSchema() + "]}");
	// @formatter:on

	static String type = SettingsEventTypes.CLEAR;

	public ClearEvent() {
	public ClearSelectionEvent() {
		super(type);
		setSessionId(UUID.randomUUID().toString());
	}

	public ClearEvent(SelectionDTO selection) {
	public ClearSelectionEvent(SelectionDTO selection) {
		super(type);
		this.setSelection(selection);
		setSessionId(UUID.randomUUID().toString());
+5 −5
Original line number Diff line number Diff line
package es.redmic.usersettingslib.events.clear;
package es.redmic.usersettingslib.events.clearselection;

import org.apache.avro.Schema;

@@ -25,20 +25,20 @@ import es.redmic.usersettingslib.events.SettingsEventTypes;
 * #L%
 */

public class ClearFailedEvent extends EventError {
public class ClearSelectionFailedEvent extends EventError {

	// @formatter:off

	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{"
		+ "\"type\":\"record\",\"name\":\"ClearFailedEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clear\",\"fields\":["
		+ "\"type\":\"record\",\"name\":\"ClearSelectionFailedEvent\","
				+ "\"namespace\":\"es.redmic.usersettingslib.events.clearselection\",\"fields\":["
			+ getFailEventSchema() + ","
			+ getEventBaseSchema() + "]}");
	// @formatter:on

	static String type = SettingsEventTypes.CLEAR_FAILED;

	public ClearFailedEvent() {
	public ClearSelectionFailedEvent() {
		super(type);
	}

Loading