From 6c722bed3bdad9ec9918d3c4911fa4d4a67b8f5e Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 17 Apr 2022 17:48:59 +0200
Subject: [PATCH] #663 - renamed Main to BudgetMasterServerMain
---
.../{Main.java => BudgetMasterServerMain.java} | 8 ++++----
.../de/deadlocker8/budgetmaster/backup/BackupTask.java | 4 ++--
.../migration/ApplicationSupportFolderProvider.java | 4 ++--
.../update/BudgetMasterUpdateConfiguration.java | 4 ++--
.../budgetmaster/utils/DatabaseConfiguration.java | 4 ++--
.../budgetmaster/utils/PropertiesConfiguration.java | 4 ++--
.../EnsureAllIconizableHaveAnIconInstanceTest.java | 5 ++---
.../integration/helpers/SeleniumTestBase.java | 4 ++--
.../budgetmaster/unit/TransactionServiceDatabaseTest.java | 4 ++--
.../budgetmaster/unit/database/ImportServiceTest.java | 4 ++--
.../unit/database/importer/ChartImporterTest.java | 4 ++--
11 files changed, 24 insertions(+), 25 deletions(-)
rename BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/{Main.java => BudgetMasterServerMain.java} (92%)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Main.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/BudgetMasterServerMain.java
similarity index 92%
rename from BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Main.java
rename to BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/BudgetMasterServerMain.java
index 6f269187e..4e7258db7 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/Main.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/BudgetMasterServerMain.java
@@ -28,9 +28,9 @@ import java.util.*;
@EnableScheduling
@SpringBootApplication
@EnableConfigurationProperties(DatabaseConfigurationProperties.class)
-public class Main extends SpringBootServletInitializer implements ApplicationRunner
+public class BudgetMasterServerMain extends SpringBootServletInitializer implements ApplicationRunner
{
- private static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BudgetMasterServerMain.class);
static
{
@@ -80,7 +80,7 @@ public class Main extends SpringBootServletInitializer implements ApplicationRun
try
{
LOGGER.warn("BudgetMaster settings file ({}) is missing. A default file will be created. Please fill in your settings.", settingsPath);
- Files.copy(Main.class.getClassLoader().getResourceAsStream("config/templates/settings.properties"), settingsPath, StandardCopyOption.REPLACE_EXISTING);
+ Files.copy(BudgetMasterServerMain.class.getClassLoader().getResourceAsStream("config/templates/settings.properties"), settingsPath, StandardCopyOption.REPLACE_EXISTING);
System.exit(1);
}
catch(IOException e)
@@ -158,7 +158,7 @@ public class Main extends SpringBootServletInitializer implements ApplicationRun
args = new String[arguments.size()];
args = arguments.toArray(args);
- SpringApplication.run(Main.class, args);
+ SpringApplication.run(BudgetMasterServerMain.class, args);
}
@Override
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java
index 30427af90..c490a0e33 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/backup/BackupTask.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.backup;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.deadlocker8.budgetmaster.database.DatabaseService;
import de.deadlocker8.budgetmaster.settings.Settings;
import de.deadlocker8.budgetmaster.settings.SettingsService;
@@ -21,7 +21,7 @@ public abstract class BackupTask implements Runnable
this.databaseService = databaseService;
this.settingsService = settingsService;
- final Path applicationSupportFolder = Main.getApplicationSupportFolder();
+ final Path applicationSupportFolder = BudgetMasterServerMain.getApplicationSupportFolder();
this.backupFolder = applicationSupportFolder.resolve("backups");
this.backupStatus = BackupStatus.UNKNOWN;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/ApplicationSupportFolderProvider.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/ApplicationSupportFolderProvider.java
index dba1e8ef7..211e313fb 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/ApplicationSupportFolderProvider.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/ApplicationSupportFolderProvider.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.migration;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@@ -12,6 +12,6 @@ public class ApplicationSupportFolderProvider
@Bean("applicationSupportFolder")
public Path applicationSupportFolder()
{
- return Main.getApplicationSupportFolder();
+ return BudgetMasterServerMain.getApplicationSupportFolder();
}
}
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
index f9fa300eb..3c15bbc6e 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.update;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.thecodelabs.storage.settings.Storage;
import de.thecodelabs.storage.settings.StorageTypes;
import de.thecodelabs.utils.util.SystemUtils;
@@ -59,7 +59,7 @@ public class BudgetMasterUpdateConfiguration
@Bean
public UpdateService updateService()
{
- ClassLoader classLoader = Main.class.getClassLoader();
+ ClassLoader classLoader = BudgetMasterServerMain.class.getClassLoader();
Repository repository = Storage.load(classLoader.getResourceAsStream("repositories.json"), StorageTypes.JSON, Repository.class);
VersionizerItem versionizerItem = new VersionizerItem(repository, executablePath);
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
index 21f2128eb..f1bd49f16 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.utils;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +49,7 @@ public class DatabaseConfiguration
final StringBuilder errorMessageBuilder = new StringBuilder("BudgetMaster failed to start due to missing database settings!");
errorMessageBuilder.append("\n");
errorMessageBuilder.append("Your settings.properties file in \"");
- errorMessageBuilder.append(Main.getApplicationSupportFolder());
+ errorMessageBuilder.append(BudgetMasterServerMain.getApplicationSupportFolder());
errorMessageBuilder.append("\" is missing the following settings:");
errorMessageBuilder.append("\n");
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
index cdaa30b17..631f66fee 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.utils;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -16,7 +16,7 @@ public class PropertiesConfiguration
public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer()
{
PropertySourcesPlaceholderConfigurer properties = new PropertySourcesPlaceholderConfigurer();
- Path settingsPath = Main.getApplicationSupportFolder().resolve("settings.properties");
+ Path settingsPath = BudgetMasterServerMain.getApplicationSupportFolder().resolve("settings.properties");
properties.setLocation(new FileSystemResource(settingsPath.toString()));
properties.setIgnoreResourceNotFound(false);
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java
index 286fd5d5b..315267301 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.integration;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.deadlocker8.budgetmaster.TestConstants;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.accounts.AccountRepository;
@@ -13,7 +13,6 @@ import de.deadlocker8.budgetmaster.settings.SettingsService;
import de.deadlocker8.budgetmaster.templates.Template;
import de.deadlocker8.budgetmaster.templates.TemplateRepository;
import de.deadlocker8.budgetmaster.utils.eventlistener.EnsureAllIconizableHaveAnIconInstance;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
-@SpringBootTest(classes = Main.class)
+@SpringBootTest(classes = BudgetMasterServerMain.class)
@ActiveProfiles("test")
@Transactional
@Testcontainers
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java
index 95d5c8e64..dc59491de 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/SeleniumTestBase.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.integration.helpers;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.deadlocker8.budgetmaster.TestConstants;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -18,7 +18,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@Testcontainers
-@SpringBootTest(classes = Main.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = BudgetMasterServerMain.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext
@SeleniumTest
@ActiveProfiles("test")
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
index 87e5e62d3..dc05ab00d 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.unit;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.deadlocker8.budgetmaster.TestConstants;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.accounts.AccountRepository;
@@ -35,7 +35,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
-@SpringBootTest(classes = Main.class)
+@SpringBootTest(classes = BudgetMasterServerMain.class)
@ActiveProfiles("test")
@Transactional
@Testcontainers
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
index b93cdb60e..37b30bf14 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.unit.database;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.deadlocker8.budgetmaster.TestConstants;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.accounts.AccountRepository;
@@ -65,7 +65,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
-@SpringBootTest(classes = Main.class)
+@SpringBootTest(classes = BudgetMasterServerMain.class)
@ActiveProfiles("test")
@Transactional
@Testcontainers
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ChartImporterTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ChartImporterTest.java
index ecd11039a..82591d19c 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ChartImporterTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ChartImporterTest.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.unit.database.importer;
-import de.deadlocker8.budgetmaster.Main;
+import de.deadlocker8.budgetmaster.BudgetMasterServerMain;
import de.deadlocker8.budgetmaster.TestConstants;
import de.deadlocker8.budgetmaster.charts.Chart;
import de.deadlocker8.budgetmaster.charts.ChartService;
@@ -25,7 +25,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
-@SpringBootTest(classes = Main.class)
+@SpringBootTest(classes = BudgetMasterServerMain.class)
@ActiveProfiles("test")
@Transactional
@Testcontainers
--
GitLab