mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-06 15:44:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0.0-Connection-Pool-Branch' into 4.0.0-BungeeCord-Support

Browse Source 
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/Plan.java
#	Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/ConfigureWebAPI.java
This commit is contained in:
Rsl1122 2017-08-24 11:57:03 +03:00
commit b1bee36f2c
45 changed files with 255 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/pom.xml
View File

@ -17,7 +17,7 @@
</repository>
</repositories>
<dependencies>
<!-- PaperSpigot 1.12 built with Buildtools for Database classes.-->
<!-- PaperSpigot 1.12 built with BuildTools for Database classes.-->
<dependency>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper</artifactId>

4
Plan/src/main/java/com/djrapitops/plan/Log.java
View File

@ -119,7 +119,7 @@ public class Log {
* Logs trace of caught Exception to Errors.txt and notifies on console.
*
* @param source Class name the exception was caught in.
* @param e Throwable, eg NullPointerException
* @param e {@code Throwable}, eg NullPointerException
*/
public static void toLog(String source, Throwable e) {
Plan.getInstance().getPluginLogger().toLog(source, e);
@ -129,7 +129,7 @@ public class Log {
* Logs multiple caught Errors to Errors.txt.
*
* @param source Class name the exception was caught in.
* @param e Collection of Throwables, eg NullPointerException
* @param e Collection of {@code Throwable}, eg NullPointerException
*/
public static void toLog(String source, Collection<Throwable> e) {
Plan.getInstance().getPluginLogger().toLog(source, e);

2
Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageHotswapCommand.java
View File

@ -69,6 +69,8 @@ public class ManageHotswapCommand extends SubCommand {
return true;
}
assert database != null;
try {
database.getVersion(); //Test db connection
} catch (Exception e) {

2
Plan/src/main/java/com/djrapitops/plan/data/cache/AnalysisCacheHandler.java vendored
View File

@ -31,7 +31,7 @@ public class AnalysisCacheHandler {
private AnalysisData cache;
private boolean analysisEnabled;
private Set<UUID> notifyWhenCached;
private final Set<UUID> notifyWhenCached;
/**
* Class Constructor.

3
Plan/src/main/java/com/djrapitops/plan/database/Database.java
View File

@ -168,6 +168,8 @@ public abstract class Database {
return getName().toLowerCase().replace(" ", "");
}
public abstract boolean isNewDatabase() throws SQLException;
/**
* Used to get the database schema version.
*
@ -343,6 +345,7 @@ public abstract class Database {
public UserInfoTable getUserInfoTable() {
return userInfoTable;
}
public BasicDataSource getDataSource() {
return dataSource;
}

2
Plan/src/main/java/com/djrapitops/plan/database/databases/MySQLDB.java
View File

@ -32,7 +32,6 @@ public class MySQLDB extends SQLDB {
String port = config.getString("Database.MySQL.Port");
String database = config.getString("Database.MySQL.Database");
dataSource.setUrl("jdbc:mysql://" + host + ":" + port + "/" + database + "?rewriteBatchedStatements=true");
String username = config.getString("Database.MySQL.User");
@ -40,6 +39,7 @@ public class MySQLDB extends SQLDB {
dataSource.setUsername(username);
dataSource.setPassword(password);
dataSource.setMaxTotal(-1);
}

20
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -138,15 +138,6 @@ public abstract class SQLDB extends Database {
return true;
}
private boolean isNewDatabase() {
try {
getVersion();
return false;
} catch (Exception ignored) {
return true;
}
}
/**
* @return
*/
@ -197,6 +188,11 @@ public abstract class SQLDB extends Database {
return versionTable.getVersion();
}
@Override
public boolean isNewDatabase() throws SQLException {
return versionTable.isNewDatabase();
}
/**
* @param version
* @throws SQLException
@ -233,12 +229,6 @@ public abstract class SQLDB extends Database {
try {
Benchmark.start("Remove Account");
Log.debug("Database", "Removing Account: " + uuid);
try {
setupDatabase();
} catch (Exception e) {
Log.toLog(this.getClass().getName(), e);
return false;
}
for (Table t : getAllTablesInRemoveOrder()) {
if (!(t instanceof UserIDTable)) {

2
Plan/src/main/java/com/djrapitops/plan/database/sql/SqlParser.java
View File

@ -8,7 +8,7 @@ package main.java.com.djrapitops.plan.database.sql;
*/
public class SqlParser {
private StringBuilder s;
private final StringBuilder s;
public SqlParser() {
s = new StringBuilder();

5
Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java
View File

@ -39,7 +39,7 @@ public class ActionsTable extends UserIDTable {
private final String columnActionID = "action_id";
private final String columnAdditionalInfo = "additional_info";
private ServerTable serverTable;
private final ServerTable serverTable;
public ActionsTable(SQLDB db, boolean usingMySQL) {
super("plan_actions", db, usingMySQL);
@ -80,8 +80,9 @@ public class ActionsTable extends UserIDTable {
statement.setLong(4, action.getDate());
statement.setString(5, action.getAdditionalInfo());
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

6
Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java
View File

@ -25,7 +25,7 @@ public class CommandUseTable extends Table {
private final String columnCommand = "command";
private final String columnTimesUsed = "times_used";
private final String columnServerID = "server_id";
private ServerTable serverTable;
private final ServerTable serverTable;
/**
* @param db
@ -157,8 +157,8 @@ public class CommandUseTable extends Table {
}
statement.executeBatch();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}
@ -187,8 +187,8 @@ public class CommandUseTable extends Table {
}
statement.executeBatch();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

3
Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java
View File

@ -103,8 +103,9 @@ public class IPsTable extends UserIDTable {
statement.setString(2, ip);
statement.setString(3, geolocation);
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

14
Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java
View File

@ -64,17 +64,14 @@ public class KillsTable extends UserIDTable {
" OR " + columnVictimUserID + " = " + usersTable.statementSelectID);
statement.setString(1, uuid.toString());
statement.setString(2, uuid.toString());
statement.execute();
commit(statement.getConnection());
return true;
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
} finally {
try {
endTransaction(statement);
} catch (SQLException e) {
Log.toLog(this.getClass().getName(), e);
}
close(statement);
}
}
@ -106,9 +103,10 @@ public class KillsTable extends UserIDTable {
statement.setString(5, weapon);
statement.addBatch();
}
statement.executeBatch();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}
@ -128,7 +126,10 @@ public class KillsTable extends UserIDTable {
" JOIN " + usersTable + " on " + usersIDColumn + "=" + columnVictimUserID +
" WHERE " + columnKillerUserID + "=" + usersTable.statementSelectID);
statement.setString(1, uuid.toString());
set = statement.executeQuery();
commit(statement.getConnection());
while (set.next()) {
long sessionID = set.getLong(columnSessionID);
Session session = sessions.get(sessionID);
@ -142,7 +143,6 @@ public class KillsTable extends UserIDTable {
session.getPlayerKills().add(new PlayerKill(victim, weapon, date));
}
} finally {
endTransaction(statement);
close(set, statement);
}
}

5
Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java
View File

@ -20,7 +20,7 @@ public class NicknamesTable extends UserIDTable {
private final String columnNick = "nickname";
private final String columnServerID = "server_id";
private ServerTable serverTable;
private final ServerTable serverTable;
/**
* @param db The database
@ -152,9 +152,10 @@ public class NicknamesTable extends UserIDTable {
statement.setString(1, uuid.toString());
statement.setString(2, Plan.getServerUUID().toString());
statement.setString(3, displayName);
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

8
Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java
View File

@ -47,18 +47,14 @@ public class SecurityTable extends Table {
try {
statement = prepareStatement("DELETE FROM " + tableName + " WHERE (" + columnUser + "=?)");
statement.setString(1, user);
statement.execute();
commit(statement.getConnection());
return true;
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
} finally {
try {
endTransaction(statement);
} catch (SQLException e) {
Log.toLog(this.getClass().getName(), e);
}
close(statement);
}
}

7
Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java
View File

@ -65,7 +65,6 @@ public class ServerTable extends Table {
} else {
updateServerInfo(info);
}
}
private void updateServerInfo(ServerInfo info) throws SQLException {
@ -85,8 +84,9 @@ public class ServerTable extends Table {
statement.setBoolean(4, true);
statement.setInt(5, info.getId());
statement.executeUpdate();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}
@ -116,8 +116,9 @@ public class ServerTable extends Table {
statement.setString(3, webAddress);
statement.setBoolean(4, true);
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

5
Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
View File

@ -74,6 +74,7 @@ public class SessionsTable extends UserIDTable {
if (sessionID == -1) {
throw new IllegalStateException("Session was not Saved!");
}
db.getWorldTimesTable().saveWorldTimes(uuid, sessionID, session.getWorldTimes());
db.getKillsTable().savePlayerKills(uuid, sessionID, session.getPlayerKills());
}
@ -107,11 +108,11 @@ public class SessionsTable extends UserIDTable {
statement.setLong(3, session.getSessionEnd());
statement.setInt(4, session.getDeaths());
statement.setInt(5, session.getMobKills());
statement.setString(6, Plan.getServerUUID().toString());
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

5
Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
View File

@ -117,7 +117,9 @@ public class TPSTable extends Table {
statement.setLong(6, tps.getUsedMemory());
statement.setDouble(7, tps.getEntityCount());
statement.setDouble(8, tps.getChunksLoaded());
statement.execute();
commit(statement.getConnection());
} finally {
close(statement);
}
@ -133,9 +135,10 @@ public class TPSTable extends Table {
// More than 2 Months ago.
long fiveWeeks = TimeAmount.MONTH.ms() * 2L;
statement.setLong(1, MiscUtils.getTime() - fiveWeeks);
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

3
Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java
View File

@ -115,7 +115,6 @@ public abstract class Table {
* @throws SQLException
*/
protected PreparedStatement prepareStatement(String sql) throws SQLException {
System.out.println(sql);
return getConnection().prepareStatement(sql);
}
@ -203,4 +202,4 @@ public abstract class Table {
endTransaction(statement.getConnection());
}
}
}

7
Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java
View File

@ -29,17 +29,14 @@ public abstract class UserIDTable extends Table {
statement = prepareStatement("DELETE FROM " + tableName +
" WHERE (" + columnUserID + "=" + usersTable.statementSelectID + ")");
statement.setString(1, uuid.toString());
statement.execute();
commit(statement.getConnection());
return true;
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
} finally {
try {
endTransaction(statement);
} catch (SQLException e) {
Log.toLog(this.getClass().getName(), e);
}
close(statement);
}
}

6
Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java
View File

@ -70,7 +70,9 @@ public class UserInfoTable extends UserIDTable {
statement.setString(1, uuid.toString());
statement.setLong(2, registered);
statement.setString(3, Plan.getServerUUID().toString());
statement.execute();
commit(statement.getConnection());
} finally {
close(statement);
}
@ -87,6 +89,7 @@ public class UserInfoTable extends UserIDTable {
set = statement.executeQuery();
return set.next();
} finally {
endTransaction(statement);
close(set, statement);
}
}
@ -100,7 +103,9 @@ public class UserInfoTable extends UserIDTable {
statement.setBoolean(1, opped);
statement.setBoolean(2, banned);
statement.setString(3, uuid.toString());
statement.execute();
commit(statement.getConnection());
} finally {
close(statement);
}
@ -138,6 +143,7 @@ public class UserInfoTable extends UserIDTable {
}
return null;
} finally {
endTransaction(statement);
close(set, statement);
}
}

18
Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
View File

@ -1,7 +1,6 @@
package main.java.com.djrapitops.plan.database.tables;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.database.databases.SQLDB;
import main.java.com.djrapitops.plan.database.sql.*;
@ -79,16 +78,13 @@ public class UsersTable extends UserIDTable {
try {
statement = prepareStatement("DELETE FROM " + tableName + " WHERE (" + columnUUID + "=?)");
statement.setString(1, uuid.toString());
statement.execute();
commit(statement.getConnection());
return true;
} catch (SQLException ex) {
return false;
} finally {
try {
endTransaction(statement);
} catch (SQLException e) {
Log.toLog(this.getClass().getName(), e);
}
close(statement);
}
}
@ -167,9 +163,10 @@ public class UsersTable extends UserIDTable {
statement.setString(1, uuid.toString());
statement.setLong(2, registered);
statement.setString(3, name);
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}
@ -198,9 +195,10 @@ public class UsersTable extends UserIDTable {
.toString());
statement.setString(1, name);
statement.setString(2, uuid.toString());
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}
@ -231,9 +229,10 @@ public class UsersTable extends UserIDTable {
+ columnTimesKicked + "=" + columnTimesKicked + "+ 1" +
" WHERE " + columnUUID + "=?");
statement.setString(1, uuid.toString());
statement.execute();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}
@ -252,6 +251,7 @@ public class UsersTable extends UserIDTable {
}
return null;
} finally {
endTransaction(statement);
close(set, statement);
}
}

28
Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java
View File

@ -1,6 +1,5 @@
package main.java.com.djrapitops.plan.database.tables;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.database.databases.SQLDB;
import main.java.com.djrapitops.plan.database.sql.Sql;
import main.java.com.djrapitops.plan.database.sql.TableSqlParser;
@ -33,6 +32,27 @@ public class VersionTable extends Table {
);
}
public boolean isNewDatabase() throws SQLException {
PreparedStatement statement = null;
ResultSet set = null;
try {
if (usingMySQL) {
statement = prepareStatement("SHOW TABLES LIKE ?");
} else {
statement = prepareStatement("SELECT tbl_name FROM sqlite_master WHERE tbl_name=?");
}
statement.setString(1, tableName);
set = statement.executeQuery();
return set.next();
} finally {
endTransaction(statement);
close(set, statement);
}
}
/**
* @return @throws SQLException
*/
@ -47,12 +67,15 @@ public class VersionTable extends Table {
if (set.next()) {
version = set.getInt("version");
}
Log.debug("Database", "DB Schema version: " + version);
return version;
} catch (Exception exc) {
exc.printStackTrace();
} finally {
endTransaction(statement);
close(set, statement);
}
return 1;
}
/**
@ -64,6 +87,7 @@ public class VersionTable extends Table {
PreparedStatement statement = null;
try {
statement = prepareStatement("INSERT INTO " + tableName + " (version) VALUES (" + version + ")");
statement.executeUpdate();
commit(statement.getConnection());
} finally {

2
Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java
View File

@ -101,8 +101,8 @@ public class WorldTable extends Table {
}
statement.executeBatch();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

2
Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java
View File

@ -98,8 +98,8 @@ public class WorldTimesTable extends UserIDTable {
}
statement.executeBatch();
commit(statement.getConnection());
} finally {
endTransaction(statement);
close(statement);
}
}

19
Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoManager.java
View File

@ -27,10 +27,10 @@ import java.util.UUID;
*/
public class ServerInfoManager {
private Plan plugin;
private final Plan plugin;
private ServerInfo serverInfo;
private ServerInfoFile serverInfoFile;
private ServerTable serverTable;
private final ServerTable serverTable;
public ServerInfoManager(Plan plugin) {
this.plugin = plugin;
@ -60,7 +60,7 @@ public class ServerInfoManager {
}
}
private void updateDbInfo(UUID serverUUID) throws SQLException {
private void updateDbInfo(UUID serverUUID) throws SQLException, IOException {
Optional<Integer> serverID = serverTable.getServerID(serverUUID);
if (!serverID.isPresent()) {
registerServer(serverUUID);
@ -76,21 +76,24 @@ public class ServerInfoManager {
serverTable.saveCurrentServerInfo(serverInfo);
}
private void registerServer() throws SQLException {
private void registerServer() throws SQLException, IOException {
registerServer(generateNewUUID(plugin.getServer()));
}
private void registerServer(UUID serverUUID) throws SQLException {
private void registerServer(UUID serverUUID) throws SQLException, IOException {
String webAddress = plugin.getUiServer().getAccessAddress();
String name = Settings.SERVER_NAME.toString();
serverInfo = new ServerInfo(-1, serverUUID, name, webAddress);
serverTable.saveCurrentServerInfo(serverInfo);
Optional<Integer> serverID = serverTable.getServerID(serverUUID);
if (serverID.isPresent()) {
serverInfo.setId(serverID.get());
} else {
if (!serverID.isPresent()) {
throw new IllegalStateException("Failed to Register Server (ID not found)");
}
int id = serverID.get();
serverInfo.setId(id);
serverInfoFile.saveInfo(serverInfo, new ServerInfo(id, serverUUID, name, webAddress));
}
private UUID generateNewUUID(Server server) {

2
Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanChatListener.java
View File

@ -15,7 +15,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
*/
public class PlanChatListener implements Listener {
private Plan plugin;
private final Plan plugin;
/**
* Class Constructor.

2
Plan/src/main/java/com/djrapitops/plan/systems/processing/Processor.java
View File

@ -10,7 +10,7 @@ package main.java.com.djrapitops.plan.systems.processing;
* @author Rsl1122
*/
public abstract class Processor<T> {
protected T object;
protected final T object;
public Processor(T object) {
this.object = object;

2
Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPIManager.java
View File

@ -19,7 +19,7 @@ public class WebAPIManager {
throw new IllegalStateException("Utility class");
}
private static Map<String, WebAPI> registry = new HashMap<>();
private static final Map<String, WebAPI> registry = new HashMap<>();
public static void registerNewAPI(String method, WebAPI api) {
registry.put(method.toLowerCase(), api);

8
Plan/src/main/java/com/djrapitops/plan/systems/webserver/theme/Theme.java
View File

@ -47,7 +47,7 @@ public enum Theme {
"fff", "000", "267F00", "e5cc12", "b74343", "1E90FF",
"e0d264", "7dcc24", "b58310", "ac69ef", "ddd", "565556");
private String[] colors;
private final String[] colors;
Theme(String... colors) {
int length = colors.length;
@ -63,19 +63,17 @@ public enum Theme {
}
public String replaceThemeColors(String resourceString) {
Theme def = Theme.DEFAULT;
String replaced = resourceString;
for (Colors c : Colors.values()) {
replaced = replaced.replace("#" + def.getColor(c.getId()), "#" + this.getColor(c.getId()));
replaced = replaced.replace("#" + Theme.DEFAULT.getColor(c.getId()), "#" + this.getColor(c.getId()));
}
return replaced;
}
public static String replaceColors(String resourceString) {
Theme def = Theme.DEFAULT;
String replaced = resourceString;
for (Colors c : Colors.values()) {
replaced = replaced.replace("#" + def.getColor(c.getId()), c.getColor());
replaced = replaced.replace("#" + Theme.DEFAULT.getColor(c.getId()), c.getColor());
}
return replaced;
}

16
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Point.java
View File

@ -1,5 +1,7 @@
package main.java.com.djrapitops.plan.utilities.analysis;
import com.google.common.base.Objects;
/**
* @author Rsl1122
* @since 3.5.2
@ -25,4 +27,18 @@ public class Point {
public String toString() {
return "{x:" + x + " y:" + y + '}';
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Point point = (Point) o;
return Double.compare(point.x, x) == 0 &&
Double.compare(point.y, y) == 0;
}
@Override
public int hashCode() {
return Objects.hashCode(x, y);
}
}

2
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ReduceGapTriangles.java
View File

@ -30,6 +30,8 @@ public class ReduceGapTriangles {
continue;
}
assert lastPoint != null;
long date = (long) point.getX();
long lastDate = (long) lastPoint.getX();
double y = point.getY();

2
Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java
View File

@ -60,7 +60,7 @@ public enum Html {
@Deprecated ERROR_TABLE_2(TABLELINE_2.parse("No data", "No data")),
TABLE_END("</tbody></table>"); // KILLDATA_NONE("No Kills"),
private String html;
private final String html;
Html(String html) {
this.html = html;

11
Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PlayerActivityGraphCreator.java
View File

@ -1,11 +1,8 @@
package main.java.com.djrapitops.plan.utilities.html.graphs;
import main.java.com.djrapitops.plan.data.Session;
import main.java.com.djrapitops.plan.data.TPS;
import main.java.com.djrapitops.plan.utilities.analysis.Point;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@ -27,12 +24,4 @@ public class PlayerActivityGraphCreator {
.collect(Collectors.toList());
return SeriesCreator.seriesGraph(points, true);
}
public static String buildSeriesDataStringSessions(Collection<Session> sessions) {
List<Point> points = sessions.stream()
.map(session -> new Point[]{new Point(session.getSessionStart(), 1), new Point(session.getSessionEnd(), 0)})
.flatMap(Arrays::stream)
.collect(Collectors.toList());
return SeriesCreator.seriesGraph(points, true, false);
}
}

3
Plan/test/test/java/main/java/com/djrapitops/plan/data/SessionTest.java
View File

@ -28,8 +28,5 @@ public class SessionTest {
public void setUp() {
}
/**
*
*/
// TODO Rewrite
}

2
Plan/test/test/java/main/java/com/djrapitops/plan/data/cache/GeolocationCacheTest.java vendored
View File

@ -21,7 +21,7 @@ import static junit.framework.TestCase.*;
@PrepareForTest(JavaPlugin.class)
public class GeolocationCacheTest {
private Map<String, String> ipsToCountries = new HashMap<>();
private final Map<String, String> ipsToCountries = new HashMap<>();
@Before
public void setUp() {

8
Plan/test/test/java/main/java/com/djrapitops/plan/data/time/WorldTimesTest.java
View File

@ -35,7 +35,7 @@ public class WorldTimesTest {
public void testWorldChange() {
long changeTime = time + 1000L;
test.updateState(worldTwo, gms[0], changeTime);
assertEquals(1000L, (long) test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getGMTimes(worldOne).getTime(gms[0]));
}
@ -43,7 +43,7 @@ public class WorldTimesTest {
public void testGMChange() {
long changeTime = time + 1000L;
test.updateState(worldOne, gms[0], changeTime);
assertEquals(1000L, (long) test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getGMTimes(worldOne).getTime(gms[0]));
}
@ -52,10 +52,10 @@ public class WorldTimesTest {
long changeTime = time + 1000L;
long changeTime2 = changeTime + 1000L;
test.updateState(worldTwo, gms[2], changeTime);
assertEquals(1000L, (long) test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getGMTimes(worldOne).getTime(gms[0]));
test.updateState(worldOne, gms[1], changeTime2);
assertEquals(1000L, (long) test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getWorldPlaytime(worldOne));
assertEquals(1000L, test.getGMTimes(worldOne).getTime(gms[0]));
assertEquals(1000L, test.getGMTimes(worldTwo).getTime(gms[2]));
}

12
Plan/test/test/java/main/java/com/djrapitops/plan/database/DBUtilsTest.java
View File

@ -8,6 +8,7 @@ package test.java.main.java.com.djrapitops.plan.database;
import main.java.com.djrapitops.plan.database.Container;
import main.java.com.djrapitops.plan.database.DBUtils;
import org.junit.Test;
import test.java.utils.RandomData;
import java.util.ArrayList;
import java.util.HashMap;
@ -61,4 +62,15 @@ public class DBUtilsTest {
assertEquals(946, result.get(2).size());
}
@Test
public void testContainers() {
Object object = new Object();
int id = RandomData.randomInt(1, 100);
Container<Object> container = new Container<>(object, id);
assertEquals(id, container.getId());
assertEquals(object, container.getObject());
}
}

18
Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
View File

@ -47,9 +47,9 @@ public class DatabaseTest {
private Database db;
private Database backup;
private int rows;
private UUID uuid = MockUtils.getPlayerUUID();
private List<String> worlds = Arrays.asList("TestWorld", "TestWorld2");
private UUID uuid2 = MockUtils.getPlayer2UUID();
private final UUID uuid = MockUtils.getPlayerUUID();
private final List<String> worlds = Arrays.asList("TestWorld", "TestWorld2");
private final UUID uuid2 = MockUtils.getPlayer2UUID();
public DatabaseTest() {
}
@ -58,18 +58,11 @@ public class DatabaseTest {
public void setUp() throws Exception {
TestInit t = TestInit.init();
plan = t.getPlanMock();
db = new SQLiteDB(plan, "debug" + MiscUtils.getTime()) {
@Override
public void startConnectionPingTask() {
}
};
db = new SQLiteDB(plan, "debug" + MiscUtils.getTime());
db.init();
db.getServerTable().saveCurrentServerInfo(new ServerInfo(-1, t.getServerUUID(), "ServerName", ""));
db.getServerTable().saveCurrentServerInfo(new ServerInfo(-1, TestInit.getServerUUID(), "ServerName", ""));
File f = new File(plan.getDataFolder(), "Errors.txt");
rows = FileUtil.lines(f).size();
db.init();
}
@After
@ -344,6 +337,7 @@ public class DatabaseTest {
saveTwoWorlds();
saveUserOne();
saveUserTwo();
Session session = new Session(12345L, "", "");
session.endSession(22345L);
session.setWorldTimes(createWorldTimes());

88
Plan/test/test/java/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java Normal file
View File

@ -0,0 +1,88 @@
/*
* Licence is provided in the jar as license.yml also here:
* https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
*/
package test.java.main.java.com.djrapitops.plan.ui.graphs;
import main.java.com.djrapitops.plan.data.Session;
import main.java.com.djrapitops.plan.data.TPS;
import main.java.com.djrapitops.plan.ui.html.graphs.*;
import main.java.com.djrapitops.plan.utilities.analysis.Point;
import org.junit.Before;
import org.junit.Test;
import test.java.utils.RandomData;
import java.util.*;
import static junit.framework.TestCase.assertEquals;
/**
* @author Fuzzlemann
*/
public class GraphTest {
private final List<TPS> tpsList = new ArrayList<>();
private final List<Session> sessionList = new ArrayList<>();
private final Map<String, Integer> geoList = new HashMap<>();
private final Map<String, Long> worldTimes = new HashMap<>();
private List<Point> points = new ArrayList<>();
@Before
public void setUp() {
for (int i = 0; i < 10; i++) {
tpsList.add(new TPS(i, i, i, i, i, i, i));
sessionList.add(new Session(i, (long) i, (long) i, i, i));
geoList.put(String.valueOf(i), i);
worldTimes.put(String.valueOf(i), (long) i);
}
points = RandomData.randomPoints();
}
@Test
public void testGraphCreators() {
assertEquals(CPUGraphCreator.buildSeriesDataString(tpsList), "[[0,0.0],[9,9.0]]");
assertEquals(PlayerActivityGraphCreator.buildSeriesDataString(tpsList), "[[0,0.0],[9,9.0]]");
assertEquals(PunchCardGraphCreator.createDataSeries(sessionList), "[{x:3600000, y:3, z:14, marker: { radius:14}},]");
assertEquals(RamGraphCreator.buildSeriesDataString(tpsList), "[[0,0.0],[9,9.0]]");
assertEquals(TPSGraphCreator.buildSeriesDataString(tpsList), "[[0,0.0],[9,9.0]]");
assertEquals(WorldLoadGraphCreator.buildSeriesDataStringChunks(tpsList), "[[0,0.0],[9,9.0]]");
assertEquals(WorldLoadGraphCreator.buildSeriesDataStringEntities(tpsList), "[[0,0.0],[9,9.0]]");
assertEquals(WorldMapCreator.createDataSeries(geoList), "[{'code':'1','value':1},{'code':'2','value':2},{'code':'3','value':3},{'code':'4','value':4},{'code':'5','value':5},{'code':'6','value':6},{'code':'7','value':7},{'code':'8','value':8},{'code':'9','value':9}]");
assertEquals(WorldPieCreator.createSeriesData(worldTimes), "[{name:'0',y:0},{name:'1',y:1, sliced: true, selected: true},{name:'2',y:2},{name:'3',y:3},{name:'4',y:4},{name:'5',y:5},{name:'6',y:6},{name:'7',y:7},{name:'8',y:8},{name:'9',y:9}]");
}
@Test
public void testSeriesCreator() {
String result = SeriesCreator.seriesGraph(points, false, false);
String[] splittedResult = result.split(",");
Map<String, String> expected = new LinkedHashMap<>();
String key = null;
for (String resultString : splittedResult) {
resultString = resultString.replaceAll("[\\[\\]]", "");
if (key == null) {
key = resultString;
} else {
expected.put(key, resultString);
key = null;
}
}
int i2 = 0;
for (Map.Entry<String, String> entry : expected.entrySet()) {
String expectedX = entry.getKey();
String expectedY = entry.getValue();
Point point = points.get(i2);
assertEquals("Given X does not match expected X", expectedX, String.valueOf((long) point.getX()));
assertEquals("Given Y does not match expected Y", expectedY, String.valueOf(point.getY()));
i2++;
}
}
}

9
Plan/test/test/java/main/java/com/djrapitops/plan/utilities/NewPlayerCreatorTest.java
View File

@ -20,22 +20,13 @@ import org.powermock.modules.junit4.PowerMockRunner;
@PrepareForTest(JavaPlugin.class)
public class NewPlayerCreatorTest {
/**
*
*/
public NewPlayerCreatorTest() {
}
/**
*
*/
@Before
public void setUp() throws Exception {
}
/**
*
*/
@After
public void tearDown() {
}

4
Plan/test/test/java/main/java/com/djrapitops/plan/utilities/PassEncryptTest.java
View File

@ -21,9 +21,9 @@ public class PassEncryptTest {
@Before
public void setUp() throws Exception {
for (int i = 0; i < 20; i++) {
String password = RandomData.randomString(RandomData.randomInt(1, 50));
String password = RandomData.randomString(RandomData.randomInt(1, 20));
PASSWORD_MAP.put(password, PassEncryptUtil.createHash(password));
};
}
}
@Test

2
Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java
View File

@ -28,7 +28,7 @@ import static junit.framework.TestCase.assertNotNull;
@PrepareForTest(JavaPlugin.class)
public class HastebinTest {
private AtomicReference<String> testLink = new AtomicReference<>(null);
private final AtomicReference<String> testLink = new AtomicReference<>(null);
@Before
public void checkAvailability() throws Exception {

20
Plan/test/test/java/utils/DBTestSuite.java
View File

@ -22,27 +22,31 @@ import java.io.IOException;
public class DBTestSuite {
@BeforeClass
public static void setUp() throws IOException {
clean(true);
clean();
}
@AfterClass
public static void tearDown() throws IOException {
clean(false);
clean();
}
private static void clean(boolean dbOnly) throws IOException {
private static void clean() {
File testFolder = TestInit.getTestFolder();
if (!testFolder.exists() || !testFolder.isDirectory()) {
return;
}
for (File f : testFolder.listFiles()) {
if (dbOnly && !f.getName().contains(".db")) {
continue;
}
File[] files = testFolder.listFiles();
f.delete();
if (files == null) {
return;
}
for (File f : files) {
if (!f.delete()) {
f.deleteOnExit();
}
}
}
}

21
Plan/test/test/java/utils/MockUtils.java
View File

@ -23,18 +23,12 @@ import static org.powermock.api.mockito.PowerMockito.when;
*/
public class MockUtils {
/**
* @return
*/
public static World mockWorld() {
World mockWorld = Mockito.mock(World.class);
when(mockWorld.toString()).thenReturn("World");
return mockWorld;
}
/**
* @return
*/
public static IPlayer mockIPlayer() {
return Fetch.wrapBukkit(mockPlayer());
}
@ -54,16 +48,10 @@ public class MockUtils {
return p;
}
/**
* @return
*/
public static UUID getPlayerUUID() {
return UUID.fromString("45b0dfdb-f71d-4cf3-8c21-27c9d4c651db");
}
/**
* @return
*/
public static IPlayer mockIPlayer2() {
return Fetch.wrapBukkit(mockPlayer2());
}
@ -83,9 +71,6 @@ public class MockUtils {
return p;
}
/**
* @return
*/
public static UUID getPlayer2UUID() {
return UUID.fromString("ec94a954-1fa1-445b-b09b-9b698519af80");
}
@ -97,9 +82,6 @@ public class MockUtils {
return uuids;
}
/**
* @return
*/
public static IPlayer mockBrokenPlayer() {
Player p = PowerMockito.mock(Player.class);
when(p.getGameMode()).thenReturn(GameMode.SURVIVAL);
@ -114,9 +96,6 @@ public class MockUtils {
return Fetch.wrapBukkit(p);
}
/**
* @return
*/
public static CommandSender mockConsoleSender() {
return PowerMockito.mock(CommandSender.class);
}

1
Plan/test/test/java/utils/TestInit.java
View File

@ -24,7 +24,6 @@ import org.powermock.api.mockito.PowerMockito;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.util.UUID;
import java.util.logging.Logger;