From 6fb0e26965ce2559460f26f0ba8a96c2415c80d0 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 23 May 2021 12:33:40 +0200
Subject: [PATCH] #598 - moved method
---
.../budgetmaster/database/model/BackupDatabase.java | 13 +++++++++++++
.../database/model/v4/BackupDatabase_v4.java | 11 -----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
index fdb8d0678..a3e15926c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
@@ -2,6 +2,9 @@ package de.deadlocker8.budgetmaster.database.model;
import de.deadlocker8.budgetmaster.database.InternalDatabase;
+import java.util.ArrayList;
+import java.util.List;
+
public interface BackupDatabase
{
int getVersion();
@@ -9,4 +12,14 @@ public interface BackupDatabase
BackupDatabase upgrade();
InternalDatabase convertToInternal();
+
+ default <T> List<T> upgradeItems(List<? extends Upgradeable<T>> items)
+ {
+ List<T> upgradedItems = new ArrayList<>();
+ for(Upgradeable<T> item : items)
+ {
+ upgradedItems.add(item.upgrade());
+ }
+ return upgradedItems;
+ }
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
index 034f3717b..4214cb37b 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
@@ -3,7 +3,6 @@ package de.deadlocker8.budgetmaster.database.model.v4;
import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.JSONIdentifier;
import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
-import de.deadlocker8.budgetmaster.database.model.Upgradeable;
import de.deadlocker8.budgetmaster.database.model.v5.BackupDatabase_v5;
import java.util.ArrayList;
@@ -95,16 +94,6 @@ public class BackupDatabase_v4 implements BackupDatabase
return upgradedDatabase;
}
- private <T> List<T> upgradeItems(List<? extends Upgradeable<T>> items)
- {
- List<T> upgradedItems = new ArrayList<>();
- for(Upgradeable<T> item : items)
- {
- upgradedItems.add(item.upgrade());
- }
- return upgradedItems;
- }
-
@Override
public InternalDatabase convertToInternal()
{
--
GitLab