diff --git a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java b/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java index f8d4205b..de503403 100644 --- a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java +++ b/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java @@ -14,11 +14,9 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; -import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; @WebMvcTest(controllers = LegacyController.class) class LegacyControllerIT { @@ -43,7 +41,6 @@ class LegacyControllerIT { void getOpenChannelIds() throws Exception { when(nodeService.getOpenChannelIds(PUBKEY)).thenReturn(List.of(CHANNEL_ID, CHANNEL_ID_3)); mockMvc.perform(get("/api/node/" + PUBKEY + "/open-channels")) - .andExpect(jsonPath("$[0]", is(CHANNEL_ID.toString()))) - .andExpect(jsonPath("$[1]", is(CHANNEL_ID_3.toString()))); + .andExpect(content().string(CHANNEL_ID + "\n" + CHANNEL_ID_3)); } } \ No newline at end of file diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java b/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java index d3c7718d..af0202da 100644 --- a/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java +++ b/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java @@ -8,12 +8,12 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; import java.util.stream.Collectors; @RestController @RequestMapping("/api/node/{pubkey}/") public class LegacyController { + private static final String NEWLINE = "\n"; private final NodeService nodeService; public LegacyController(NodeService nodeService) { @@ -26,9 +26,9 @@ public class LegacyController { } @GetMapping("/open-channels") - public List getOpenChannelIds(@PathVariable Pubkey pubkey) { + public String getOpenChannelIds(@PathVariable Pubkey pubkey) { return nodeService.getOpenChannelIds(pubkey).stream() .map(ChannelId::toString) - .collect(Collectors.toList()); + .collect(Collectors.joining(NEWLINE)); } } diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java b/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java index acad7639..324867dd 100644 --- a/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java +++ b/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java @@ -32,11 +32,9 @@ class LegacyControllerTest { @Test void getOpenChannelIds() { - // jq is confused by large numbers, return string instead when(nodeService.getOpenChannelIds(PUBKEY)).thenReturn(List.of(CHANNEL_ID, CHANNEL_ID_3)); - assertThat(legacyController.getOpenChannelIds(PUBKEY)).containsExactly( - CHANNEL_ID.toString(), - CHANNEL_ID_3.toString() + assertThat(legacyController.getOpenChannelIds(PUBKEY)).isEqualTo( + CHANNEL_ID + "\n" + CHANNEL_ID_3 ); } } \ No newline at end of file