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 a010dd42249b4cafb56801bd1ecb49ef4f1afdd5..fcd5a837c8ad3970a4deff4b754786451b2af75d 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 8e1ef2e6b5fc94dfa1471afdca3d58ad958896cf..0ee400cce9503def69ec1f19efa9e14db5c1b084 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 6be82d801128fd7654f202c05a394ad5ce16671e..a4ca7f0957214340babf0e6a8330d60a23346b7a 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 e9b818147850e1bc44e896e520422d618fc4d592..fbb4a4048e0e3a37ebd9a76f03c952c38c7fba93 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 ccce6413253917d1498930df8126aaf0c8346dc2..fed8cc14f90e4794b2deda71a6db4660ba8334e8 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 a4059f1aeef8578120633bb31879999908d7fac9..12182a9ad58939865383ec7ccdced652c443748c 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 2a01e8a5234dadbfd7749d6750d1afffb76fe09c..94b2cd44996bab05b00d4d56b6901d91249b9acb 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 354b865a35d8d1038db2ace2a5e6e0255683d701..896573e4b92d1536d23644b9cba30c058f0a1c3a 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; }