From dc54260315f706de51d68e935ba46598e4bd0f1b Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 30 Mar 2022 21:30:48 +0200
Subject: [PATCH] #691 - removed unnecessary flag
---
.../database/importer/AccountImporter.java | 2 +-
.../database/importer/CategoryImporter.java | 2 +-
.../budgetmaster/database/importer/ChartImporter.java | 2 +-
.../budgetmaster/database/importer/IconImporter.java | 2 +-
.../budgetmaster/database/importer/ImageImporter.java | 2 +-
.../budgetmaster/database/importer/ItemImporter.java | 10 +---------
.../budgetmaster/database/importer/TagImporter.java | 2 +-
.../database/importer/TransactionImporter.java | 2 +-
8 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/AccountImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/AccountImporter.java
index a010dd422..fcd5a837c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/AccountImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/AccountImporter.java
@@ -20,7 +20,7 @@ public class AccountImporter extends ItemImporter<Account>
public AccountImporter(AccountRepository accountRepository)
{
- super(accountRepository, EntityType.ACCOUNT, false);
+ super(accountRepository, EntityType.ACCOUNT);
}
public ImportResultItem importItems(List<Account> accounts, AccountMatchList accountMatchList)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/CategoryImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/CategoryImporter.java
index 8e1ef2e6b..0ee400cce 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/CategoryImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/CategoryImporter.java
@@ -15,7 +15,7 @@ public class CategoryImporter extends ItemImporter<Category>
public CategoryImporter(CategoryRepository categoryRepository)
{
- super(categoryRepository, EntityType.CATEGORY, false);
+ super(categoryRepository, EntityType.CATEGORY);
}
@Override
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/ChartImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/ChartImporter.java
index 6be82d801..a4ca7f095 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/ChartImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/ChartImporter.java
@@ -11,7 +11,7 @@ public class ChartImporter extends ItemImporter<Chart>
public ChartImporter(ChartService chartService)
{
- super(chartService.getRepository(), EntityType.CHART, true);
+ super(chartService.getRepository(), EntityType.CHART);
this.chartService = chartService;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/IconImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/IconImporter.java
index e9b818147..fbb4a4048 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/IconImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/IconImporter.java
@@ -8,7 +8,7 @@ public class IconImporter extends ItemImporter<Icon>
{
public IconImporter(IconRepository iconRepository)
{
- super(iconRepository, EntityType.ICON, true);
+ super(iconRepository, EntityType.ICON);
}
@Override
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/ImageImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/ImageImporter.java
index ccce64132..fed8cc14f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/ImageImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/ImageImporter.java
@@ -8,7 +8,7 @@ public class ImageImporter extends ItemImporter<Image>
{
public ImageImporter(ImageRepository imageRepository)
{
- super(imageRepository, EntityType.IMAGE, true);
+ super(imageRepository, EntityType.IMAGE);
}
@Override
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/ItemImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/ItemImporter.java
index a4059f1ae..12182a9ad 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/ItemImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/ItemImporter.java
@@ -17,13 +17,11 @@ public abstract class ItemImporter<T extends ProvidesID>
protected final JpaRepository<T, Integer> repository;
protected final EntityType entityType;
- protected final boolean alwaysCreateNewInstance;
- protected ItemImporter(JpaRepository<T, Integer> repository, EntityType entityType, boolean alwaysCreateNewInstance)
+ protected ItemImporter(JpaRepository<T, Integer> repository, EntityType entityType)
{
this.repository = repository;
this.entityType = entityType;
- this.alwaysCreateNewInstance = alwaysCreateNewInstance;
}
public ImportResultItem importItems(List<T> items)
@@ -42,12 +40,6 @@ public abstract class ItemImporter<T extends ProvidesID>
int oldID = item.getID();
int newID = importSingleItem(item);
- if(oldID == newID && !alwaysCreateNewInstance)
- {
- numberOfImportedItems++;
- continue;
- }
-
item.setID(newID);
numberOfImportedItems++;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java
index 2a01e8a52..94b2cd449 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java
@@ -8,7 +8,7 @@ public class TagImporter extends ItemImporter<Tag>
{
public TagImporter(TagRepository tagRepository)
{
- super(tagRepository, EntityType.TAGS, false);
+ super(tagRepository, EntityType.TAGS);
}
@Override
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/TransactionImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/TransactionImporter.java
index 354b865a3..896573e4b 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/TransactionImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/TransactionImporter.java
@@ -16,7 +16,7 @@ public class TransactionImporter extends ItemImporter<Transaction>
public TransactionImporter(TransactionRepository transactionRepository, TagImporter tagImporter)
{
- super(transactionRepository, EntityType.TRANSACTION, true);
+ super(transactionRepository, EntityType.TRANSACTION);
this.tagImporter = tagImporter;
}
--
GitLab