diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/AzureDB.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/AzureDB.java index 7fca7c404662488c81f3c3e85c21e077d82d94dd..d196f9401fea96ea0bbf624c8386acbe5864350a 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/AzureDB.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/AzureDB.java @@ -10,7 +10,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; -public class AzureDB implements IDataBase{ +public class AzureDB implements ISQLDataBase { /*this class is only here for showcasing the interchangeability of the DBMS*/ diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/IDataBase.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/ISQLDataBase.java similarity index 90% rename from src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/IDataBase.java rename to src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/ISQLDataBase.java index cab1ba1463de1d506f2c5ea4b98affcb2f0c53d8..51f83a1757339dae33320575dcd0226f2c2f37a2 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/IDataBase.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/ISQLDataBase.java @@ -5,7 +5,7 @@ import de.hdm_stuttgart.battlearena.Exceptions.DatabaseError; import java.sql.Connection; import java.util.ArrayList; -public interface IDataBase { +public interface ISQLDataBase { Connection connect() throws DatabaseError; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java index b3f2eb453d58223e1b102e928f6a9bbde74679a3..5eac5ff704698297e9128f0b8c9b031d54148384 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/OracleDB.java @@ -6,12 +6,10 @@ import org.apache.logging.log4j.Logger; import java.sql.*; import java.util.ArrayList; -import java.util.Properties; import oracle.jdbc.pool.OracleDataSource; -import oracle.jdbc.OracleConnection; -public class OracleDB implements IDataBase { +public class OracleDB implements ISQLDataBase { private static final Logger log = LogManager.getLogger(OracleDB.class); @Override @@ -102,7 +100,7 @@ public class OracleDB implements IDataBase { } } - public void uploadCommunityMapByID(MapData map) throws DatabaseError{ + public void uploadCommunityMap(MapData map) throws DatabaseError{ try(Connection connection = connect()) { String sql = "INSERT INTO battlearenadata.communitymaps (map_id, map_name, map_width, map_height, map_data) VALUES (?, ?, ?, ?, ?)"; PreparedStatement stmt = connection.prepareStatement(sql); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java index 493477802705a20c16635e08a6e7d1072c4d2c33..c5c12aada73387a80d97985a7c7342147691e9e0 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java @@ -72,7 +72,7 @@ public class Persistence { public void uploadCommunityMap(MapData map){ try { - db.uploadCommunityMapByID(map); + db.uploadCommunityMap(map); communityMaps.add(map); //hier noch prüfen, ob die Map lokal bereits existiert (falls eine Verbindung zur DB scheitern sollte, kann man sie dennoch lokal speichern gsonHandler.saveMaps(communityMaps, MapType.COMMUNITYMAP); log.info("Community-Maps successfully published"); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/PlayerAccount.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/PlayerAccount.java index dbc3778009a54ee13c3aceaa9eb33475ae5c46c7..8eac2aa4ce1a6f0ee723e88a342492674666163d 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/PlayerAccount.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/PlayerAccount.java @@ -3,7 +3,7 @@ package de.hdm_stuttgart.battlearena.Persistance.Classes; public class PlayerAccount { private String playerName; - private String accountPassword; + private String accountPassword; //only used for Online-Account; "" for local account private AccountType accountType;