diff --git a/settings.gradle b/settings.gradle index 6ab02ca5..57640ab0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,7 @@ include 'selfpayments' include 'statistics' include 'transactions' include 'web' +include 'ui' include 'ui-demo' include 'grpc-adapter' include 'grpc-client' diff --git a/ui-demo/build.gradle b/ui-demo/build.gradle index b915051b..ecb6a995 100644 --- a/ui-demo/build.gradle +++ b/ui-demo/build.gradle @@ -3,10 +3,11 @@ plugins { } dependencies { - implementation project(':web') + implementation project(':ui') implementation project(':model') + implementation project(':web') implementation testFixtures(project(':model')) - implementation testFixtures(project(':web')) + implementation testFixtures(project(':ui')) } pitest { diff --git a/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java index 6e862cba..26e4d556 100644 --- a/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java @@ -2,15 +2,15 @@ package de.cotto.lndmanagej.ui.demo; import de.cotto.lndmanagej.controller.ChannelIdConverter; import de.cotto.lndmanagej.controller.PubkeyConverter; -import de.cotto.lndmanagej.ui.UiDataService; +import de.cotto.lndmanagej.ui.UiDataServiceImpl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; @Configuration @@ -21,17 +21,16 @@ import org.springframework.context.annotation.Import; HibernateJpaAutoConfiguration.class } ) -@ComponentScan(basePackages = {"de.cotto.lndmanagej.ui"}) +@ComponentScan( + basePackages = {"de.cotto.lndmanagej.ui"}, + excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = UiDataServiceImpl.class)} +) @Import({ChannelIdConverter.class, PubkeyConverter.class}) +@SuppressWarnings("PMD.UseUtilityClass") public class DemoApplication { public DemoApplication() { - // to satisfy pmd - } - - @Bean - public UiDataService demoData() { - return new DemoDataService(); + // default constructor } public static void main(String[] arguments) { diff --git a/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java index eb22c0ad..37dda87d 100644 --- a/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java @@ -8,6 +8,7 @@ import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.dto.StatusModel; +import org.springframework.stereotype.Component; import java.util.List; @@ -22,6 +23,7 @@ import static de.cotto.lndmanagej.ui.demo.utils.ChannelDetailsUtil.createChannel import static de.cotto.lndmanagej.ui.demo.utils.NodeDetailsUtil.createNodeDetails; import static de.cotto.lndmanagej.ui.demo.utils.NodeWarningsUtil.getStatusModel; +@Component public class DemoDataService extends UiDataService { public DemoDataService() { diff --git a/ui/build.gradle b/ui/build.gradle new file mode 100644 index 00000000..a1600041 --- /dev/null +++ b/ui/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'lnd-manageJ.java-library-conventions' +} + +dependencies { + implementation('org.springframework.boot:spring-boot-starter-web') + implementation('org.springframework.boot:spring-boot-starter-thymeleaf') + implementation project(':backend') + implementation project(':model') + implementation project(':web') + testImplementation testFixtures(project(':model')) + integrationTestImplementation project(':web') + integrationTestImplementation testFixtures(project(':model')) + integrationTestImplementation testFixtures(project(':ui')) + testFixturesImplementation project(':model') + testFixturesImplementation testFixtures(project(':model')) + testFixturesImplementation project(':web') +} diff --git a/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java new file mode 100644 index 00000000..7b1634de --- /dev/null +++ b/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java @@ -0,0 +1,10 @@ +package de.cotto.lndmanagej; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBootConfiguration { + public SpringBootConfiguration() { + // default constructor + } +} diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java similarity index 90% rename from web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java rename to ui/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java index abadd48f..181c642e 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java +++ b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java @@ -9,12 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import static de.cotto.lndmanagej.controller.dto.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static org.mockito.ArgumentMatchers.any; 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.status; @WebMvcTest(controllers = ChannelDetailsController.class) @@ -33,7 +33,7 @@ class ChannelDetailsControllerIT { @Test void node_details_page() throws Exception { when(pageService.channelDetails(any())).thenReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO)); - mockMvc.perform(get("/channel/" + CHANNEL_ID)) + mockMvc.perform(MockMvcRequestBuilders.get("/channel/" + CHANNEL_ID)) .andExpect(status().isOk()); } } diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java similarity index 100% rename from web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java rename to ui/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java similarity index 100% rename from web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java rename to ui/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java similarity index 99% rename from web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java rename to ui/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java index 0565f684..eef0b88b 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java +++ b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java @@ -27,7 +27,7 @@ import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHAN import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.WOS; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelPointFixtures.CHANNEL_POINT; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.when; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java b/ui/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java diff --git a/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java b/ui/src/main/java/de/cotto/lndmanagej/ui/UiDataServiceImpl.java similarity index 98% rename from web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/UiDataServiceImpl.java index cbb5a7b0..dcbc55b3 100644 --- a/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java +++ b/ui/src/main/java/de/cotto/lndmanagej/ui/UiDataServiceImpl.java @@ -1,4 +1,4 @@ -package de.cotto.lndmanagej; +package de.cotto.lndmanagej.ui; import de.cotto.lndmanagej.controller.ChannelController; import de.cotto.lndmanagej.controller.NodeController; @@ -15,7 +15,6 @@ import de.cotto.lndmanagej.model.Node; import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.service.ChannelService; import de.cotto.lndmanagej.service.NodeService; -import de.cotto.lndmanagej.ui.UiDataService; import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java b/ui/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java b/ui/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/NodeDetailsController.java b/ui/src/main/java/de/cotto/lndmanagej/ui/controller/NodeDetailsController.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/controller/NodeDetailsController.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/controller/NodeDetailsController.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java b/ui/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/dto/NodeDto.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/NodeDto.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/dto/NodeDto.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/dto/NodeDto.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/dto/OpenChannelDto.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/OpenChannelDto.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/dto/OpenChannelDto.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/dto/OpenChannelDto.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/dto/StatusModel.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/StatusModel.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/dto/StatusModel.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/dto/StatusModel.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/PageService.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/PageService.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/PageService.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/PageService.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelsPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelsPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelsPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelsPage.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/general/DashboardPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/DashboardPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/general/DashboardPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/general/DashboardPage.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/general/ErrorPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ErrorPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/general/ErrorPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ErrorPage.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/general/ThymeleafPage.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodesPage.java b/ui/src/main/java/de/cotto/lndmanagej/ui/page/node/NodesPage.java similarity index 100% rename from web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodesPage.java rename to ui/src/main/java/de/cotto/lndmanagej/ui/page/node/NodesPage.java diff --git a/web/src/main/resources/messages.properties b/ui/src/main/resources/messages.properties similarity index 100% rename from web/src/main/resources/messages.properties rename to ui/src/main/resources/messages.properties diff --git a/web/src/main/resources/messages_de.properties b/ui/src/main/resources/messages_de.properties similarity index 100% rename from web/src/main/resources/messages_de.properties rename to ui/src/main/resources/messages_de.properties diff --git a/web/src/main/resources/static/css/bootstrap.min.css b/ui/src/main/resources/static/css/bootstrap.min.css similarity index 100% rename from web/src/main/resources/static/css/bootstrap.min.css rename to ui/src/main/resources/static/css/bootstrap.min.css diff --git a/web/src/main/resources/static/css/bootstrap.min.css.map b/ui/src/main/resources/static/css/bootstrap.min.css.map similarity index 100% rename from web/src/main/resources/static/css/bootstrap.min.css.map rename to ui/src/main/resources/static/css/bootstrap.min.css.map diff --git a/web/src/main/resources/static/css/layout.css b/ui/src/main/resources/static/css/layout.css similarity index 100% rename from web/src/main/resources/static/css/layout.css rename to ui/src/main/resources/static/css/layout.css diff --git a/web/src/main/resources/static/css/main.css b/ui/src/main/resources/static/css/main.css similarity index 100% rename from web/src/main/resources/static/css/main.css rename to ui/src/main/resources/static/css/main.css diff --git a/web/src/main/resources/static/images/favicon.png b/ui/src/main/resources/static/images/favicon.png similarity index 100% rename from web/src/main/resources/static/images/favicon.png rename to ui/src/main/resources/static/images/favicon.png diff --git a/web/src/main/resources/static/js/bootstrap.bundle.min.js b/ui/src/main/resources/static/js/bootstrap.bundle.min.js similarity index 100% rename from web/src/main/resources/static/js/bootstrap.bundle.min.js rename to ui/src/main/resources/static/js/bootstrap.bundle.min.js diff --git a/web/src/main/resources/static/js/chart.min.js b/ui/src/main/resources/static/js/chart.min.js similarity index 100% rename from web/src/main/resources/static/js/chart.min.js rename to ui/src/main/resources/static/js/chart.min.js diff --git a/web/src/main/resources/static/js/dashboard.js b/ui/src/main/resources/static/js/dashboard.js similarity index 100% rename from web/src/main/resources/static/js/dashboard.js rename to ui/src/main/resources/static/js/dashboard.js diff --git a/web/src/main/resources/static/js/feather.min.js b/ui/src/main/resources/static/js/feather.min.js similarity index 100% rename from web/src/main/resources/static/js/feather.min.js rename to ui/src/main/resources/static/js/feather.min.js diff --git a/web/src/main/resources/templates/channel-details.html b/ui/src/main/resources/templates/channel-details.html similarity index 100% rename from web/src/main/resources/templates/channel-details.html rename to ui/src/main/resources/templates/channel-details.html diff --git a/web/src/main/resources/templates/channels.html b/ui/src/main/resources/templates/channels.html similarity index 100% rename from web/src/main/resources/templates/channels.html rename to ui/src/main/resources/templates/channels.html diff --git a/web/src/main/resources/templates/dashboard.html b/ui/src/main/resources/templates/dashboard.html similarity index 100% rename from web/src/main/resources/templates/dashboard.html rename to ui/src/main/resources/templates/dashboard.html diff --git a/web/src/main/resources/templates/error.html b/ui/src/main/resources/templates/error.html similarity index 100% rename from web/src/main/resources/templates/error.html rename to ui/src/main/resources/templates/error.html diff --git a/web/src/main/resources/templates/fragments/channel-collections.html b/ui/src/main/resources/templates/fragments/channel-collections.html similarity index 100% rename from web/src/main/resources/templates/fragments/channel-collections.html rename to ui/src/main/resources/templates/fragments/channel-collections.html diff --git a/web/src/main/resources/templates/fragments/icons.html b/ui/src/main/resources/templates/fragments/icons.html similarity index 100% rename from web/src/main/resources/templates/fragments/icons.html rename to ui/src/main/resources/templates/fragments/icons.html diff --git a/web/src/main/resources/templates/fragments/layout.html b/ui/src/main/resources/templates/fragments/layout.html similarity index 100% rename from web/src/main/resources/templates/fragments/layout.html rename to ui/src/main/resources/templates/fragments/layout.html diff --git a/web/src/main/resources/templates/fragments/node-collections.html b/ui/src/main/resources/templates/fragments/node-collections.html similarity index 100% rename from web/src/main/resources/templates/fragments/node-collections.html rename to ui/src/main/resources/templates/fragments/node-collections.html diff --git a/web/src/main/resources/templates/fragments/tiles.html b/ui/src/main/resources/templates/fragments/tiles.html similarity index 100% rename from web/src/main/resources/templates/fragments/tiles.html rename to ui/src/main/resources/templates/fragments/tiles.html diff --git a/web/src/main/resources/templates/node-details.html b/ui/src/main/resources/templates/node-details.html similarity index 100% rename from web/src/main/resources/templates/node-details.html rename to ui/src/main/resources/templates/node-details.html diff --git a/web/src/main/resources/templates/nodes.html b/ui/src/main/resources/templates/nodes.html similarity index 100% rename from web/src/main/resources/templates/nodes.html rename to ui/src/main/resources/templates/nodes.html diff --git a/web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java b/ui/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java similarity index 99% rename from web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java rename to ui/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java index c5f8dbbe..7ec25e84 100644 --- a/web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java +++ b/ui/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java @@ -16,6 +16,7 @@ import de.cotto.lndmanagej.controller.dto.PoliciesDto; import de.cotto.lndmanagej.controller.dto.RebalanceReportDto; import de.cotto.lndmanagej.service.ChannelService; import de.cotto.lndmanagej.service.NodeService; +import de.cotto.lndmanagej.ui.UiDataServiceImpl; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.dto.StatusModel; diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/UiDataServiceTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/UiDataServiceTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/UiDataServiceTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/UiDataServiceTest.java diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsControllerTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsControllerTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsControllerTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsControllerTest.java diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/controller/DashboardControllerTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/controller/DashboardControllerTest.java similarity index 95% rename from web/src/test/java/de/cotto/lndmanagej/ui/controller/DashboardControllerTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/controller/DashboardControllerTest.java index 68269af9..6a41adf5 100644 --- a/web/src/test/java/de/cotto/lndmanagej/ui/controller/DashboardControllerTest.java +++ b/ui/src/test/java/de/cotto/lndmanagej/ui/controller/DashboardControllerTest.java @@ -1,6 +1,7 @@ package de.cotto.lndmanagej.ui.controller; import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; +import de.cotto.lndmanagej.controller.dto.NodesAndChannelsWithWarningsDto; import de.cotto.lndmanagej.controller.dto.PoliciesDto; import de.cotto.lndmanagej.model.BalanceInformation; import de.cotto.lndmanagej.model.Coins; @@ -21,7 +22,6 @@ import org.springframework.ui.Model; import java.util.List; import java.util.Map; -import static de.cotto.lndmanagej.controller.dto.NodesAndChannelsWithWarningsDto.NONE; import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.REMOTE_BALANCE; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; @@ -48,7 +48,7 @@ class DashboardControllerTest { @Test void dashboard() { - StatusModel statusModel = new StatusModel(true, 213, NONE); + StatusModel statusModel = new StatusModel(true, 213, NodesAndChannelsWithWarningsDto.NONE); when(pageService.dashboard()).thenReturn(new DashboardPage(List.of(), List.of(), statusModel)); assertThat(dashboardController.dashboard(model)).isEqualTo("dashboard"); verify(model).addAllAttributes( diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/controller/NodeDetailsControllerTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/controller/NodeDetailsControllerTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/controller/NodeDetailsControllerTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/controller/NodeDetailsControllerTest.java diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/controller/SearchControllerTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/controller/SearchControllerTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/controller/SearchControllerTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/controller/SearchControllerTest.java diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/page/PageServiceTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/page/PageServiceTest.java similarity index 100% rename from web/src/test/java/de/cotto/lndmanagej/ui/page/PageServiceTest.java rename to ui/src/test/java/de/cotto/lndmanagej/ui/page/PageServiceTest.java diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java b/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java similarity index 100% rename from web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java rename to ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java b/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java similarity index 100% rename from web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java rename to ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java b/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java similarity index 100% rename from web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java rename to ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java diff --git a/web/build.gradle b/web/build.gradle index 637ced56..1f999b7d 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -4,7 +4,6 @@ plugins { dependencies { implementation('org.springframework.boot:spring-boot-starter-web') - implementation('org.springframework.boot:spring-boot-starter-thymeleaf') implementation project(':backend') implementation project(':pickhardt-payments') implementation project(':model') @@ -14,7 +13,5 @@ dependencies { integrationTestImplementation('org.springframework.boot:spring-boot-starter-web') integrationTestImplementation project(':backend') integrationTestImplementation testFixtures(project(':model')) - integrationTestImplementation testFixtures(project(':web')) integrationTestImplementation testFixtures(project(':pickhardt-payments')) - testFixturesImplementation testFixtures(project(':model')) } diff --git a/web/src/test/java/de/cotto/lndmanagej/dto/SelfPaymentsDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/SelfPaymentsDtoTest.java similarity index 92% rename from web/src/test/java/de/cotto/lndmanagej/dto/SelfPaymentsDtoTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/dto/SelfPaymentsDtoTest.java index 8cf80762..41fe955a 100644 --- a/web/src/test/java/de/cotto/lndmanagej/dto/SelfPaymentsDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/SelfPaymentsDtoTest.java @@ -1,6 +1,5 @@ -package de.cotto.lndmanagej.dto; +package de.cotto.lndmanagej.controller.dto; -import de.cotto.lndmanagej.controller.dto.SelfPaymentsDto; import org.junit.jupiter.api.Test; import java.util.List;