mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-21 05:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs & vulns reported by Sonar

Browse Source
This commit is contained in:
Rsl1122 2018-01-28 15:35:11 +02:00
parent 58f2d7f02c
commit bc17486fdb
6 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLiteDB.java
View File

@ -57,19 +57,21 @@ public class SQLiteDB extends SQLDB {
}
String dbFilePath = new File(PlanPlugin.getInstance().getDataFolder(), dbName + ".db").getAbsolutePath();
Connection connection;
try {
connection = DriverManager.getConnection("jdbc:sqlite:" + dbFilePath + "?journal_mode=WAL");
} catch (SQLException ignored) {
connection = DriverManager.getConnection("jdbc:sqlite:" + dbFilePath);
Log.info("SQLite WAL mode not supported on this server version, using default. This may or may not affect performance.");
}
Connection connection = getConnectionFor(dbFilePath);
connection.setAutoCommit(false);
return connection;
}
private Connection getConnectionFor(String dbFilePath) throws SQLException {
try {
return DriverManager.getConnection("jdbc:sqlite:" + dbFilePath + "?journal_mode=WAL");
} catch (SQLException ignored) {
Log.info("SQLite WAL mode not supported on this server version, using default. This may or may not affect performance.");
return DriverManager.getConnection("jdbc:sqlite:" + dbFilePath);
}
}
private void startConnectionPingTask() {
stopConnectionPingTask();
try {
@ -84,6 +86,7 @@ public class SQLiteDB extends SQLDB {
statement.execute("/* ping */ SELECT 1");
}
} catch (SQLException e) {
Log.debug("Something went wrong during Ping task.");
try {
connection = getNewConnection(dbName);
} catch (SQLException e1) {

1
Plan/src/main/java/com/djrapitops/plan/system/processing/importing/importers/Importer.java
View File

@ -73,6 +73,7 @@ public abstract class Importer {
service.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
} catch (InterruptedException e) {
Log.toLog(this.getClass().getName(), e);
Thread.currentThread().interrupt();
}
Benchmark.stop(benchmarkName);

2
Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/RegisterProcessor.java
View File

@ -11,6 +11,7 @@ import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.processing.Processor;
import com.djrapitops.plan.system.processing.processors.ObjectProcessor;
import com.djrapitops.plan.utilities.NullCheck;
import com.djrapitops.plugin.api.utility.log.Log;
import java.util.UUID;
@ -41,6 +42,7 @@ public class RegisterProcessor extends PlayerProcessor {
public void process() {
UUID uuid = getUUID();
Database db = Database.getActive();
NullCheck.check(uuid, new IllegalStateException("UUID was null"));
try {
if (!db.check().isPlayerRegistered(uuid)) {
db.save().registerNewUser(uuid, registered, name);

8
Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
View File

@ -123,7 +123,7 @@ public class AnalysisUtils {
}
public static double getAveragePerDay(long after, long before, long total) {
return total / getNumberOfDaysBetween(after, before);
return (double) total / getNumberOfDaysBetween(after, before);
}
public static long getNumberOfDaysBetween(long start, long end) {
@ -134,7 +134,7 @@ public class AnalysisUtils {
test += day;
value++;
}
return value;
return value == 0 ? 1 : value;
}
public static void addMissingWorlds(WorldTimes worldTimes) {
@ -196,7 +196,7 @@ public class AnalysisUtils {
stickM++;
}
}
probability *= (stickM / similarM.size());
probability *= ((double) stickM / similarM.size());
}
if (!similarW.isEmpty()) {
@ -207,7 +207,7 @@ public class AnalysisUtils {
}
}
probability *= (stickW / similarW.size());
probability *= ((double) stickW / similarW.size());
}
return probability;

6
Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java
View File

@ -167,7 +167,6 @@ public class HtmlExport extends SpecificExport {
copyFromJar(resources, true);
}
private void copyFromJar(String[] resources, boolean overwrite) {
for (String resource : resources) {
try {
@ -185,8 +184,9 @@ public class HtmlExport extends SpecificExport {
File to = new File(outputFolder, outputFile);
to.getParentFile().mkdirs();
if (to.exists()) {
to.delete();
to.createNewFile();
if (!to.delete() || !to.createNewFile()) {
return;
}
}
export(to, lines);
}

10
Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java
View File

@ -855,6 +855,16 @@ public class SQLiteTest {
assertTrue(db.getUserInfoTable().isRegistered(playerUUID));
}
@Test
public void testRegister() throws DBException {
assertFalse(db.check().isPlayerRegistered(playerUUID));
assertFalse(db.check().isPlayerRegisteredOnThisServer(playerUUID));
db.save().registerNewUser(playerUUID, 1000L, "name");
db.save().registerNewUserOnThisServer(playerUUID, 500L);
assertTrue(db.check().isPlayerRegistered(playerUUID));
assertTrue(db.check().isPlayerRegisteredOnThisServer(playerUUID));
}
@Test
public void testWorldTableGetWorldNamesNoException() throws SQLException {
Set<String> worldNames = db.getWorldTable().getWorldNames();