From b635708dd8c12019f4159c9be54bc877f35e0ad9 Mon Sep 17 00:00:00 2001 From: xstefank Date: Sat, 5 May 2018 16:29:27 +0200 Subject: [PATCH] Code cleanup --- docker-compose.yml | 1 - invoice-service/build.gradle | 1 - .../domain/service/InvoiceService.java | 2 +- .../InvoiceServiceApplicationTests.java | 18 ------------------ order-service/build.gradle | 1 - .../command/saga/ProcessShipmentCommand.java | 1 - .../controller/OrderSagaController.java | 4 ---- .../OrderServiceApplicationTests.java | 18 ------------------ .../QueryServiceApplicationTests.java | 18 ------------------ shipment-service/build.gradle | 1 - .../domain/ShipmentAggregate.java | 1 - .../ShipmentServiceApplicationTests.java | 18 ------------------ 12 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 invoice-service/src/test/java/org/learn/eventuate/invoiceservice/InvoiceServiceApplicationTests.java delete mode 100644 order-service/src/test/java/org/learn/eventuate/orderservice/OrderServiceApplicationTests.java delete mode 100644 query-service/src/test/java/org/learn/eventuate/queryservice/QueryServiceApplicationTests.java delete mode 100644 shipment-service/src/test/java/org/learn/eventuate/shipmentservice/ShipmentServiceApplicationTests.java diff --git a/docker-compose.yml b/docker-compose.yml index b3cb0b3..aed92b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -149,4 +149,3 @@ services: - ./data/db:/data/db ports: - 27017:27017 - #command: mongod --smallfiles --logpath=/dev/null # --quiet diff --git a/invoice-service/build.gradle b/invoice-service/build.gradle index b1b1d54..0a3311e 100644 --- a/invoice-service/build.gradle +++ b/invoice-service/build.gradle @@ -37,7 +37,6 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.16.18' -// compile('org.springframework.boot:spring-boot-starter-data-jpa') compile('org.springframework.boot:spring-boot-starter-web') compileOnly('org.projectlombok:lombok:1.16.18') diff --git a/invoice-service/src/main/java/org/learn/eventuate/invoiceservice/domain/service/InvoiceService.java b/invoice-service/src/main/java/org/learn/eventuate/invoiceservice/domain/service/InvoiceService.java index b6c1673..fa05e00 100644 --- a/invoice-service/src/main/java/org/learn/eventuate/invoiceservice/domain/service/InvoiceService.java +++ b/invoice-service/src/main/java/org/learn/eventuate/invoiceservice/domain/service/InvoiceService.java @@ -41,7 +41,7 @@ public CompletableFuture> prepareInvoic } public void compensateInvoice(ParticipantFailureInfo failureInfo) { - if (failureInfo.getId() == "N/A") { + if (failureInfo.getId().equals("N/A")) { confirmCompensation(failureInfo.getSagaId()); } aggregateRepository.update(failureInfo.getId(), new CompensateInvoiceCommand(failureInfo)); diff --git a/invoice-service/src/test/java/org/learn/eventuate/invoiceservice/InvoiceServiceApplicationTests.java b/invoice-service/src/test/java/org/learn/eventuate/invoiceservice/InvoiceServiceApplicationTests.java deleted file mode 100644 index f4e53b4..0000000 --- a/invoice-service/src/test/java/org/learn/eventuate/invoiceservice/InvoiceServiceApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.learn.eventuate.invoiceservice; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class InvoiceServiceApplicationTests { - - @Test - @Ignore - public void contextLoads() { - } - -} diff --git a/order-service/build.gradle b/order-service/build.gradle index 9f813b4..604706f 100644 --- a/order-service/build.gradle +++ b/order-service/build.gradle @@ -37,7 +37,6 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.16.18' -// compile('org.springframework.boot:spring-boot-starter-data-jpa') compile('org.springframework.boot:spring-boot-starter-web') compileOnly('org.projectlombok:lombok:1.16.18') diff --git a/order-service/src/main/java/org/learn/eventuate/orderservice/command/saga/ProcessShipmentCommand.java b/order-service/src/main/java/org/learn/eventuate/orderservice/command/saga/ProcessShipmentCommand.java index c4cbebc..7e15990 100644 --- a/order-service/src/main/java/org/learn/eventuate/orderservice/command/saga/ProcessShipmentCommand.java +++ b/order-service/src/main/java/org/learn/eventuate/orderservice/command/saga/ProcessShipmentCommand.java @@ -4,7 +4,6 @@ public class ProcessShipmentCommand implements OrderSagaCommand { - private ShipmentInfo shipmentInfo; public ProcessShipmentCommand(ShipmentInfo shipmentInfo) { diff --git a/order-service/src/main/java/org/learn/eventuate/orderservice/controller/OrderSagaController.java b/order-service/src/main/java/org/learn/eventuate/orderservice/controller/OrderSagaController.java index 61e16ba..d22538b 100644 --- a/order-service/src/main/java/org/learn/eventuate/orderservice/controller/OrderSagaController.java +++ b/order-service/src/main/java/org/learn/eventuate/orderservice/controller/OrderSagaController.java @@ -4,8 +4,6 @@ import org.learn.eventuate.coreapi.ParticipantFailureInfo; import org.learn.eventuate.coreapi.ShipmentInfo; import org.learn.eventuate.orderservice.domain.service.OrderSagaService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,8 +16,6 @@ public class OrderSagaController { @Autowired public OrderSagaService orderSagaService; - private Logger log = LoggerFactory.getLogger(OrderSagaController.class); - @RequestMapping(method = RequestMethod.POST, path = "/shipment") public String shipmentResponse(@RequestBody ShipmentInfo shipmentInfo) { diff --git a/order-service/src/test/java/org/learn/eventuate/orderservice/OrderServiceApplicationTests.java b/order-service/src/test/java/org/learn/eventuate/orderservice/OrderServiceApplicationTests.java deleted file mode 100644 index 955c79f..0000000 --- a/order-service/src/test/java/org/learn/eventuate/orderservice/OrderServiceApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.learn.eventuate.orderservice; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class OrderServiceApplicationTests { - - @Test - @Ignore - public void contextLoads() { - } - -} diff --git a/query-service/src/test/java/org/learn/eventuate/queryservice/QueryServiceApplicationTests.java b/query-service/src/test/java/org/learn/eventuate/queryservice/QueryServiceApplicationTests.java deleted file mode 100644 index c169fc8..0000000 --- a/query-service/src/test/java/org/learn/eventuate/queryservice/QueryServiceApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.learn.eventuate.queryservice; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class QueryServiceApplicationTests { - - @Test - @Ignore - public void contextLoads() { - } - -} diff --git a/shipment-service/build.gradle b/shipment-service/build.gradle index d985a8e..9c014e9 100644 --- a/shipment-service/build.gradle +++ b/shipment-service/build.gradle @@ -37,7 +37,6 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.16.18' -// compile('org.springframework.boot:spring-boot-starter-data-jpa') compile('org.springframework.boot:spring-boot-starter-web') compileOnly('org.projectlombok:lombok:1.16.18') diff --git a/shipment-service/src/main/java/org/learn/eventuate/shipmentservice/domain/ShipmentAggregate.java b/shipment-service/src/main/java/org/learn/eventuate/shipmentservice/domain/ShipmentAggregate.java index 13b0e4e..1bf129d 100644 --- a/shipment-service/src/main/java/org/learn/eventuate/shipmentservice/domain/ShipmentAggregate.java +++ b/shipment-service/src/main/java/org/learn/eventuate/shipmentservice/domain/ShipmentAggregate.java @@ -38,7 +38,6 @@ public List process(PrepareShipmentCommand command) { } public List process(CompensateShipmentCommand command) { - //shipment compensation log.info("shipment " + command.getFailureInfo().getId() + " compensated"); return EventUtil.events(new ConfirmShipmentCompensationEvent(command.getFailureInfo().getSagaId(), id)); diff --git a/shipment-service/src/test/java/org/learn/eventuate/shipmentservice/ShipmentServiceApplicationTests.java b/shipment-service/src/test/java/org/learn/eventuate/shipmentservice/ShipmentServiceApplicationTests.java deleted file mode 100644 index 74f4459..0000000 --- a/shipment-service/src/test/java/org/learn/eventuate/shipmentservice/ShipmentServiceApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.learn.eventuate.shipmentservice; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class ShipmentServiceApplicationTests { - - @Test - @Ignore - public void contextLoads() { - } - -}