From e101493a008f3fd2b2e97aa9f22a9b4e5dc4945a Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Mon, 5 May 2025 11:11:53 +0200 Subject: [PATCH] Rename a method and expose channel in Updater --- .../eu/m724/jarupdater/live/MetadataFacade.java | 2 +- .../java/eu/m724/jarupdater/updater/Updater.java | 13 +++++++++++-- .../java/eu/m724/jarupdater/live/MetadataTest.java | 2 +- .../eu/m724/jarupdater/updater/UpdaterTest.java | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/m724/jarupdater/live/MetadataFacade.java b/src/main/java/eu/m724/jarupdater/live/MetadataFacade.java index 575477a..fe55630 100644 --- a/src/main/java/eu/m724/jarupdater/live/MetadataFacade.java +++ b/src/main/java/eu/m724/jarupdater/live/MetadataFacade.java @@ -17,7 +17,7 @@ public class MetadataFacade { this.metadataDao = metadataDao; } - public CompletableFuture> getChannels() { + public CompletableFuture> listChannels() { if (channels == null) channels = metadataDao.getChannels(); diff --git a/src/main/java/eu/m724/jarupdater/updater/Updater.java b/src/main/java/eu/m724/jarupdater/updater/Updater.java index 18bfa0b..03a78c7 100644 --- a/src/main/java/eu/m724/jarupdater/updater/Updater.java +++ b/src/main/java/eu/m724/jarupdater/updater/Updater.java @@ -30,11 +30,20 @@ public class Updater { } /** - * Get all channels + * List all channels * @return A future which returns the list of all channels */ - public CompletableFuture> getChannels() { return metadataProvider.getChannels(); } + public CompletableFuture> listChannels() { + return metadataProvider.listChannels(); + } + /** + * Gets the configured update channel + * @return the configured update channel + */ + public String getChannel() { + return environment.getChannel(); + } /** * Get the latest available version diff --git a/src/test/java/eu/m724/jarupdater/live/MetadataTest.java b/src/test/java/eu/m724/jarupdater/live/MetadataTest.java index d556f58..201b8c1 100644 --- a/src/test/java/eu/m724/jarupdater/live/MetadataTest.java +++ b/src/test/java/eu/m724/jarupdater/live/MetadataTest.java @@ -19,7 +19,7 @@ public class MetadataTest { MetadataDAO dao = new MockMetadataDAO(); MetadataFacade facade = new MetadataFacade(environment, dao); - assert facade.getChannels().join().contains(environment.getChannel()); + assert facade.listChannels().join().contains(environment.getChannel()); Version cur = facade.getCurrentVersionMetadata().join(); Version lat = facade.getLatestVersionMetadata().join(); diff --git a/src/test/java/eu/m724/jarupdater/updater/UpdaterTest.java b/src/test/java/eu/m724/jarupdater/updater/UpdaterTest.java index 7378266..8ead3ed 100644 --- a/src/test/java/eu/m724/jarupdater/updater/UpdaterTest.java +++ b/src/test/java/eu/m724/jarupdater/updater/UpdaterTest.java @@ -41,7 +41,7 @@ public class UpdaterTest { @Test public void testChannels() { - List channels = updater.getChannels().join(); + List channels = updater.listChannels().join(); assertEquals(channels, Arrays.asList("stable", "beta", "alpha")); }