diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java similarity index 98% rename from web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java index c55f999e..26f3f08a 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java @@ -29,8 +29,8 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(controllers = ChannelDetailsController.class) -class ChannelDetailsControllerIT { +@WebMvcTest(controllers = ChannelController.class) +class ChannelControllerIT { private static final String CHANNEL_PREFIX = "/api/channel/" + CHANNEL_ID.getShortChannelId(); @Autowired diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java similarity index 98% rename from web/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java rename to web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java index 62e56336..e0c19d37 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/channel/{channelId}") @Import(ObjectMapperConfiguration.class) -public class ChannelDetailsController { +public class ChannelController { private final ChannelService channelService; private final NodeService nodeService; private final Metrics metrics; @@ -35,7 +35,7 @@ public class ChannelDetailsController { private final OnChainCostService onChainCostService; private final FeeService feeService; - public ChannelDetailsController( + public ChannelController( ChannelService channelService, NodeService nodeService, BalanceService balanceService, diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java similarity index 90% rename from web/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java index 2f86292e..879ab35e 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java @@ -37,14 +37,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class ChannelDetailsControllerTest { +class ChannelControllerTest { private static final Coins OPEN_COSTS = Coins.ofSatoshis(1); private static final Coins CLOSE_COSTS = Coins.ofSatoshis(2); private static final OnChainCostsDto ON_CHAIN_COSTS = new OnChainCostsDto(OPEN_COSTS, CLOSE_COSTS); private static final FeeConfigurationDto FEE_CONFIGURATION_DTO = FeeConfigurationDto.createFrom(FEE_CONFIGURATION); @InjectMocks - private ChannelDetailsController channelDetailsController; + private ChannelController channelController; @Mock private ChannelService channelService; @@ -74,7 +74,7 @@ class ChannelDetailsControllerTest { @Test void getDetails_channel_not_found() { assertThatExceptionOfType(NotFoundException.class) - .isThrownBy(() -> channelDetailsController.getDetails(CHANNEL_ID)); + .isThrownBy(() -> channelController.getDetails(CHANNEL_ID)); } @Test @@ -91,7 +91,7 @@ class ChannelDetailsControllerTest { when(balanceService.getBalanceInformation(CHANNEL_ID)) .thenReturn(Optional.ofNullable(LOCAL_OPEN_CHANNEL.getBalanceInformation())); - assertThat(channelDetailsController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); + assertThat(channelController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); verify(metrics).mark(argThat(name -> name.endsWith(".getDetails"))); } @@ -109,19 +109,19 @@ class ChannelDetailsControllerTest { when(balanceService.getBalanceInformation(CHANNEL_ID)) .thenReturn(Optional.ofNullable(LOCAL_OPEN_CHANNEL_PRIVATE.getBalanceInformation())); - assertThat(channelDetailsController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); + assertThat(channelController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); } @Test void getDetails_closed() throws NotFoundException { ChannelDetailsDto expectedDetails = mockForChannelWithoutFeeConfiguration(CLOSED_CHANNEL); - assertThat(channelDetailsController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); + assertThat(channelController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); } @Test void getDetails_waiting_close() throws NotFoundException { ChannelDetailsDto expectedDetails = mockForChannelWithoutFeeConfiguration(WAITING_CLOSE_CHANNEL); - assertThat(channelDetailsController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); + assertThat(channelController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails); } private ChannelDetailsDto mockForChannelWithoutFeeConfiguration(LocalChannel channel) {