#598 - moved repeating options model classes to v4

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupRepeatingEndOption_v5.java → src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingEndOption_v4.java

-package de.deadlocker8.budgetmaster.database.model.v5;
-
-import org.joda.time.DateTime;
+package de.deadlocker8.budgetmaster.database.model.v4;
 
 import java.util.Objects;
 
-public class BackupRepeatingEndOption_v5
+public class BackupRepeatingEndOption_v4
 {
 	private String localizationKey;
 	private int times;
 	private String endDate;
 
-	public BackupRepeatingEndOption_v5()
+	public BackupRepeatingEndOption_v4()
 	{
 	}
 
@@ -49,7 +47,7 @@ public class BackupRepeatingEndOption_v5
 	{
 		if(this == o) return true;
 		if(o == null || getClass() != o.getClass()) return false;
-		BackupRepeatingEndOption_v5 that = (BackupRepeatingEndOption_v5) o;
+		BackupRepeatingEndOption_v4 that = (BackupRepeatingEndOption_v4) o;
 		return times == that.times && Objects.equals(localizationKey, that.localizationKey) && Objects.equals(endDate, that.endDate);
 	}
 
@@ -62,7 +60,7 @@ public class BackupRepeatingEndOption_v5
 	@Override
 	public String toString()
 	{
-		return "BackupRepeatingEndOption_v5{" +
+		return "BackupRepeatingEndOption_v4{" +
 				"localizationKey='" + localizationKey + '\'' +
 				", times=" + times +
 				", endDate='" + endDate + '\'' +

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupRepeatingModifier_v5.java → src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingModifier_v4.java

-package de.deadlocker8.budgetmaster.database.model.v5;
+package de.deadlocker8.budgetmaster.database.model.v4;
 
 import java.util.Objects;
 
-public class BackupRepeatingModifier_v5
+public class BackupRepeatingModifier_v4
 {
 	private Integer quantity;
 	private String localizationKey;
 
-	public BackupRepeatingModifier_v5()
+	public BackupRepeatingModifier_v4()
 	{
 	}
 
-	public BackupRepeatingModifier_v5(Integer quantity, String localizationKey)
+	public BackupRepeatingModifier_v4(Integer quantity, String localizationKey)
 	{
 		this.quantity = quantity;
 		this.localizationKey = localizationKey;
@@ -42,7 +42,7 @@ public class BackupRepeatingModifier_v5
 	{
 		if(this == o) return true;
 		if(o == null || getClass() != o.getClass()) return false;
-		BackupRepeatingModifier_v5 that = (BackupRepeatingModifier_v5) o;
+		BackupRepeatingModifier_v4 that = (BackupRepeatingModifier_v4) o;
 		return Objects.equals(quantity, that.quantity) && Objects.equals(localizationKey, that.localizationKey);
 	}
 
@@ -55,7 +55,7 @@ public class BackupRepeatingModifier_v5
 	@Override
 	public String toString()
 	{
-		return "BackupRepeatingModifier_v5{" +
+		return "BackupRepeatingModifier_v4{" +
 				"quantity=" + quantity +
 				", localizationKey='" + localizationKey + '\'' +
 				'}';

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupRepeatingOption_v5.java → src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupRepeatingOption_v4.java

-package de.deadlocker8.budgetmaster.database.model.v5;
+package de.deadlocker8.budgetmaster.database.model.v4;
 
 import java.util.Objects;
 
-public class BackupRepeatingOption_v5
+public class BackupRepeatingOption_v4
 {
 	private String startDate;
-	private BackupRepeatingModifier_v5 modifier;
-	private BackupRepeatingEndOption_v5 endOption;
+	private BackupRepeatingModifier_v4 modifier;
+	private BackupRepeatingEndOption_v4 endOption;
 
-	public BackupRepeatingOption_v5()
+	public BackupRepeatingOption_v4()
 	{
 	}
 
-	public BackupRepeatingOption_v5(String startDate, BackupRepeatingModifier_v5 modifier, BackupRepeatingEndOption_v5 endOption)
+	public BackupRepeatingOption_v4(String startDate, BackupRepeatingModifier_v4 modifier, BackupRepeatingEndOption_v4 endOption)
 	{
 		this.startDate = startDate;
 		this.modifier = modifier;
@@ -29,22 +29,22 @@ public class BackupRepeatingOption_v5
 		this.startDate = startDate;
 	}
 
-	public BackupRepeatingModifier_v5 getModifier()
+	public BackupRepeatingModifier_v4 getModifier()
 	{
 		return modifier;
 	}
 
-	public void setModifier(BackupRepeatingModifier_v5 modifier)
+	public void setModifier(BackupRepeatingModifier_v4 modifier)
 	{
 		this.modifier = modifier;
 	}
 
-	public BackupRepeatingEndOption_v5 getEndOption()
+	public BackupRepeatingEndOption_v4 getEndOption()
 	{
 		return endOption;
 	}
 
-	public void setEndOption(BackupRepeatingEndOption_v5 endOption)
+	public void setEndOption(BackupRepeatingEndOption_v4 endOption)
 	{
 		this.endOption = endOption;
 	}
@@ -54,7 +54,7 @@ public class BackupRepeatingOption_v5
 	{
 		if(this == o) return true;
 		if(o == null || getClass() != o.getClass()) return false;
-		BackupRepeatingOption_v5 that = (BackupRepeatingOption_v5) o;
+		BackupRepeatingOption_v4 that = (BackupRepeatingOption_v4) o;
 		return Objects.equals(startDate, that.startDate) && Objects.equals(modifier, that.modifier) && Objects.equals(endOption, that.endOption);
 	}
 
@@ -67,7 +67,7 @@ public class BackupRepeatingOption_v5
 	@Override
 	public String toString()
 	{
-		return "BackupRepeatingOption_v5{" +
+		return "BackupRepeatingOption_v4{" +
 				"startDate='" + startDate + '\'' +
 				", modifier=" + modifier +
 				", endOption=" + endOption +

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupTransaction_v5.java

 package de.deadlocker8.budgetmaster.database.model.v5;
 
+import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4;
 import de.deadlocker8.budgetmaster.tags.Tag;
 
 import java.util.List;
@@ -15,7 +16,7 @@ public class BackupTransaction_v5
 	private String name;
 	private String description;
 	private List<Tag> tags;
-	private BackupRepeatingOption_v5 repeatingOption;
+	private BackupRepeatingOption_v4 repeatingOption;
 	private BackupAccount_v5 transferAccount;
 
 	public BackupTransaction_v5()
@@ -102,12 +103,12 @@ public class BackupTransaction_v5
 		this.tags = tags;
 	}
 
-	public BackupRepeatingOption_v5 getRepeatingOption()
+	public BackupRepeatingOption_v4 getRepeatingOption()
 	{
 		return repeatingOption;
 	}
 
-	public void setRepeatingOption(BackupRepeatingOption_v5 repeatingOption)
+	public void setRepeatingOption(BackupRepeatingOption_v4 repeatingOption)
 	{
 		this.repeatingOption = repeatingOption;
 	}

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java

 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
 import de.deadlocker8.budgetmaster.database.Converter;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingEndOption_v5;
+import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingEndOption_v4;
 import de.deadlocker8.budgetmaster.repeating.endoption.*;
 import de.thecodelabs.utils.util.Localization;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
-public class RepeatingEndOptionConverter_v5 implements Converter<RepeatingEnd, BackupRepeatingEndOption_v5>
+public class RepeatingEndOptionConverter_v5 implements Converter<RepeatingEnd, BackupRepeatingEndOption_v4>
 {
 	@Override
-	public RepeatingEnd convert(BackupRepeatingEndOption_v5 backupItem)
+	public RepeatingEnd convert(BackupRepeatingEndOption_v4 backupItem)
 	{
 		if(backupItem == null)
 		{

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java

 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
 import de.deadlocker8.budgetmaster.database.Converter;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingModifier_v5;
+import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingModifier_v4;
 import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
 import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
 import de.thecodelabs.utils.util.Localization;
 
-public class RepeatingModifierConverter_v5 implements Converter<RepeatingModifier, BackupRepeatingModifier_v5>
+public class RepeatingModifierConverter_v5 implements Converter<RepeatingModifier, BackupRepeatingModifier_v4>
 {
 	@Override
-	public RepeatingModifier convert(BackupRepeatingModifier_v5 backupItem)
+	public RepeatingModifier convert(BackupRepeatingModifier_v4 backupItem)
 	{
 		if(backupItem == null)
 		{

src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java

 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
 import de.deadlocker8.budgetmaster.database.Converter;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingOption_v5;
+import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4;
 import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
-public class RepeatingOptionConverter_v5 implements Converter<RepeatingOption, BackupRepeatingOption_v5>
+public class RepeatingOptionConverter_v5 implements Converter<RepeatingOption, BackupRepeatingOption_v4>
 {
 	@Override
-	public RepeatingOption convert(BackupRepeatingOption_v5 backupItem)
+	public RepeatingOption convert(BackupRepeatingOption_v4 backupItem)
 	{
 		if(backupItem == null)
 		{

src/test/resources/DatabaseParser_v4Test.json

@@ -43,6 +43,7 @@
             "ID": 5,
             "amount": 35000,
             "date": "2018-03-13",
+            "isExpenditure": false,
             "account": {
                 "ID": 2,
                 "name": "Default"