From 874e8fffa627714a5a69ff1677cb3a92523c8097 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Mon, 22 Nov 2021 20:24:13 +0100 Subject: [PATCH] restructure project --- application/build.gradle | 14 ++++---------- backend/build.gradle | 12 ++++++++++++ .../cotto/lndmanagej/service/BalanceService.java | 0 .../lndmanagej/service/ChannelIdResolverImpl.java | 0 .../cotto/lndmanagej/service/ChannelService.java | 0 .../de/cotto/lndmanagej/service/FeeService.java | 0 .../de/cotto/lndmanagej/service/NodeService.java | 0 .../lndmanagej/service/OnChainCostService.java | 0 .../service/OpenInitiatorResolverImpl.java | 0 .../cotto/lndmanagej/service/OwnNodeService.java | 0 .../service/TransactionBackgroundLoader.java | 0 .../lndmanagej/service/BalanceServiceTest.java | 0 .../service/ChannelIdResolverImplTest.java | 0 .../lndmanagej/service/ChannelServiceTest.java | 0 .../cotto/lndmanagej/service/FeeServiceTest.java | 0 .../cotto/lndmanagej/service/NodeServiceTest.java | 0 .../lndmanagej/service/OnChainCostServiceTest.java | 0 .../service/OpenInitiatorResolverImplTest.java | 0 .../lndmanagej/service/OwnNodeServiceTest.java | 0 .../service/TransactionBackgroundLoaderTest.java | 0 settings.gradle | 8 +++++--- web/build.gradle | 14 ++++++++++++++ .../cotto/lndmanagej/SpringBootConfiguration.java | 10 ++++++++++ .../controller/ChannelDetailsControllerIT.java | 0 .../lndmanagej/controller/LegacyControllerIT.java | 0 .../lndmanagej/controller/NodeControllerIT.java | 0 .../controller/OnChainCostsControllerIT.java | 0 .../lndmanagej/controller/StatusControllerIT.java | 0 .../controller/ChannelDetailsController.java | 0 .../lndmanagej/controller/ChannelIdConverter.java | 0 .../cotto/lndmanagej/controller/CostException.java | 0 .../controller/CostExceptionHandler.java | 0 .../lndmanagej/controller/LegacyController.java | 0 .../lndmanagej/controller/NodeController.java | 0 .../lndmanagej/controller/NotFoundException.java | 0 .../controller/NotFoundExceptionHandler.java | 0 .../controller/OnChainCostsController.java | 0 .../lndmanagej/controller/PubkeyConverter.java | 0 .../lndmanagej/controller/StatusController.java | 0 .../controller/dto/BalanceInformationDto.java | 0 .../controller/dto/ChannelDetailsDto.java | 0 .../controller/dto/ChannelsForNodeDto.java | 0 .../lndmanagej/controller/dto/NodeDetailsDto.java | 0 .../controller/dto/ObjectMapperConfiguration.java | 0 .../lndmanagej/controller/dto/OnChainCostsDto.java | 0 .../controller/ChannelDetailsControllerTest.java | 0 .../controller/ChannelIdConverterTest.java | 0 .../controller/CostExceptionHandlerTest.java | 0 .../controller/LegacyControllerTest.java | 0 .../lndmanagej/controller/NodeControllerTest.java | 2 +- .../controller/NotFoundExceptionHandlerTest.java | 0 .../controller/OnChainCostsControllerTest.java | 0 .../lndmanagej/controller/PubkeyConverterTest.java | 0 .../controller/StatusControllerTest.java | 0 .../controller/dto/BalanceInformationDtoTest.java | 0 55 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 backend/build.gradle rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/BalanceService.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/ChannelIdResolverImpl.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/ChannelService.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/FeeService.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/NodeService.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImpl.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/OwnNodeService.java (100%) rename {application => backend}/src/main/java/de/cotto/lndmanagej/service/TransactionBackgroundLoader.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/ChannelIdResolverImplTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/FeeServiceTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/NodeServiceTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImplTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/OwnNodeServiceTest.java (100%) rename {application => backend}/src/test/java/de/cotto/lndmanagej/service/TransactionBackgroundLoaderTest.java (100%) create mode 100644 web/build.gradle create mode 100644 web/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java rename {application => web}/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java (100%) rename {application => web}/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java (100%) rename {application => web}/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java (100%) rename {application => web}/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java (100%) rename {application => web}/src/integrationTest/java/de/cotto/lndmanagej/controller/StatusControllerIT.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/ChannelIdConverter.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/CostException.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/CostExceptionHandler.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/NodeController.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/NotFoundException.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandler.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/PubkeyConverter.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/StatusController.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDto.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelsForNodeDto.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/dto/ObjectMapperConfiguration.java (100%) rename {application => web}/src/main/java/de/cotto/lndmanagej/controller/dto/OnChainCostsDto.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/CostExceptionHandlerTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java (99%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandlerTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/PubkeyConverterTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/StatusControllerTest.java (100%) rename {application => web}/src/test/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDtoTest.java (100%) diff --git a/application/build.gradle b/application/build.gradle index 6ae69207..22fc4983 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -3,16 +3,10 @@ plugins { } dependencies { - implementation('org.springframework.boot:spring-boot-starter-web') - implementation project(':grpc-adapter') - implementation project(':model') - implementation project(':caching') - implementation project(':metrics') - implementation project(':transactions') + implementation project(':web') runtimeOnly 'org.postgresql:postgresql' - testImplementation testFixtures(project(':model')) - testImplementation testFixtures(project(':transactions')) testRuntimeOnly 'com.h2database:h2' + testImplementation project(':grpc-adapter') } bootJar { @@ -24,10 +18,10 @@ jacocoTestCoverageVerification { rules.forEach {rule -> rule.limits.forEach {limit -> if (limit.counter == 'INSTRUCTION') { - limit.minimum = 0.97 + limit.minimum = 0.37 } if (limit.counter == 'METHOD') { - limit.minimum = 0.95 + limit.minimum = 0.50 } } } diff --git a/backend/build.gradle b/backend/build.gradle new file mode 100644 index 00000000..13532ade --- /dev/null +++ b/backend/build.gradle @@ -0,0 +1,12 @@ +plugins { + id 'lnd-manageJ.java-library-conventions' +} + +dependencies { + implementation project(':grpc-adapter') + implementation project(':model') + implementation project(':caching') + implementation project(':transactions') + testImplementation testFixtures(project(':model')) + testImplementation testFixtures(project(':transactions')) +} \ No newline at end of file diff --git a/application/src/main/java/de/cotto/lndmanagej/service/BalanceService.java b/backend/src/main/java/de/cotto/lndmanagej/service/BalanceService.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/BalanceService.java rename to backend/src/main/java/de/cotto/lndmanagej/service/BalanceService.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/ChannelIdResolverImpl.java b/backend/src/main/java/de/cotto/lndmanagej/service/ChannelIdResolverImpl.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/ChannelIdResolverImpl.java rename to backend/src/main/java/de/cotto/lndmanagej/service/ChannelIdResolverImpl.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/ChannelService.java b/backend/src/main/java/de/cotto/lndmanagej/service/ChannelService.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/ChannelService.java rename to backend/src/main/java/de/cotto/lndmanagej/service/ChannelService.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/FeeService.java b/backend/src/main/java/de/cotto/lndmanagej/service/FeeService.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/FeeService.java rename to backend/src/main/java/de/cotto/lndmanagej/service/FeeService.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/NodeService.java b/backend/src/main/java/de/cotto/lndmanagej/service/NodeService.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/NodeService.java rename to backend/src/main/java/de/cotto/lndmanagej/service/NodeService.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java b/backend/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java rename to backend/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImpl.java b/backend/src/main/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImpl.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImpl.java rename to backend/src/main/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImpl.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/OwnNodeService.java b/backend/src/main/java/de/cotto/lndmanagej/service/OwnNodeService.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/OwnNodeService.java rename to backend/src/main/java/de/cotto/lndmanagej/service/OwnNodeService.java diff --git a/application/src/main/java/de/cotto/lndmanagej/service/TransactionBackgroundLoader.java b/backend/src/main/java/de/cotto/lndmanagej/service/TransactionBackgroundLoader.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/service/TransactionBackgroundLoader.java rename to backend/src/main/java/de/cotto/lndmanagej/service/TransactionBackgroundLoader.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/ChannelIdResolverImplTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/ChannelIdResolverImplTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/ChannelIdResolverImplTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/ChannelIdResolverImplTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/FeeServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/FeeServiceTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/FeeServiceTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/FeeServiceTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/NodeServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/NodeServiceTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/NodeServiceTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/NodeServiceTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImplTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImplTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImplTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/OpenInitiatorResolverImplTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/OwnNodeServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/OwnNodeServiceTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/OwnNodeServiceTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/OwnNodeServiceTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/service/TransactionBackgroundLoaderTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/TransactionBackgroundLoaderTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/service/TransactionBackgroundLoaderTest.java rename to backend/src/test/java/de/cotto/lndmanagej/service/TransactionBackgroundLoaderTest.java diff --git a/settings.gradle b/settings.gradle index 8f35d047..15c4c228 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,10 @@ rootProject.name = 'lnd-manageJ' include 'application' -include 'model' -include 'grpc-client' -include 'grpc-adapter' +include 'backend' include 'caching' +include 'grpc-adapter' +include 'grpc-client' include 'metrics' +include 'model' include 'transactions' +include 'web' diff --git a/web/build.gradle b/web/build.gradle new file mode 100644 index 00000000..d20ae367 --- /dev/null +++ b/web/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'lnd-manageJ.java-library-conventions' +} + +dependencies { + implementation('org.springframework.boot:spring-boot-starter-web') + implementation project(':backend') + implementation project(':model') +// implementation project(':caching') + implementation project(':metrics') +// implementation project(':transactions') + testImplementation testFixtures(project(':model')) +// testImplementation testFixtures(project(':transactions')) +} \ No newline at end of file diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java b/web/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java new file mode 100644 index 00000000..7b1634de --- /dev/null +++ b/web/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/application/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java similarity index 100% rename from application/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java diff --git a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java similarity index 100% rename from application/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java diff --git a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java similarity index 100% rename from application/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java diff --git a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java similarity index 100% rename from application/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java diff --git a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/StatusControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/StatusControllerIT.java similarity index 100% rename from application/src/integrationTest/java/de/cotto/lndmanagej/controller/StatusControllerIT.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/controller/StatusControllerIT.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java rename to web/src/main/java/de/cotto/lndmanagej/controller/ChannelDetailsController.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/ChannelIdConverter.java b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelIdConverter.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/ChannelIdConverter.java rename to web/src/main/java/de/cotto/lndmanagej/controller/ChannelIdConverter.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/CostException.java b/web/src/main/java/de/cotto/lndmanagej/controller/CostException.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/CostException.java rename to web/src/main/java/de/cotto/lndmanagej/controller/CostException.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/CostExceptionHandler.java b/web/src/main/java/de/cotto/lndmanagej/controller/CostExceptionHandler.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/CostExceptionHandler.java rename to web/src/main/java/de/cotto/lndmanagej/controller/CostExceptionHandler.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java b/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java rename to web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/NodeController.java b/web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/NodeController.java rename to web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/NotFoundException.java b/web/src/main/java/de/cotto/lndmanagej/controller/NotFoundException.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/NotFoundException.java rename to web/src/main/java/de/cotto/lndmanagej/controller/NotFoundException.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandler.java b/web/src/main/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandler.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandler.java rename to web/src/main/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandler.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java b/web/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java rename to web/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/PubkeyConverter.java b/web/src/main/java/de/cotto/lndmanagej/controller/PubkeyConverter.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/PubkeyConverter.java rename to web/src/main/java/de/cotto/lndmanagej/controller/PubkeyConverter.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/StatusController.java b/web/src/main/java/de/cotto/lndmanagej/controller/StatusController.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/StatusController.java rename to web/src/main/java/de/cotto/lndmanagej/controller/StatusController.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDto.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDto.java rename to web/src/main/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDto.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java rename to web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelsForNodeDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelsForNodeDto.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelsForNodeDto.java rename to web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelsForNodeDto.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java rename to web/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/dto/ObjectMapperConfiguration.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ObjectMapperConfiguration.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/dto/ObjectMapperConfiguration.java rename to web/src/main/java/de/cotto/lndmanagej/controller/dto/ObjectMapperConfiguration.java diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/dto/OnChainCostsDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/OnChainCostsDto.java similarity index 100% rename from application/src/main/java/de/cotto/lndmanagej/controller/dto/OnChainCostsDto.java rename to web/src/main/java/de/cotto/lndmanagej/controller/dto/OnChainCostsDto.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/CostExceptionHandlerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/CostExceptionHandlerTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/CostExceptionHandlerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/CostExceptionHandlerTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java similarity index 99% rename from application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java index f02b1fa5..f7ff447d 100644 --- a/application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java @@ -98,7 +98,7 @@ class NodeControllerTest { @Test void getNodeDetails_with_channels() { when(nodeService.getNode(PUBKEY_2)).thenReturn(new Node(PUBKEY_2, ALIAS_2, 0, false)); - when(channelService.getOpenChannelsWith(PUBKEY_2)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3)); + when(channelService.getOpenChannelsWith(PUBKEY_2)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL_3, LOCAL_OPEN_CHANNEL)); when(channelService.getClosedChannelsWith(PUBKEY_2)).thenReturn(Set.of(CLOSED_CHANNEL_2, CLOSED_CHANNEL_3)); when(channelService.getWaitingCloseChannelsFor(PUBKEY_2)).thenReturn( Set.of(WAITING_CLOSE_CHANNEL, WAITING_CLOSE_CHANNEL_2) diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandlerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandlerTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandlerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/NotFoundExceptionHandlerTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/PubkeyConverterTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/PubkeyConverterTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/PubkeyConverterTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/PubkeyConverterTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/StatusControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/StatusControllerTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/StatusControllerTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/StatusControllerTest.java diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDtoTest.java similarity index 100% rename from application/src/test/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDtoTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/dto/BalanceInformationDtoTest.java