From d1f494805e4b79721f52f10148b08fc303889baf Mon Sep 17 00:00:00 2001
From: Martin <ms618@hdm-stuttgart.de>
Date: Tue, 19 Dec 2023 22:02:36 +0100
Subject: [PATCH] Update: Minor Fixes

---
 .../battlearena/Persistance/Classes/AzureDB.java            | 2 +-
 .../Classes/{IDataBase.java => ISQLDataBase.java}           | 2 +-
 .../battlearena/Persistance/Classes/OracleDB.java           | 6 ++----
 .../battlearena/Persistance/Classes/Persistence.java        | 2 +-
 .../battlearena/Persistance/Classes/PlayerAccount.java      | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/{IDataBase.java => ISQLDataBase.java} (90%)

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 7fca7c40..d196f940 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 cab1ba14..51f83a17 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 b3f2eb45..5eac5ff7 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 49347780..c5c12aad 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 dbc37780..8eac2aa4 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;
 
 
-- 
GitLab