From 267a111e97bc9105363955d2d73c316c1fa4f1ba Mon Sep 17 00:00:00 2001
From: Leonard <Leonard@Leonard.Leo>
Date: Wed, 10 Jun 2020 18:24:42 +0300
Subject: [PATCH] removed ormlite
---
build.gradle | 10 ----------
.../Model/Crew/Crew.java | 4 +---
.../Model/Map/Overworld.java | 3 ++-
.../Model/Map/Planet.java | 20 ++++++++++---------
.../Model/Map/Trader.java | 18 ++++++++---------
.../galaxytruckerreloaded/Model/Ship.java | 1 -
.../Model/ShipLayout/BlankRoom.java | 11 +++-------
.../Model/ShipLayout/Engine.java | 6 ++----
.../Model/ShipLayout/Room.java | 17 +++++++++-------
.../Model/ShipLayout/Shield.java | 6 ++----
.../Model/ShipLayout/System.java | 20 ++++++-------------
.../Model/ShipLayout/WeaponSystem.java | 14 +++++++------
.../Model/Weapons/Bomb.java | 6 ++----
.../Model/Weapons/HealBomb.java | 10 +++++-----
.../Model/Weapons/LaserBlaster.java | 6 ++----
.../Model/Weapons/RadiationBomb.java | 6 ++----
.../Model/Weapons/Radio.java | 6 ++----
.../Model/Weapons/Rocket.java | 6 ++----
.../Model/Weapons/Weapon.java | 19 ++++--------------
.../Server/Persistence/OverworldDAO.java | 4 ----
.../Server/Persistence/PlanetDAO.java | 4 ----
.../Server/Persistence/RoomDAO.java | 2 +-
.../Server/Persistence/ShipDAO.java | 5 +----
.../Server/Persistence/TraderDAO.java | 1 -
.../Server/Persistence/UserDAO.java | 2 --
.../Server/Persistence/WeaponDAO.java | 2 +-
.../galaxytruckerreloaded/Server/Server.java | 12 -----------
.../Server/ServerServiceCommunicator.java | 4 ----
.../Server/Services/UserService.java | 10 ----------
29 files changed, 75 insertions(+), 160 deletions(-)
diff --git a/build.gradle b/build.gradle
index e6ff11c6..1b71340c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,11 +57,6 @@ project(":desktop") {
// h2 database
runtimeOnly 'com.h2database:h2'
- // ormlite
- compile group: 'com.j256.ormlite', name: 'ormlite-jdbc', version: '4.48'
- compile 'com.j256.ormlite:ormlite-android:4.48'
- compile 'com.j256.ormlite:ormlite-core:4.48'
-
compile group: 'com.h2database', name: 'h2', version: '1.4.199'
}
}
@@ -105,11 +100,6 @@ project(":core") {
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
- // ormlite
- compile group: 'com.j256.ormlite', name: 'ormlite-jdbc', version: '4.48'
- compile 'com.j256.ormlite:ormlite-android:4.48'
- compile 'com.j256.ormlite:ormlite-core:4.48'
-
testCompile 'junit:junit:4.12'
compile 'junit:junit:4.12'
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java
index ee52cb5a..ebc56560 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java
@@ -1,9 +1,6 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Crew;
import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Room;
-import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.System;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
import javax.persistence.*;
@@ -53,6 +50,7 @@ public class Crew implements Serializable {
/**
* The room this crew member is in
*/
+ @OneToOne
private Room currentRoom;
/**
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
index e1a23586..ebde8497 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
@@ -29,11 +29,12 @@ public class Overworld implements Serializable {
private String associatedUser;
/** Stores planet and their location on the map */
- @ElementCollection
+ @OneToMany
private Map<String,Planet> planetMap;
/** The start planet */
@NonNull
+ @OneToOne
private Planet startPlanet;
/** Constructor */
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
index 7e51cccf..4e0a1a2d 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
@@ -1,59 +1,61 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
+
import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
-import com.j256.ormlite.field.DatabaseField;
+
import lombok.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import java.io.Serializable;
+import java.util.List;
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
+@Entity
public class Planet implements Serializable {
/**
* Planet name
*/
- @DatabaseField(id = true, columnName = "name")
+ @Id
@NonNull
private String name;
/**
* Horizontale Position auf der Karte
*/
- @DatabaseField(columnName = "posX")
@NonNull
private float posX;
/**
* Vertikale Position auf der Karte
*/
- @DatabaseField(columnName = "posY")
@NonNull
private float posY;
/**
* Ereignis dass auf diesem Planeten eintrifft
*/
- @DatabaseField(columnName = "event", foreign = true)
@NonNull
private Enum<PlanetEvent> event;
/**
* If already discovered set to true
*/
- @DatabaseField(columnName = "discovered")
@NonNull
private boolean discovered = false;
/** Ships at this planet */
- @DatabaseField(foreign = true, columnName = "ships")
@NonNull
+ @OneToMany
private List<Ship> ships;
/** Trader */
- @DatabaseField(foreign = true)
+ @OneToOne
private Trader trader;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java
index 6323ffd7..ce267d3b 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java
@@ -1,46 +1,44 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
+import java.util.List;
import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
import java.io.Serializable;
@Getter
@Setter
-@DatabaseTable(tableName = "trader")
+@Entity
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
public class Trader extends Planet implements Serializable {
/** ID */
- @DatabaseField(id = true)
+ @Id
private int id;
/** Associated user */
- @DatabaseField(foreign = true)
private Planet planet;
/** Weapons for sale */
- @DatabaseField(foreign = true)
@NonNull
+ @OneToMany
private List<Weapon> weaponStock;
/** Rockets for sale */
- @DatabaseField
@NonNull
private int missileStock;
/** Fuel for sale */
- @DatabaseField
@NonNull
private int fuelStock;
/** Crew for sale */
- @DatabaseField(foreign = true)
+ @OneToMany
@NonNull
private List<Crew> crewStock;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index 9926bb33..a6c8b61e 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -3,7 +3,6 @@ package com.galaxytrucker.galaxytruckerreloaded.Model;
import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet;
import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Room;
import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
-import com.j256.ormlite.field.DatabaseField;
import lombok.*;
import javax.persistence.*;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java
index 4742bded..87d66ac5 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java
@@ -1,18 +1,13 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
+
@Getter
@Setter
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@DatabaseTable(tableName = "blankRoom")
+@Entity
public class BlankRoom extends Room {
- /** ID */
- @NonNull
- @DatabaseField(id = true)
- private int id;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Engine.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Engine.java
index 9d6fab8e..926ab420 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Engine.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Engine.java
@@ -1,21 +1,19 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
-@DatabaseTable(tableName = "engine")
+@Entity
public class Engine extends System implements Serializable {
/**
* Ob ein Crew mitglied das System stärkt
*/
- @DatabaseField(columnName = "manned")
@NonNull
private boolean manned = false;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
index 7cf0fe03..f97cbaab 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
@@ -1,26 +1,33 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-import com.j256.ormlite.field.DatabaseField;
import lombok.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
import java.io.Serializable;
@Getter
@Setter
+@Entity
public abstract class Room implements Serializable {
+ /**
+ * ID
+ */
+ @Id
+ @NonNull
+ private int id;
+
/**
* Höhe des Raumes. Räume sind immer rechteckig.
*/
- @DatabaseField(columnName = "height")
@NonNull
private int height;
/**
* Weite des Raumes. Räume sind immer rechteckig.
*/
- @DatabaseField(columnName = "width")
@NonNull
private int width;
@@ -28,24 +35,20 @@ public abstract class Room implements Serializable {
* Wenn ein Raum Schaden kriegt kann ein Loch entstehen.
* Die Zahl ist der Wert wie lange dieses repariert werden muss um geschlossen zu werden.
*/
- @DatabaseField(columnName = "breach")
@NonNull
private int breach;
/**
* Der Sauerstoffgehalt des Raumes
*/
- @DatabaseField(columnName = "oxygen")
@NonNull
private int oxygen;
/** X position */
@NonNull
- @DatabaseField(columnName = "posX")
private int posX;
/** Y position */
@NonNull
- @DatabaseField(columnName = "posY")
private int posY;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Shield.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Shield.java
index 0aae955a..6123d64a 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Shield.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Shield.java
@@ -1,21 +1,19 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@Getter
@Setter
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@DatabaseTable(tableName = "shield")
+@Entity
public class Shield extends System implements Serializable {
/**
* Ob ein Crewmitglied das System stärkt
*/
- @DatabaseField(columnName = "manned")
@NonNull
private boolean manned = false;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
index cb03eed2..247b142d 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java
@@ -1,51 +1,43 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
-import com.j256.ormlite.field.DatabaseField;
import lombok.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
import java.io.Serializable;
+import java.util.List;
@Getter
@Setter
+@Entity
public abstract class System extends Room implements Serializable {
- /**
- * ID
- */
- @DatabaseField(columnName = "ID", id = true)
- @NonNull
- private int id;
-
/**
* A system's energy level
*/
- @DatabaseField(columnName = "energy")
@NonNull
private int energy;
/**
* Maximum energy a system can take
*/
- @DatabaseField(columnName = "maxEnergy")
@NonNull
private int maxEnergy;
/**
* Damage the system has taken
*/
- @DatabaseField(columnName = "damage")
@NonNull
private int damage;
/** Crew in this system */
- @DatabaseField(foreign = true, columnName = "crew")
@NonNull
+ @OneToMany
private List<Crew> crew;
/** Whether or not the system is disabled */
- @DatabaseField(columnName = "disabled")
@NonNull
private boolean disabled = false;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java
index 5a034847..04622e6a 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java
@@ -1,24 +1,26 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
-@DatabaseTable(tableName = "weaponSystem")
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import java.util.List;
+
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
+@Entity
public class WeaponSystem extends System {
/** whether or not its manned */
@NonNull
- @DatabaseField(columnName = "manned")
private boolean manned = false;
/** List of weapons this ship has */
- @DatabaseField(foreign = true,columnName = "shipWeapons")
+ @OneToMany
private List<Weapon> shipWeapons;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java
index b1191f1f..f5b5695f 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java
@@ -1,20 +1,18 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
-@DatabaseTable(tableName = "bomb")
+@Entity
public class Bomb extends Weapon implements Serializable {
/** Weapon name */
- @DatabaseField(columnName = "bombWeaponName")
@NonNull
private String name;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java
index 57a69f7a..c090f1d6 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java
@@ -1,20 +1,20 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
-@DatabaseTable(tableName = "healBombWeapon")
+@Entity
public class HealBomb extends Weapon implements Serializable {
- /** Weapon name */
- @DatabaseField(columnName = "healBombWeaponName")
+ /**
+ * Weapon name
+ */
@NonNull
private String name;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java
index b7ac04b1..b16e8b20 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java
@@ -1,20 +1,18 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
-@DatabaseTable(tableName = "laserBlasterWeapon")
+@Entity
public class LaserBlaster extends Weapon implements Serializable {
/** Weapon name */
- @DatabaseField(columnName = "laserWeaponName")
@NonNull
private String name;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java
index 195072af..74353550 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java
@@ -1,20 +1,18 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
-@DatabaseTable(tableName = "radiationBomb")
+@Entity
public class RadiationBomb extends Weapon implements Serializable {
/** Weapon name */
- @DatabaseField(columnName = "radiationBombName")
@NonNull
private String name;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java
index 787cb13e..517a7eb3 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java
@@ -1,20 +1,18 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@Getter
@Setter
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@DatabaseTable(tableName = "radioWeapon")
+@Entity
public class Radio extends Weapon implements Serializable {
/** Weapon name */
@NonNull
- @DatabaseField(columnName = "radioWeaponName")
private String name;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java
index f3aa5c0e..7040ee5d 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java
@@ -1,20 +1,18 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
+import javax.persistence.Entity;
import java.io.Serializable;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@Getter
@Setter
-@DatabaseTable(tableName = "rocketWeapon")
+@Entity
public class Rocket extends Weapon implements Serializable {
/** Weapon name */
- @DatabaseField(columnName = "rocketWeaponName")
@NonNull
private String weaponName;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
index e3026834..d251c9be 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
@@ -1,101 +1,90 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.System;
-import com.j256.ormlite.field.DatabaseField;
import lombok.*;
+import javax.persistence.*;
import java.io.Serializable;
@Getter
@Setter
+@Entity
public abstract class Weapon implements Serializable {
/**
* ID
*/
- @DatabaseField(id = true, columnName = "ID")
@NonNull
+ @Id
private int id;
/** Weapon level */
@NonNull
- @DatabaseField(columnName = "weaponLevel")
private int weaponLevel;
/**
* Weapon damage
*/
@NonNull
- @DatabaseField(columnName = "damage")
private int damage;
/**
* Amount of rounds for the weapon to be used again
*/
@NonNull
- @DatabaseField(columnName = "cooldown")
private int cooldown;
/**
* Weapon energy
*/
@NonNull
- @DatabaseField(columnName = "energy")
private int energy;
/**
* Amount of missiles spent per attack
*/
@NonNull
- @DatabaseField(columnName = "missleCost")
private int missileCost;
/**
* Weapon accuracy
*/
@NonNull
- @DatabaseField(columnName = "accuracy")
private float precision;
/**
* probability of randomly finding this weapon
*/
@NonNull
- @DatabaseField(columnName = "dropChance")
private float dropChance;
/**
* Amount of shield bars this Weapon can ignore
*/
@NonNull
- @DatabaseField(columnName = "shieldPiercing")
private int shieldPiercing;
/**
* Probability of causing a breach in the section on hit
*/
@NonNull
- @DatabaseField(columnName = "breachChance")
private float breachChance;
/**
* Damage taken by crew in the hit section
*/
@NonNull
- @DatabaseField(columnName = "crewDamage")
private int crewDamage;
/**
* How many projectiles are fired per burst
*/
@NonNull
- @DatabaseField(columnName = "weaponBurst")
private int burst;
/** Weapon system this weapon belongs to */
- @DatabaseField(columnName = "weaponSystem",foreign = true)
+ @OneToOne
private System weaponSystem;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/OverworldDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/OverworldDAO.java
index 4354f905..15cb1071 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/OverworldDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/OverworldDAO.java
@@ -3,12 +3,8 @@ package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Overworld;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateOverworldException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.OverworldNotFoundException;
-import com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.ObjectDAO;
-import com.j256.ormlite.dao.Dao;
import lombok.NonNull;
-import javax.persistence.NamedQuery;
-import javax.persistence.Query;
public class OverworldDAO extends ObjectDAO<Overworld> {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/PlanetDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/PlanetDAO.java
index a9d2294d..92b827ff 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/PlanetDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/PlanetDAO.java
@@ -3,13 +3,9 @@ package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicatePlanetException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.PlanetNotFoundException;
-import com.j256.ormlite.dao.Dao;
public class PlanetDAO extends ObjectDAO<Planet> {
- /** Planet DAO */
- private Dao<Planet,String> planetDAO;
-
/**
* Add a new planet to the database
*
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/RoomDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/RoomDAO.java
index ce7c3b52..459d518e 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/RoomDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/RoomDAO.java
@@ -3,7 +3,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Room;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateRoomException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.RoomNotFoundException;
-import com.j256.ormlite.dao.Dao;
+
/** This class manages room objects in the database */
public class RoomDAO extends ObjectDAO<Room> {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java
index eafb79ba..19352c35 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/ShipDAO.java
@@ -1,12 +1,9 @@
package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
-import com.galaxytrucker.galaxytruckerreloaded.Model.User;
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;
+
import lombok.NonNull;
public class ShipDAO extends ObjectDAO<Ship> {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/TraderDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/TraderDAO.java
index a490d0a7..b91b19da 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/TraderDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/TraderDAO.java
@@ -3,7 +3,6 @@ package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Trader;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateTraderException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.TraderNotFoundException;
-import com.j256.ormlite.dao.Dao;
/**
* This class handles trader objects in the database
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java
index 5861eff0..cf642be9 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/UserDAO.java
@@ -3,8 +3,6 @@ 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;
import lombok.NonNull;
public class UserDAO extends ObjectDAO<User> {
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/WeaponDAO.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/WeaponDAO.java
index 52c16f0f..d8cdeec9 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/WeaponDAO.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Persistence/WeaponDAO.java
@@ -3,7 +3,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Server.Persistence;
import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateWeaponException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.WeaponNotFoundException;
-import com.j256.ormlite.dao.Dao;
+
/**
* This class manages weapons in the database
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Server.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Server.java
index 6fc08e4b..3bcc4ce1 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Server.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Server.java
@@ -1,6 +1,5 @@
package com.galaxytrucker.galaxytruckerreloaded.Server;
-import com.j256.ormlite.support.ConnectionSource;
import java.net.Socket;
@@ -21,20 +20,9 @@ public class Server {
}
- /** Start serverServiceCommunicator
- * @param source - the database connection source */
- private void startServerServiceCommunicator(ConnectionSource source){
-
- }
-
/** Receive some data from the client and return a response
* @param socket - the client socket */
private void receiveAndSendData(Socket socket){
}
- /** Initialize database
- * @return the database connection source */
- private ConnectionSource initializeDatabase(){
- return null;
- }
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/ServerServiceCommunicator.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/ServerServiceCommunicator.java
index b6c0cdf2..59ddc12c 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/ServerServiceCommunicator.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/ServerServiceCommunicator.java
@@ -1,7 +1,6 @@
package com.galaxytrucker.galaxytruckerreloaded.Server;
import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
-import com.j256.ormlite.support.ConnectionSource;
import lombok.AccessLevel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@@ -9,9 +8,6 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
public class ServerServiceCommunicator {
- /** Database connection source */
- @NonNull
- private ConnectionSource databaseConnectionSource;
/** Take a request from the client side, pass it through the services
* and return a response
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java
index 7e7d70e1..bfa05acd 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Services/UserService.java
@@ -4,7 +4,6 @@ import com.galaxytrucker.galaxytruckerreloaded.Model.User;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.DuplicateUserException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Exception.UserNotFoundException;
import com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.UserDAO;
-import com.j256.ormlite.support.ConnectionSource;
public class UserService {
@@ -53,15 +52,6 @@ public class UserService {
public void removeUserByUsername(String username) throws UserNotFoundException {
}
- /**
- * Constructor
- *
- * @param source - the database connections source
- */
- public UserService(ConnectionSource source) {
-
- }
-
/**
* Save game
*
--
GitLab