Changed access modifiers (or whatever they're called)
This commit is contained in:
parent
4d1e22c65f
commit
f7e6c79646
|
|
@ -5,11 +5,11 @@ import org.bukkit.scheduler.BukkitRunnable;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class DataLock implements DataLockInterface {
|
class DataLock implements DataLockInterface {
|
||||||
|
|
||||||
private static DataLock instance = null;
|
private static DataLock instance = null;
|
||||||
|
|
||||||
public static DataLock getInstance() {
|
protected static DataLock getInstance() {
|
||||||
if (instance == null)
|
if (instance == null)
|
||||||
instance = new DataLock();
|
instance = new DataLock();
|
||||||
return instance;
|
return instance;
|
||||||
|
|
@ -35,7 +35,7 @@ public class DataLock implements DataLockInterface {
|
||||||
|
|
||||||
private final HashSet<String> activeChannels = new HashSet<>();
|
private final HashSet<String> activeChannels = new HashSet<>();
|
||||||
|
|
||||||
public boolean removeActiveRequest(RequestType requestType, IdempotencyData idempotencyData) {
|
protected boolean removeActiveRequest(RequestType requestType, IdempotencyData idempotencyData) {
|
||||||
return activeRequests.removeIdempotencyData(requestType, idempotencyData);
|
return activeRequests.removeIdempotencyData(requestType, idempotencyData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
public class DataLockLib extends JavaPlugin {
|
public class DataLockLib extends JavaPlugin {
|
||||||
|
|
||||||
public static DataLockLib instance;
|
private static DataLockLib instance;
|
||||||
|
|
||||||
protected static DataLockLib getInstance() {
|
protected static DataLockLib getInstance() {
|
||||||
return instance;
|
return instance;
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,11 @@ import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class Idempotency {
|
class Idempotency {
|
||||||
|
|
||||||
private final HashMap<RequestType, HashSet<IdempotencyData>> idempotencyMap;
|
private final HashMap<RequestType, HashSet<IdempotencyData>> idempotencyMap;
|
||||||
|
|
||||||
public Idempotency() {
|
protected Idempotency() {
|
||||||
idempotencyMap = new HashMap<>();
|
idempotencyMap = new HashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -24,7 +24,7 @@ public class Idempotency {
|
||||||
* @param idempotencyData Data to add to the set
|
* @param idempotencyData Data to add to the set
|
||||||
* @return true if entry did not exist yet
|
* @return true if entry did not exist yet
|
||||||
*/
|
*/
|
||||||
public synchronized boolean putIdempotencyData(RequestType requestType, IdempotencyData idempotencyData) {
|
protected synchronized boolean putIdempotencyData(RequestType requestType, IdempotencyData idempotencyData) {
|
||||||
HashSet<IdempotencyData> idempotencySet = getIdempotencySet(requestType);
|
HashSet<IdempotencyData> idempotencySet = getIdempotencySet(requestType);
|
||||||
boolean result = idempotencySet.add(idempotencyData);
|
boolean result = idempotencySet.add(idempotencyData);
|
||||||
putIdempotencySet(requestType, idempotencySet);
|
putIdempotencySet(requestType, idempotencySet);
|
||||||
|
|
@ -36,14 +36,14 @@ public class Idempotency {
|
||||||
* @param idempotencyData Data to remove from the set
|
* @param idempotencyData Data to remove from the set
|
||||||
* @return True if the data that was requested to be removed was in the set and was removed
|
* @return True if the data that was requested to be removed was in the set and was removed
|
||||||
*/
|
*/
|
||||||
public synchronized boolean removeIdempotencyData(RequestType requestType, IdempotencyData idempotencyData) {
|
protected synchronized boolean removeIdempotencyData(RequestType requestType, IdempotencyData idempotencyData) {
|
||||||
HashSet<IdempotencyData> idempotencySet = getIdempotencySet(requestType);
|
HashSet<IdempotencyData> idempotencySet = getIdempotencySet(requestType);
|
||||||
boolean result = idempotencySet.remove(idempotencyData);
|
boolean result = idempotencySet.remove(idempotencyData);
|
||||||
putIdempotencySet(requestType, idempotencySet);
|
putIdempotencySet(requestType, idempotencySet);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized Set<IdempotencyData> getIdempotencyData(RequestType requestType) {
|
protected synchronized Set<IdempotencyData> getIdempotencyData(RequestType requestType) {
|
||||||
return Collections.unmodifiableSet(getIdempotencySet(requestType));
|
return Collections.unmodifiableSet(getIdempotencySet(requestType));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,18 @@ public class LockResponseEvent extends Event {
|
||||||
return channel;
|
return channel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ResponseType getResponseType() {
|
||||||
|
return responseType;
|
||||||
|
}
|
||||||
|
|
||||||
public String getData() {
|
public String getData() {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getResult() {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
public @NotNull HandlerList getHandlers() {
|
public @NotNull HandlerList getHandlers() {
|
||||||
return handlers;
|
return handlers;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessageListener {
|
class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessageListener {
|
||||||
|
|
||||||
private final DataLock dataLock;
|
private final DataLock dataLock;
|
||||||
private final Idempotency alreadyReceived;
|
private final Idempotency alreadyReceived;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
public enum RequestType {
|
enum RequestType {
|
||||||
TRY_LOCK("try-lock"),
|
TRY_LOCK("try-lock"),
|
||||||
TRY_UNLOCK("try-unlock"),
|
TRY_UNLOCK("try-unlock"),
|
||||||
CHECK_LOCK("check-lock");
|
CHECK_LOCK("check-lock");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user