Skip to content

Commit bea1cb5

Browse files
committed
Fix: Use of identifier that is a keyword in later Java versions
record - Since Java 14. Used to declare record classes.
1 parent 6107b9a commit bea1cb5

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

src/main/java/org/maxgamer/quickshop/database/SimpleDatabaseHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,15 +403,15 @@ public void updateShop(@NotNull String owner, @NotNull ItemStack item, int unlim
403403
}
404404

405405
@Override
406-
public void insertHistoryRecord(Object record) {
406+
public void insertHistoryRecord(Object rec) {
407407
String sqlString = "INSERT INTO " + plugin.getDbPrefix() + "logs (time, classname, data) VALUES (?, ?, ?)";
408408
manager.addDelayTask(
409409
new DatabaseTask(
410410
sqlString,
411411
(ps) -> {
412412
ps.setLong(1, System.currentTimeMillis());
413-
ps.setString(2, record.getClass().getName());
414-
ps.setString(3, JsonUtil.getGson().toJson(record));
413+
ps.setString(2, rec.getClass().getName());
414+
ps.setString(3, JsonUtil.getGson().toJson(rec));
415415
}));
416416
}
417417

src/main/java/org/maxgamer/quickshop/util/reporter/error/RollbarErrorReporter.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -336,34 +336,34 @@ class GlobalExceptionFilter implements Filter {
336336
this.preFilter = preFilter;
337337
}
338338

339-
private boolean defaultValue(LogRecord record) {
340-
return preFilter == null || preFilter.isLoggable(record);
339+
private boolean defaultValue(LogRecord rec) {
340+
return preFilter == null || preFilter.isLoggable(rec);
341341
}
342342

343343
/**
344344
* Check if a given log record should be published.
345345
*
346-
* @param record a LogRecord
346+
* @param rec a LogRecord
347347
* @return true if the log record should be published.
348348
*/
349349
@Override
350-
public boolean isLoggable(@NotNull LogRecord record) {
350+
public boolean isLoggable(@NotNull LogRecord rec) {
351351
if (!enabled) {
352-
return defaultValue(record);
352+
return defaultValue(rec);
353353
}
354-
Level level = record.getLevel();
354+
Level level = rec.getLevel();
355355
if (level != Level.WARNING && level != Level.SEVERE) {
356-
return defaultValue(record);
356+
return defaultValue(rec);
357357
}
358-
if (record.getThrown() == null) {
359-
return defaultValue(record);
358+
if (rec.getThrown() == null) {
359+
return defaultValue(rec);
360360
}
361361
if (Util.isDevMode()) {
362-
sendError(record.getThrown(), record.getMessage());
363-
return defaultValue(record);
362+
sendError(rec.getThrown(), rec.getMessage());
363+
return defaultValue(rec);
364364
} else {
365-
sendError(record.getThrown(), record.getMessage());
366-
PossiblyLevel possiblyLevel = checkWasCauseByQS(record.getThrown());
365+
sendError(rec.getThrown(), rec.getMessage());
366+
PossiblyLevel possiblyLevel = checkWasCauseByQS(rec.getThrown());
367367
if (possiblyLevel == PossiblyLevel.IMPOSSIBLE) {
368368
return true;
369369
}
@@ -386,34 +386,34 @@ class QuickShopExceptionFilter implements Filter {
386386
this.preFilter = preFilter;
387387
}
388388

389-
private boolean defaultValue(LogRecord record) {
390-
return preFilter == null || preFilter.isLoggable(record);
389+
private boolean defaultValue(LogRecord rec) {
390+
return preFilter == null || preFilter.isLoggable(rec);
391391
}
392392

393393
/**
394394
* Check if a given log record should be published.
395395
*
396-
* @param record a LogRecord
396+
* @param rec a LogRecord
397397
* @return true if the log record should be published.
398398
*/
399399
@Override
400-
public boolean isLoggable(@NotNull LogRecord record) {
400+
public boolean isLoggable(@NotNull LogRecord rec) {
401401
if (!enabled) {
402-
return defaultValue(record);
402+
return defaultValue(rec);
403403
}
404-
Level level = record.getLevel();
404+
Level level = rec.getLevel();
405405
if (level != Level.WARNING && level != Level.SEVERE) {
406-
return defaultValue(record);
406+
return defaultValue(rec);
407407
}
408-
if (record.getThrown() == null) {
409-
return defaultValue(record);
408+
if (rec.getThrown() == null) {
409+
return defaultValue(rec);
410410
}
411411
if (Util.isDevMode()) {
412-
sendError(record.getThrown(), record.getMessage());
413-
return defaultValue(record);
412+
sendError(rec.getThrown(), rec.getMessage());
413+
return defaultValue(rec);
414414
} else {
415-
sendError(record.getThrown(), record.getMessage());
416-
PossiblyLevel possiblyLevel = checkWasCauseByQS(record.getThrown());
415+
sendError(rec.getThrown(), rec.getMessage());
416+
PossiblyLevel possiblyLevel = checkWasCauseByQS(rec.getThrown());
417417
if (possiblyLevel == PossiblyLevel.IMPOSSIBLE) {
418418
return true;
419419
}

0 commit comments

Comments
 (0)