Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use TimeUnit for time calculations

Browse Source
This commit is contained in:
P0nk
2021-09-10 18:56:03 +02:00
parent d52aedac4f
commit cdc17ef3dd
49 changed files with 268 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/tools/DatabaseConnection.java
View File

@@ -10,7 +10,8 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.time.Duration;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.SECONDS;
/**
* @author Frz (Big Daddy)
@@ -46,8 +47,8 @@ public class DatabaseConnection {
config.setPassword(YamlConfig.config.server.DB_PASS);
final int initFailTimeoutSeconds = YamlConfig.config.server.INIT_CONNECTION_POOL_TIMEOUT;
config.setInitializationFailTimeout(TimeUnit.SECONDS.toMillis(initFailTimeoutSeconds));
config.setConnectionTimeout(30 * 1000); // Hikari default
config.setInitializationFailTimeout(SECONDS.toMillis(initFailTimeoutSeconds));
config.setConnectionTimeout(SECONDS.toMillis(30)); // Hikari default
config.setMaximumPoolSize(10); // Hikari default
config.addDataSourceProperty("cachePrepStmts", true);

7
src/main/java/tools/LogHelper.java
View File

@@ -12,6 +12,9 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
public class LogHelper {
public static void logTrade(Trade trade1, Trade trade2) {
@@ -53,8 +56,8 @@ public class LogHelper {
public static String getTimeString(long then) {
long duration = System.currentTimeMillis() - then;
int seconds = (int) (duration / 1000) % 60;
int minutes = (int) ((duration / (1000 * 60)) % 60);
int seconds = (int) (duration / SECONDS.toMillis(1)) % 60;
int minutes = (int) ((duration / MINUTES.toMillis(1)) % 60);
return minutes + " Minutes and " + seconds + " Seconds";
}

3
src/main/java/tools/mapletools/CodeCouponGenerator.java
View File

@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
* @author RonanLana
@@ -237,7 +238,7 @@ public class CodeCouponGenerator {
generatedKeys = null;
PreparedStatement ps = con.prepareStatement("INSERT IGNORE INTO `nxcode` (`code`, `expiration`) VALUES (?, ?)", Statement.RETURN_GENERATED_KEYS);
ps.setLong(2, currentTime + ((long) recipe.duration * 60 * 60 * 1000));
ps.setLong(2, currentTime + TimeUnit.HOURS.toMillis(recipe.duration));
for (int i = 0; i < recipe.quantity; i++) {
ps.setString(1, generateCouponCode());