Merge branch 'main' into league-play-refactoring

# Conflicts:
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/main/java/design/persistence/Serializers.java

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/design/persistence/LeagueDatabase.java b/src/main/java/design/persistence/LeagueDatabase.java
index 953624d..ed6ddae 100644
--- a/src/main/java/design/persistence/LeagueDatabase.java
+++ b/src/main/java/design/persistence/LeagueDatabase.java
@@ -1,10 +1,11 @@
 package design.persistence;
 
 import design.model.League;
+import design.persistence.importexport.DataSource;
 
 import java.io.IOException;
 
-public interface LeagueDatabase {
+public interface LeagueDatabase extends DataSource {
     static LeagueDatabase instance() {
         return JSONLeagueDatabase.instance();
     }
@@ -18,4 +19,10 @@ public interface LeagueDatabase {
     void removeLeague(League league) throws IOException;
 
     void updateLeague(League league) throws IOException;
+
+    @Override
+    void importData(Object data) throws IOException;
+
+    @Override
+    Object exportData() throws IOException;
 }