From 42b14b24dcd927a348840841ceab96f9e468716c Mon Sep 17 00:00:00 2001
From: Leonard <Leonard@Leonard.Leo>
Date: Mon, 25 May 2020 18:02:59 +0300
Subject: [PATCH] added exceptions

---
 .../Server/Exception/DuplicateShipException.java       |  4 ++++
 .../Server/Exception/DuplicateUserException.java       |  4 ++++
 .../Server/Exception/ShipNotFoundException.java        |  4 ++++
 .../Server/Exception/UserNotFoundException.java        |  4 ++++
 .../Server/Persistence/ObjectDAO.java                  |  4 ++--
 .../Server/Persistence/ShipDAO.java                    | 10 ++++++----
 .../Server/Persistence/UserDAO.java                    | 10 ++++++----
 7 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateShipException.java
 create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateUserException.java
 create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/ShipNotFoundException.java
 create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/UserNotFoundException.java

diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateShipException.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateShipException.java
new file mode 100644
index 00000000..ce56ccd6
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateShipException.java
@@ -0,0 +1,4 @@
+package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
+
+public class DuplicateShipException extends Exception {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateUserException.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateUserException.java
new file mode 100644
index 00000000..1c76e133
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateUserException.java
@@ -0,0 +1,4 @@
+package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
+
+public class DuplicateUserException extends Exception {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/ShipNotFoundException.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/ShipNotFoundException.java
new file mode 100644
index 00000000..2a234c1b
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/ShipNotFoundException.java
@@ -0,0 +1,4 @@
+package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
+
+public class ShipNotFoundException extends Exception {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/UserNotFoundException.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/UserNotFoundException.java
new file mode 100644
index 00000000..2db7d4a2
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/UserNotFoundException.java
@@ -0,0 +1,4 @@
+package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
+
+public class UserNotFoundException extends Exception {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ObjectDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ObjectDAO.java
index 1ef30c8a..fdd9c7ef 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ObjectDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ObjectDAO.java
@@ -8,12 +8,12 @@ public abstract class ObjectDAO<T> {
      *
      * @param o - the object to save
      */
-    public abstract void persist(T o);
+    public abstract void persist(T o) throws Exception;
 
     /**
      * Remove an object from the database
      *
      * @param o - the object to remove
      */
-    public abstract void remove(T o);
+    public abstract void remove(T o) throws Exception;
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java
index 6abe9552..883fb67a 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java
@@ -1,6 +1,9 @@
 package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
 
 import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateShipException;
+import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.ShipNotFoundException;
+import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.UserNotFoundException;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.support.ConnectionSource;
 
@@ -25,13 +28,12 @@ public class ShipDAO extends ObjectDAO<Ship> {
 
     }
 
-
     /**
      * Add a new ship to the database
      *
      * @param s - the ship to add
      */
-    public void persist(Ship s) {
+    public void persist(Ship s) throws DuplicateShipException {
 
     }
 
@@ -40,7 +42,7 @@ public class ShipDAO extends ObjectDAO<Ship> {
      *
      * @param user - the ship's associated user
      */
-    private Ship getShipByUser(String user) {
+    private Ship getShipByUser(String user) throws ShipNotFoundException, UserNotFoundException {
         return null;
     }
 
@@ -49,7 +51,7 @@ public class ShipDAO extends ObjectDAO<Ship> {
      *
      * @param s - the ship to remove
      */
-    public void remove(Ship s) {
+    public void remove(Ship s) throws ShipNotFoundException{
 
     }
 }
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java
index 2cddac29..a53b2ad8 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java
@@ -1,6 +1,8 @@
 package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
 
 import com.galaxytrucker.galaxytruckerreloaded.Model.User;
+import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateUserException;
+import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.UserNotFoundException;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.support.ConnectionSource;
 
@@ -30,7 +32,7 @@ public class UserDAO extends ObjectDAO<User> {
      *
      * @param u - the user to add
      */
-    public void persist(User u) {
+    public void persist(User u) throws DuplicateUserException {
 
     }
 
@@ -39,7 +41,7 @@ public class UserDAO extends ObjectDAO<User> {
      *
      * @param username - the username of the user
      */
-    private User getUserByUsername(String username) {
+    private User getUserByUsername(String username) throws UserNotFoundException {
         return null;
     }
 
@@ -48,7 +50,7 @@ public class UserDAO extends ObjectDAO<User> {
      *
      * @param u - the user to delete
      */
-    public void remove(User u) {
+    public void remove(User u) throws UserNotFoundException {
 
     }
 
@@ -57,7 +59,7 @@ public class UserDAO extends ObjectDAO<User> {
      *
      * @param username - the username of the user to delete
      */
-    private void removeUserByUsername(String username) {
+    private void removeUserByUsername(String username) throws UserNotFoundException {
 
     }
 
-- 
GitLab