JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten method name

Browse Source
This commit is contained in:
Keir Nellyer 2016-06-24 17:54:54 +01:00
parent 871bb04451
commit daae2f7a3a
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/report/Report.java
View File

@ -33,7 +33,7 @@ public class Report
_category = category;
}
public Optional<Long> getReportId()
public Optional<Long> getId()
{
return Optional.ofNullable(_reportId);
}

4
Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
View File

@ -121,7 +121,7 @@ public class ReportManager
Preconditions.checkNotNull(report);
Preconditions.checkNotNull(reportHandler);
Optional<Long> reportIdOptional = report.getReportId();
Optional<Long> reportIdOptional = report.getId();
Preconditions.checkArgument(reportIdOptional.isPresent(), "Report id is not present.");
long reportId = reportIdOptional.get();
@ -348,7 +348,7 @@ public class ReportManager
public static String getReportPrefix(Report report)
{
Optional<Long> reportIdOptional = report.getReportId();
Optional<Long> reportIdOptional = report.getId();
if (reportIdOptional.isPresent())
{

6
Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
View File

@ -335,7 +335,7 @@ public class ReportRepository extends MinecraftRepository
{
try (Connection connection = DBPool.getAccount().getConnection())
{
if (!report.getReportId().isPresent())
if (!report.getId().isPresent())
{
PreparedStatement preparedStatement = connection.prepareStatement(INSERT_REPORT, Statement.RETURN_GENERATED_KEYS);
preparedStatement.setInt(1, report.getSuspectId());
@ -347,13 +347,13 @@ public class ReportRepository extends MinecraftRepository
{
report._reportId = resultSet.getLong(1);
}
else if (!report.getReportId().isPresent())
else if (!report.getId().isPresent())
{
throw new IllegalStateException("Query did not return a report id (we need one).");
}
}
Optional<Long> idOptional = report.getReportId();
Optional<Long> idOptional = report.getId();
if (idOptional.isPresent())
{

2
Plugins/Mineplex.Core/src/mineplex/core/report/command/ReportHandlerNotification.java
View File

@ -16,7 +16,7 @@ public class ReportHandlerNotification extends ReportNotification
{
super(notification);
_reportId = report.getReportId().orElseThrow(() -> new IllegalStateException("Report has no id set."));
_reportId = report.getId().orElseThrow(() -> new IllegalStateException("Report has no id set."));
_handlerId = report.getHandlerId().orElseThrow(() -> new IllegalStateException("Report has no handler."));
setTargetServers(getServersInvolved(report));

2
Plugins/Mineplex.Core/src/mineplex/core/report/task/ReportHandlerMessageTask.java
View File

@ -33,7 +33,7 @@ public class ReportHandlerMessageTask extends BukkitRunnable
@Override
public void run()
{
long reportId = _report.getReportId().orElse((long) -1);
long reportId = _report.getId().orElse((long) -1);
_reportManager.isActiveReport(_report).thenAccept(isActive ->
{

2
Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCategoryPage.java
View File

@ -62,7 +62,7 @@ public class ReportCategoryPage extends SimpleGui
if (report != null)
{
Optional<Long> reportIdOptional = report.getReportId();
Optional<Long> reportIdOptional = report.getId();
if (reportIdOptional.isPresent())
{