Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-08-21 20:22:45 +02:00
Code Issues Projects Releases Wiki Activity

[Debt] PlanAPI getInstance uses a static holder.

Browse Source 
This is close to a Singleton pattern, but not quite. Testing required
to know impact of using static here. - Is it possible to set null?
This commit is contained in:
Rsl1122 2018-09-29 13:21:54 +03:00
parent 32044ed016
commit e12f258a33
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/src/main/java/com/djrapitops/plan/api/CommonAPI.java
View File

@ -23,9 +23,10 @@ public abstract class CommonAPI implements PlanAPI {
private final UUIDUtility uuidUtility;
private final ErrorHandler errorHandler;
public CommonAPI(UUIDUtility uuidUtility, ErrorHandler errorHandler) {
CommonAPI(UUIDUtility uuidUtility, ErrorHandler errorHandler) {
this.uuidUtility = uuidUtility;
this.errorHandler = errorHandler;
PlanAPIHolder.set(this);
}
@Override

13
Plan/src/main/java/com/djrapitops/plan/api/PlanAPI.java
View File

@ -5,10 +5,10 @@
package com.djrapitops.plan.api;
import com.djrapitops.plan.data.plugin.PluginData;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
/**
@ -19,7 +19,16 @@ import java.util.UUID;
public interface PlanAPI {
static PlanAPI getInstance() {
return PlanSystem.getInstance().getPlanAPI();
return Optional.ofNullable(PlanAPIHolder.API)
.orElseThrow(() -> new IllegalStateException("PlanAPI has not been initialised yet."));
}
class PlanAPIHolder {
static PlanAPI API;
static void set(PlanAPI api) {
PlanAPIHolder.API = api;
}
}
void addPluginDataSource(PluginData pluginData);

6
Plan/src/main/java/com/djrapitops/plan/system/PlanSystem.java
View File

@ -4,7 +4,6 @@
*/
package com.djrapitops.plan.system;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.PlanAPI;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.data.plugin.HookHandler;
@ -97,11 +96,6 @@ public class PlanSystem implements SubSystem {
this.errorHandler = errorHandler;
}
@Deprecated
public static PlanSystem getInstance() {
return PlanPlugin.getInstance().getSystem();
}
@Override
public void enable() throws EnableException {
enableSystems(