Commit 7bfd98f1 authored by Noel Alonso's avatar Noel Alonso
Browse files

No envía item al crear la espera sino al resolver

parent 7e8bf000

atlas-commands/src/main/java/es/redmic/atlascommands/handler/CategoryCommandHandler.java

+5 −8
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ public class CategoryCommandHandler extends CommandHandler { 
		logger.debug("Aplicado evento: " + event.getType());



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<CategoryDTO> completableFuture = getCompletableFeature(event.getSessionId(),

				agg.getCategory());

		CompletableFuture<CategoryDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, categoryTopic);
@@ -169,8 +168,7 @@ public class CategoryCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<CategoryDTO> completableFuture = getCompletableFeature(event.getSessionId(),

				agg.getCategory());

		CompletableFuture<CategoryDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, categoryTopic);
@@ -197,8 +195,7 @@ public class CategoryCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<CategoryDTO> completableFuture = getCompletableFeature(event.getSessionId(),

				agg.getCategory());

		CompletableFuture<CategoryDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, categoryTopic);
@@ -214,7 +211,7 @@ public class CategoryCommandHandler extends CommandHandler { 


		// El evento Creado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getCategory());

	}



	@KafkaHandler
@@ -224,7 +221,7 @@ public class CategoryCommandHandler extends CommandHandler { 


		// El evento Modificado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getCategory());

	}



	@KafkaHandler

atlas-commands/src/main/java/es/redmic/atlascommands/handler/LayerCommandHandler.java

+7 −7
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class LayerCommandHandler extends CommandHandler { 
		logger.debug("Aplicado evento: " + event.getType());



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId(), agg.getLayer());

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, layerTopic);
@@ -181,7 +181,7 @@ public class LayerCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId(), agg.getLayer());

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, layerTopic);
@@ -208,7 +208,7 @@ public class LayerCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId(), agg.getLayer());

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, layerTopic);
@@ -234,7 +234,7 @@ public class LayerCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId(), agg.getLayer());

		CompletableFuture<LayerDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, layerTopic);
@@ -256,7 +256,7 @@ public class LayerCommandHandler extends CommandHandler { 


		// El evento Creado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getLayer());

	}



	@KafkaHandler
@@ -272,7 +272,7 @@ public class LayerCommandHandler extends CommandHandler { 


		// El evento Modificado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getLayer());

	}



	@KafkaHandler
@@ -282,7 +282,7 @@ public class LayerCommandHandler extends CommandHandler { 


		// El evento Refrescado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getLayer());

	}



	@KafkaHandler

atlas-commands/src/main/java/es/redmic/atlascommands/handler/ThemeInspireCommandHandler.java

+5 −8
Original line number Diff line number Diff line
@@ -145,8 +145,7 @@ public class ThemeInspireCommandHandler extends CommandHandler { 
		logger.debug("Aplicado evento: " + event.getType());



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<ThemeInspireDTO> completableFuture = getCompletableFeature(event.getSessionId(),

				agg.getThemeInspire());

		CompletableFuture<ThemeInspireDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, themeInspireTopic);
@@ -172,8 +171,7 @@ public class ThemeInspireCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<ThemeInspireDTO> completableFuture = getCompletableFeature(event.getSessionId(),

				agg.getThemeInspire());

		CompletableFuture<ThemeInspireDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, themeInspireTopic);
@@ -200,8 +198,7 @@ public class ThemeInspireCommandHandler extends CommandHandler { 
		agg.apply(event);



		// Crea la espera hasta que se responda con evento completado

		CompletableFuture<ThemeInspireDTO> completableFuture = getCompletableFeature(event.getSessionId(),

				agg.getThemeInspire());

		CompletableFuture<ThemeInspireDTO> completableFuture = getCompletableFeature(event.getSessionId());



		// Emite evento para enviar a kafka

		publishToKafka(event, themeInspireTopic);
@@ -217,7 +214,7 @@ public class ThemeInspireCommandHandler extends CommandHandler { 


		// El evento Creado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getThemeInspire());

	}



	@KafkaHandler
@@ -231,7 +228,7 @@ public class ThemeInspireCommandHandler extends CommandHandler { 


		// El evento Modificado se envía desde el stream



		resolveCommand(event.getSessionId());

		resolveCommand(event.getSessionId(), event.getThemeInspire());

	}



	@KafkaHandler

atlas-commands/src/test/java/es/redmic/test/atlascommands/integration/category/CategoryCommandHandlerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class CategoryCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<CategoryDTO> completableFuture = Whitebox.invokeMethod(categoryCommandHandler,

				"getCompletableFeature", event.getSessionId(), CategoryDataUtil.getCategory(code + "4"));

				"getCompletableFeature", event.getSessionId());



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(category_topic, event.getAggregateId(),

				event);
@@ -265,7 +265,7 @@ public class CategoryCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<CategoryDTO> completableFuture = Whitebox.invokeMethod(categoryCommandHandler,

				"getCompletableFeature", event.getSessionId(), CategoryDataUtil.getCategory(code + "5"));

				"getCompletableFeature", event.getSessionId());



		kafkaTemplate.send(category_topic, event.getAggregateId(), event);

		Event confirm = (Event) blockingQueue.poll(30, TimeUnit.SECONDS);
@@ -305,7 +305,7 @@ public class CategoryCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<CategoryDTO> completableFuture = Whitebox.invokeMethod(categoryCommandHandler,

				"getCompletableFeature", event.getSessionId(), categoryUpdateEvent.getCategory());

				"getCompletableFeature", event.getSessionId());



		kafkaTemplate.send(category_topic, event.getAggregateId(), event);

atlas-commands/src/test/java/es/redmic/test/atlascommands/integration/layer/LayerCommandHandlerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ public class LayerCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<LayerDTO> completableFuture = Whitebox.invokeMethod(layerCommandHandler,

				"getCompletableFeature", event.getSessionId(), LayerDataUtil.getLayer(code + "4"));

				"getCompletableFeature", event.getSessionId());



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(layer_topic, event.getAggregateId(),

				event);
@@ -382,7 +382,7 @@ public class LayerCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<LayerDTO> completableFuture = Whitebox.invokeMethod(layerCommandHandler,

				"getCompletableFeature", event.getSessionId(), LayerDataUtil.getLayer(code + "5"));

				"getCompletableFeature", event.getSessionId());



		kafkaTemplate.send(layer_topic, event.getAggregateId(), event);

		Event confirm = (Event) blockingQueue.poll(30, TimeUnit.SECONDS);
@@ -422,7 +422,7 @@ public class LayerCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<LayerDTO> completableFuture = Whitebox.invokeMethod(layerCommandHandler,

				"getCompletableFeature", event.getSessionId(), LayerDataUtil.getLayer(code + "5a"));

				"getCompletableFeature", event.getSessionId());



		kafkaTemplate.send(layer_topic, event.getAggregateId(), event);

		Event confirm = (Event) blockingQueue.poll(30, TimeUnit.SECONDS);
@@ -462,7 +462,7 @@ public class LayerCommandHandlerTest extends KafkaBaseIntegrationTest { 


		// Añade completableFeature para que se resuelva al recibir el mensaje.

		CompletableFuture<LayerDTO> completableFuture = Whitebox.invokeMethod(layerCommandHandler,

				"getCompletableFeature", event.getSessionId(), layerUpdateEvent.getLayer());

				"getCompletableFeature", event.getSessionId());



		kafkaTemplate.send(layer_topic, event.getAggregateId(), event);