From 59d984ec9683b741cd501b350aec3b3bd1065841 Mon Sep 17 00:00:00 2001
From: Carsten Otto <git@c-otto.de>
Date: Sat, 20 Nov 2021 19:53:47 +0100
Subject: [PATCH] remove "get alias" from legacy controller

---
 .../lndmanagej/controller/LegacyControllerIT.java   | 13 +------------
 .../lndmanagej/controller/LegacyController.java     |  6 ------
 .../lndmanagej/controller/LegacyControllerTest.java |  8 --------
 3 files changed, 1 insertion(+), 26 deletions(-)

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 d93a37b4..19cc8d91 100644
--- a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java
+++ b/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java
@@ -26,7 +26,6 @@ import static de.cotto.lndmanagej.model.ForceClosingChannelFixtures.FORCE_CLOSIN
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_3;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_TO_NODE_3;
-import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS;
 import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY;
 import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
 import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_3;
@@ -46,6 +45,7 @@ class LegacyControllerIT {
     private MockMvc mockMvc;
 
     @MockBean
+    @SuppressWarnings("unused")
     private NodeService nodeService;
 
     @MockBean
@@ -64,17 +64,6 @@ class LegacyControllerIT {
     @SuppressWarnings("unused")
     private Metrics metrics;
 
-    @Test
-    void getAlias() throws Exception {
-        when(nodeService.getAlias(PUBKEY)).thenReturn(ALIAS);
-        mockMvc.perform(get(PUBKEY_BASE + "/alias")).andExpect(content().string(ALIAS));
-    }
-
-    @Test
-    void getAlias_error() throws Exception {
-        mockMvc.perform(get("/legacy/node/xxx/alias")).andExpect(status().isBadRequest());
-    }
-
     @Test
     void getOpenChannelIds_for_peer() throws Exception {
         when(channelService.getOpenChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3));
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 75d3429b..eb076e27 100644
--- a/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java
+++ b/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java
@@ -47,12 +47,6 @@ public class LegacyController {
         this.metrics = metrics;
     }
 
-    @GetMapping("/node/{pubkey}/alias")
-    public String getAlias(@PathVariable Pubkey pubkey) {
-        mark("getAlias");
-        return nodeService.getAlias(pubkey);
-    }
-
     @GetMapping("/node/{pubkey}/open-channels")
     public String getOpenChannelIdsForPubkey(@PathVariable Pubkey pubkey) {
         mark("getOpenChannelIdsForPubkey");
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 3a53ab17..109d0e08 100644
--- a/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java
+++ b/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java
@@ -30,7 +30,6 @@ import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHAN
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_2;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_3;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_TO_NODE_3;
-import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS;
 import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2;
 import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_3;
 import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY;
@@ -64,13 +63,6 @@ class LegacyControllerTest {
     @Mock
     private Metrics metrics;
 
-    @Test
-    void getAlias() {
-        when(nodeService.getAlias(PUBKEY)).thenReturn(ALIAS);
-        assertThat(legacyController.getAlias(PUBKEY)).isEqualTo(ALIAS);
-        verify(metrics).mark(argThat(name -> name.endsWith(".getAlias")));
-    }
-
     @Test
     void getOpenChannelIds_for_peer() {
         when(channelService.getOpenChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3));