Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-17 12:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated BasicDAO and dev.morphia and replace it with the proper dependency

Browse Source
This commit is contained in:
spacerocket62
2020-10-27 20:45:01 -07:00
parent fac87d8c66
commit f1744f2050
7 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/totalfreedom/plex/cache/MongoPlayerData.java vendored
View File

@@ -1,9 +1,10 @@
package me.totalfreedom.plex.cache;
import dev.morphia.query.Query;
import dev.morphia.query.UpdateOperations;
import me.totalfreedom.plex.Plex;
import me.totalfreedom.plex.player.PlexPlayer;
import org.mongodb.morphia.query.FindOptions;
import org.mongodb.morphia.query.Query;
import org.mongodb.morphia.query.UpdateOperations;
import java.util.UUID;
@@ -21,7 +22,7 @@ public class MongoPlayerData
Query<PlexPlayer> query = plexPlayerDAO.createQuery();
if (query.field("uuid").exists().field("uuid").equal(uuid.toString()).find().tryNext() != null)
if (query.field("uuid").exists().field("uuid").equal(uuid.toString()).get() != null)
{
return true;
}
@@ -35,7 +36,7 @@ public class MongoPlayerData
return PlayerCache.getPlexPlayerMap().get(uuid);
}
Query<PlexPlayer> query2 = plexPlayerDAO.createQuery().field("uuid").exists().field("uuid").equal(uuid.toString());
return query2.first();
return query2.get();
}
public void update(PlexPlayer player)
@@ -48,7 +49,7 @@ public class MongoPlayerData
updateOps.set("name", player.getName());
updateOps.set("loginMSG", player.getLoginMSG());
updateOps.set("prefix", player.getPrefix());
updateOps.set("rank", player.getRank() == null ? "" : player.getRank().name().toLowerCase());
updateOps.set("rank", player.getRank().toLowerCase());
updateOps.set("ips", player.getIps());
updateOps.set("coins", player.getCoins());
plexPlayerDAO.update(filter, updateOps);

12
src/main/java/me/totalfreedom/plex/cache/PlexPlayerDAO.java vendored
View File

@@ -1,12 +1,12 @@
package me.totalfreedom.plex.cache;
import dev.morphia.Datastore;
import dev.morphia.Key;
import dev.morphia.dao.BasicDAO;
import dev.morphia.query.Query;
import dev.morphia.query.UpdateOperations;
import dev.morphia.query.UpdateResults;
import me.totalfreedom.plex.player.PlexPlayer;
import org.mongodb.morphia.Datastore;
import org.mongodb.morphia.Key;
import org.mongodb.morphia.dao.BasicDAO;
import org.mongodb.morphia.query.Query;
import org.mongodb.morphia.query.UpdateOperations;
import org.mongodb.morphia.query.UpdateResults;
public class PlexPlayerDAO extends BasicDAO<PlexPlayer, Object> {

6
src/main/java/me/totalfreedom/plex/cache/SQLPlayerData.java vendored
View File

@@ -60,7 +60,7 @@ public class SQLPlayerData
plexPlayer.setName(name);
plexPlayer.setLoginMSG(loginMSG);
plexPlayer.setPrefix(prefix);
plexPlayer.setRank(rankName.isEmpty() ? null : rank);
plexPlayer.setRank(rankName.toLowerCase());
plexPlayer.setIps(ips);
plexPlayer.setCoins(coins);
}
@@ -80,7 +80,7 @@ public class SQLPlayerData
statement.setString(1, player.getName());
statement.setString(2, player.getLoginMSG());
statement.setString(3, player.getPrefix());
statement.setString(4, player.getRank() == null ? "" : player.getRank().name().toLowerCase());
statement.setString(4, player.getRank().toLowerCase());
statement.setString(5, new Gson().toJson(player.getIps()));
statement.setLong(6, player.getCoins());
statement.setString(7, player.getUuid());
@@ -100,7 +100,7 @@ public class SQLPlayerData
statement.setString(2, player.getName());
statement.setString(3, player.getLoginMSG());
statement.setString(4, player.getPrefix());
statement.setString(5, player.getRank() == null ? "" : player.getRank().name().toLowerCase());
statement.setString(5, player.getRank().toLowerCase());
statement.setString(6, new Gson().toJson(player.getIps()));
statement.execute();
}