From 042575f8c070822614a434f064ad0587dcd20401 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Fri, 7 May 2021 21:07:34 +0200 Subject: [PATCH] refactoring --- .../budgetmaster/accounts/AccountService.java | 4 ++-- .../authentication/PreLoginUrlBlacklist.java | 2 +- .../authentication/UserDetailsServiceImpl.java | 5 +++-- .../authentication/WebSecurityConfig.java | 4 ++-- .../backup/AutoBackupStrategy.java | 4 ++-- .../categories/CategoryController.java | 1 - .../categories/CategoryService.java | 4 ++-- .../budgetmaster/charts/ChartService.java | 6 +++--- .../budgetmaster/controller/NewsEntry.java | 4 ++-- .../budgetmaster/database/DatabaseParser.java | 4 ++-- .../database/DatabaseParser_v3.java | 2 +- .../database/DatabaseParser_v4.java | 2 +- .../database/DatabaseParser_v5.java | 2 +- .../images/ImageFileExtension.java | 1 - .../budgetmaster/images/ImageService.java | 4 ++-- .../budgetmaster/images/MediaController.java | 1 - .../reports/ReportConfiguration.java | 10 +++++----- .../settings/ReportSettingsService.java | 2 +- .../budgetmaster/search/Search.java | 4 ++-- .../budgetmaster/services/CurrencyService.java | 3 ++- .../services/ImportResultItem.java | 6 +++--- .../{Resetable.java => Resettable.java} | 2 +- .../services/UpdateCheckService.java | 2 +- .../budgetmaster/tags/TagService.java | 4 ++-- .../templates/TemplateService.java | 4 ++-- .../templates/TemplateValidator.java | 4 ++-- .../transactions/TransactionService.java | 4 ++-- .../transactions/TransactionType.java | 2 +- .../update/BudgetMasterUpdateService.java | 18 +++++++++--------- .../budgetmaster/utils/Strings.java | 9 ++++----- 30 files changed, 61 insertions(+), 63 deletions(-) rename src/main/java/de/deadlocker8/budgetmaster/services/{Resetable.java => Resettable.java} (77%) diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java index fa6b3e95f..a1976d03a 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java @@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.accounts; import de.deadlocker8.budgetmaster.authentication.User; import de.deadlocker8.budgetmaster.authentication.UserRepository; import de.deadlocker8.budgetmaster.services.AccessAllEntities; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import de.deadlocker8.budgetmaster.transactions.TransactionService; import de.deadlocker8.budgetmaster.utils.Strings; import de.thecodelabs.utils.util.Localization; @@ -20,7 +20,7 @@ import java.util.List; import java.util.Optional; @Service -public class AccountService implements Resetable, AccessAllEntities<Account> +public class AccountService implements Resettable, AccessAllEntities<Account> { private static final Logger LOGGER = LoggerFactory.getLogger(AccountService.class); diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java index 1ec47586f..bcef120f3 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java +++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/PreLoginUrlBlacklist.java @@ -5,7 +5,7 @@ import java.util.List; public class PreLoginUrlBlacklist { - private List<String> blacklist; + private final List<String> blacklist; public PreLoginUrlBlacklist() { diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java index ded80d7e6..aafbf6f3d 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java +++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/UserDetailsServiceImpl.java @@ -16,7 +16,8 @@ public class UserDetailsServiceImpl implements UserDetailsService private final UserRepository userRepository; @Autowired - public UserDetailsServiceImpl(UserRepository userRepository) { + public UserDetailsServiceImpl(UserRepository userRepository) + { this.userRepository = userRepository; } @@ -26,7 +27,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { User user = userRepository.findByName(username); - if (user == null) + if(user == null) { throw new UsernameNotFoundException(username); } diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java index 7269e1010..47af6f107 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java +++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java @@ -18,9 +18,9 @@ import org.springframework.security.web.RedirectStrategy; @EnableGlobalMethodSecurity(prePostEnabled = true) public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); + private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); private final UserDetailsService userDetailsService; - private PreLoginUrlBlacklist preLoginUrlBlacklist; + private final PreLoginUrlBlacklist preLoginUrlBlacklist; @Autowired public WebSecurityConfig(UserDetailsServiceImpl userDetailsService) diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java b/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java index 5e3c0fc1f..da45a1e42 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java +++ b/src/main/java/de/deadlocker8/budgetmaster/backup/AutoBackupStrategy.java @@ -14,8 +14,8 @@ public enum AutoBackupStrategy GIT_LOCAL("settings.backup.auto.strategy.git.local", LocalGitBackupTask.class), GIT_REMOTE("settings.backup.auto.strategy.git.remote", RemoteGitBackupTask.class); - private String localizationKey; - private Class<? extends BackupTask> backupTaskType; + private final String localizationKey; + private final Class<? extends BackupTask> backupTaskType; AutoBackupStrategy(String localizationKey, Class<? extends BackupTask> backupTaskType) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java index 7a85cdf15..5f74fff5b 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java @@ -150,5 +150,4 @@ public class CategoryController extends BaseController model.addAttribute("category", category); model.addAttribute("fontawesomeIcons", FontAwesomeIcons.ICONS); } - } \ No newline at end of file diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java index 7632a5bbe..7f0f22d1e 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryService.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.categories; import de.deadlocker8.budgetmaster.services.AccessAllEntities; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.utils.Strings; import de.thecodelabs.utils.util.Localization; @@ -16,7 +16,7 @@ import java.util.NoSuchElementException; import java.util.Optional; @Service -public class CategoryService implements Resetable, AccessAllEntities<Category> +public class CategoryService implements Resettable, AccessAllEntities<Category> { private static final Logger LOGGER = LoggerFactory.getLogger(CategoryService.class); private final CategoryRepository categoryRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java index 8d0cb13a2..850e688fc 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartService.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.charts; import de.deadlocker8.budgetmaster.services.AccessAllEntities; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import org.padler.natorder.NaturalOrderComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,14 +13,14 @@ import java.util.List; import java.util.Optional; @Service -public class ChartService implements Resetable, AccessAllEntities<Chart> +public class ChartService implements Resettable, AccessAllEntities<Chart> { private static final Logger LOGGER = LoggerFactory.getLogger(ChartService.class); private static final String PATTERN_OLD_CONTAINER_ID = "Plotly.newPlot('chart-canvas',"; private static final String PATTERN_DYNAMIC_CONTAINER_ID = "Plotly.newPlot('containerID',"; - private ChartRepository chartRepository; + private final ChartRepository chartRepository; @Autowired public ChartService(ChartRepository categoryRepository) diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java b/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java index c7ed16289..15ce97941 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java @@ -4,8 +4,8 @@ import de.thecodelabs.utils.util.Localization; public class NewsEntry { - private String headline; - private String description; + private final String headline; + private final String description; public NewsEntry(String headline, String description) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java index 03cf97f3b..fa3d60976 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java @@ -13,8 +13,8 @@ import java.text.MessageFormat; public class DatabaseParser { final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - private String jsonString; - private Category categoryNone; + private final String jsonString; + private final Category categoryNone; public DatabaseParser(String json, Category categoryNone) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java index 8254b2fd7..e66c202b7 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java @@ -23,7 +23,7 @@ import java.util.List; public class DatabaseParser_v3 { final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - private String jsonString; + private final String jsonString; protected List<Category> categories; protected List<Account> accounts; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java index 2f333ca43..c73b40efa 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v4.java @@ -19,7 +19,7 @@ import java.util.Optional; public class DatabaseParser_v4 extends DatabaseParser_v3 { final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - private String jsonString; + private final String jsonString; protected List<Transaction> transactions; protected List<Template> templates; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java index b087aac1d..39278f140 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java @@ -17,7 +17,7 @@ import java.util.Optional; public class DatabaseParser_v5 extends DatabaseParser_v4 { final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - private String jsonString; + private final String jsonString; protected List<Chart> charts; protected List<Image> images; diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java b/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java index 9b8557b3f..7b4e82d20 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java +++ b/src/main/java/de/deadlocker8/budgetmaster/images/ImageFileExtension.java @@ -8,7 +8,6 @@ public enum ImageFileExtension JPG("jpg", "jpeg"), SVG("svg", "svg+xml"); - private final String fileExtension; private final String base64Type; diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java b/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java index 0a6333813..ccc0a61ef 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/images/ImageService.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.images; import de.deadlocker8.budgetmaster.accounts.Account; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import de.thecodelabs.utils.util.Localization; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Optional; @Service -public class ImageService implements Resetable +public class ImageService implements Resettable { private final ImageRepository imageRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java index dc536813b..3e0e9b21c 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java @@ -46,7 +46,6 @@ public class MediaController extends BaseController } else { - try { imageService.saveImageFile(file); diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java index 9ddb3d98f..3237ff418 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java @@ -8,11 +8,11 @@ import java.util.List; public class ReportConfiguration { - private List<Transaction> transactions; - private String accountName; - private List<CategoryBudget> categoryBudgets; - private ReportSettings reportSettings; - private Budget budget; + private final List<Transaction> transactions; + private final String accountName; + private final List<CategoryBudget> categoryBudgets; + private final ReportSettings reportSettings; + private final Budget budget; public ReportConfiguration(List<Transaction> transactions, String accountName, List<CategoryBudget> categoryBudgets, ReportSettings reportSettings, Budget budget) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java index 26d341da3..f1c763a44 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java @@ -34,7 +34,7 @@ public class ReportSettingsService private void createDefaultReportSettingsIfNotExists() { Optional<ReportSettings> reportSettingsOptional = reportSettingsRepository.findById(0); - if(!reportSettingsOptional.isPresent()) + if(reportSettingsOptional.isEmpty()) { ReportSettings reportSettings = ReportSettings.getDefault(); reportSettings.setID(0); diff --git a/src/main/java/de/deadlocker8/budgetmaster/search/Search.java b/src/main/java/de/deadlocker8/budgetmaster/search/Search.java index 2f7020f26..5b9917100 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/search/Search.java +++ b/src/main/java/de/deadlocker8/budgetmaster/search/Search.java @@ -62,9 +62,9 @@ public class Search return searchCategory; } - public void setSearchCategory(boolean searchCatgeory) + public void setSearchCategory(boolean searchCategory) { - this.searchCategory = searchCatgeory; + this.searchCategory = searchCategory; } public boolean isSearchTags() diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java b/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java index 1af4fc0ea..a80949f07 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/CurrencyService.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.RoundingMode; +import java.text.MessageFormat; import java.text.NumberFormat; @Service @@ -26,7 +27,7 @@ public class CurrencyService public String getCurrencyString(double amount) { - return getAmountString(amount, true) + " " + settingsService.getSettings().getCurrency(); + return MessageFormat.format("{0} {1}", getAmountString(amount, true), settingsService.getSettings().getCurrency()); } public String getAmountString(int amount) diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java b/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java index 97b58cb5e..37b604832 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/ImportResultItem.java @@ -4,9 +4,9 @@ import java.util.Objects; public class ImportResultItem { - private EntityType entityType; - private int numberOfImportedItems; - private int numberOfAvailableItems; + private final EntityType entityType; + private final int numberOfImportedItems; + private final int numberOfAvailableItems; public ImportResultItem(EntityType entityType, int numberOfImportedItems, int numberOfAvailableItems) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/Resetable.java b/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java similarity index 77% rename from src/main/java/de/deadlocker8/budgetmaster/services/Resetable.java rename to src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java index 164c7336b..5ededfc49 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/Resetable.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/Resettable.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.services; -public interface Resetable +public interface Resettable { void deleteAll(); diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java b/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java index 6a7f63e12..0756936f4 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/UpdateCheckService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; @Service public class UpdateCheckService { - private BudgetMasterUpdateService budgetMasterUpdateService; + private final BudgetMasterUpdateService budgetMasterUpdateService; @Autowired public UpdateCheckService(BudgetMasterUpdateService budgetMasterUpdateService) diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java b/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java index 2a3bc8249..7cad4b707 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/tags/TagService.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.tags; import de.deadlocker8.budgetmaster.services.AccessAllEntities; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import org.padler.natorder.NaturalOrderComparator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class TagService implements Resetable, AccessAllEntities<Tag> +public class TagService implements Resettable, AccessAllEntities<Tag> { private final TagRepository tagRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java index 65e72d862..b49351020 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java @@ -8,7 +8,7 @@ import de.deadlocker8.budgetmaster.accounts.AccountState; import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.services.AccessAllEntities; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import de.deadlocker8.budgetmaster.settings.SettingsService; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.transactions.TransactionBase; @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Collectors; @Service -public class TemplateService implements Resetable, AccessAllEntities<Template> +public class TemplateService implements Resettable, AccessAllEntities<Template> { private static final Gson GSON = new GsonBuilder() .setPrettyPrinting() diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java index 25321134c..2e6326550 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java +++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateValidator.java @@ -11,8 +11,8 @@ import java.util.List; public class TemplateValidator implements Validator { - private String previousTemplateName; - private List<String> existingTemplateNames; + private final String previousTemplateName; + private final List<String> existingTemplateNames; public TemplateValidator(String previousTemplateName, List<String> existingTemplateNames) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java index 566d037e9..2e3723cdc 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java @@ -9,7 +9,7 @@ import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.filter.FilterConfiguration; import de.deadlocker8.budgetmaster.repeating.RepeatingOptionRepository; -import de.deadlocker8.budgetmaster.services.Resetable; +import de.deadlocker8.budgetmaster.services.Resettable; import de.deadlocker8.budgetmaster.settings.SettingsService; import de.deadlocker8.budgetmaster.tags.Tag; import de.deadlocker8.budgetmaster.tags.TagRepository; @@ -33,7 +33,7 @@ import java.util.Optional; import java.util.stream.Collectors; @Service -public class TransactionService implements Resetable +public class TransactionService implements Resettable { private static final int MAX_SUGGESTIONS = 25; private static final Gson GSON = new GsonBuilder() diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java index 2bae53042..1c515e802 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java @@ -8,7 +8,7 @@ public enum TransactionType REPEATING(2), TRANSFER(3); - private int typeID; + private final int typeID; TransactionType(int typeID) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java index a7d397b70..45a53aefe 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java @@ -88,12 +88,12 @@ public class BudgetMasterUpdateService @Bean public Artifact artifact() { - Artifact artifact = new Artifact(); - artifact.setVersion(Build.getInstance().getVersionName()); - artifact.setGroupId("de.deadlocker8"); - artifact.setArtifactId("BudgetMaster"); - artifact.setArtifactType(Artifact.ArtifactType.RUNTIME); - return artifact; + Artifact newArtifact = new Artifact(); + newArtifact.setVersion(Build.getInstance().getVersionName()); + newArtifact.setGroupId("de.deadlocker8"); + newArtifact.setArtifactId("BudgetMaster"); + newArtifact.setArtifactType(Artifact.ArtifactType.RUNTIME); + return newArtifact; } @Bean @@ -103,12 +103,12 @@ public class BudgetMasterUpdateService Repository repository = Storage.load(classLoader.getResourceAsStream("repositories.json"), StorageTypes.JSON, Repository.class); VersionizerItem versionizerItem = new VersionizerItem(repository, executablePath); - UpdateService updateService = UpdateService.startVersionizer(versionizerItem, updateStrategy, UpdateService.InteractionType.HEADLESS, UpdateService.RepositoryType.RELEASE); + UpdateService versionizerUpdateService = UpdateService.startVersionizer(versionizerItem, updateStrategy, UpdateService.InteractionType.HEADLESS, UpdateService.RepositoryType.RELEASE); if(executablePath != null) { - updateService.addArtifact(artifact, Paths.get(executablePath)); + versionizerUpdateService.addArtifact(artifact, Paths.get(executablePath)); } - return updateService; + return versionizerUpdateService; } public UpdateService getUpdateService() diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java index 7bfc52130..ec2a5d0bc 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java @@ -2,10 +2,13 @@ package de.deadlocker8.budgetmaster.utils; public class Strings { + private Strings() + { + } + //MISC public static final String CATEGORY_NONE = "category.none"; public static final String CATEGORY_REST = "category.rest"; - public static final String VERSION = "version"; public static final String TITLE_INCOMES = "title.incomes"; public static final String TITLE_EXPENDITURES = "title.expenditures"; public static final String TITLE_CATEGORY_BUDGETS = "title.category.budgets"; @@ -59,8 +62,4 @@ public class Strings public static final String REPORT_INCOMES = "report.incomes"; public static final String REPORT_PAYMENTS = "report.expenditures"; public static final String REPORT_BUDGET_REST = "report.budget.rest"; - - private Strings() - { - } } \ No newline at end of file -- GitLab