From 851b0688c14ff6011090e6e40e27cf206ca7da5d Mon Sep 17 00:00:00 2001 From: Sekwah Date: Mon, 29 Jun 2020 01:05:14 +0100 Subject: [PATCH] A little cleanup --- .../api/services/DestinationServices.java | 3 +- .../core/api/services/PortalServices.java | 4 +- .../core/config/RepositoryModule.java | 6 +- .../repository/DestinationRepository.java | 54 ++++++++++++++- .../repository/DestinationRepositoryImpl.java | 56 ---------------- .../repository/DestinationRepositoryOld.java | 15 ----- .../repository/IDestinationRepository.java | 4 ++ ...onRepository.java => IJsonRepository.java} | 2 +- .../repository/IPortalRepository.java | 7 ++ ...ry.java => IPortalTempDataRepository.java} | 2 +- .../repository/PortalRepository.java | 36 +++++++++- .../repository/PortalRepositoryImpl.java | 41 ------------ .../PortalTempDataRepositoryImpl.java | 65 ------------------- .../services/DestinationServices.java | 6 +- .../services/PortalServices.java | 6 +- 15 files changed, 113 insertions(+), 194 deletions(-) delete mode 100644 src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryImpl.java delete mode 100644 src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryOld.java create mode 100644 src/main/java/com/sekwah/advancedportals/repository/IDestinationRepository.java rename src/main/java/com/sekwah/advancedportals/repository/{JsonRepository.java => IJsonRepository.java} (88%) create mode 100644 src/main/java/com/sekwah/advancedportals/repository/IPortalRepository.java rename src/main/java/com/sekwah/advancedportals/repository/{PortalTempDataRepository.java => IPortalTempDataRepository.java} (94%) delete mode 100644 src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java delete mode 100644 src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java diff --git a/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java b/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java index 104ed94..51d97c1 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java @@ -3,12 +3,11 @@ package com.sekwah.advancedportals.core.api.services; import com.sekwah.advancedportals.core.api.destination.Destination; import com.sekwah.advancedportals.core.data.DataTag; import com.sekwah.advancedportals.core.data.PlayerLocation; -import com.sekwah.advancedportals.repository.DestinationRepositoryOld; import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; /** * https://github.com/sekwah41/Advanced-Portals/blob/24175610892152828e21f4ff824eb1589ccb0338/src/com/sekwah/advancedportals/core/api/managers/DestinationManager.java - * Based off the old manager with the data storage and handling moved to {@link DestinationRepositoryOld} + * Based off the old manager with the data storage and handling moved to */ public final class DestinationServices { diff --git a/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java b/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java index a06c334..b2be6a2 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java @@ -1,7 +1,7 @@ package com.sekwah.advancedportals.core.api.services; import com.google.common.collect.ImmutableList; -import com.sekwah.advancedportals.repository.PortalRepository; +import com.sekwah.advancedportals.repository.IPortalRepository; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.data.DataTag; import com.sekwah.advancedportals.core.data.PlayerLocation; @@ -13,7 +13,7 @@ import java.util.Map; /** * https://github.com/sekwah41/Advanced-Portals/blob/24175610892152828e21f4ff824eb1589ccb0338/src/com/sekwah/advancedportals/core/api/managers/PortalManager.java * - * Based off the old manager with the data storage and handling moved to {@link PortalRepository} + * Based off the old manager with the data storage and handling moved to {@link IPortalRepository} * * Excluding the temp data like selections */ diff --git a/src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java b/src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java index b9262ca..3ccf8d2 100644 --- a/src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java +++ b/src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java @@ -17,9 +17,9 @@ public class RepositoryModule extends AbstractModule { @Override protected void configure() { - bind(PortalRepository.class).to(PortalRepositoryImpl.class).in(Scopes.SINGLETON); - bind(DestinationRepository.class).to(DestinationRepositoryImpl.class).in(Scopes.SINGLETON); - bind(PortalRepository.class).to(PortalRepositoryImpl.class).in(Scopes.SINGLETON); + bind(IPortalRepository.class).to(PortalRepository.class).in(Scopes.SINGLETON); + bind(IDestinationRepository.class).to(DestinationRepository.class).in(Scopes.SINGLETON); + bind(IPortalRepository.class).to(PortalRepository.class).in(Scopes.SINGLETON); bind(ConfigRepository.class).to(ConfigRepositoryImpl.class).in(Scopes.SINGLETON); //bindListener(Matchers.Any(), new Log4JTypeListenr()); } diff --git a/src/main/java/com/sekwah/advancedportals/repository/DestinationRepository.java b/src/main/java/com/sekwah/advancedportals/repository/DestinationRepository.java index a98b087..0355f58 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/DestinationRepository.java +++ b/src/main/java/com/sekwah/advancedportals/repository/DestinationRepository.java @@ -1,4 +1,56 @@ package com.sekwah.advancedportals.repository; -public interface DestinationRepository extends JsonRepository { +import com.google.common.collect.ImmutableMap; +import com.sekwah.advancedportals.core.api.destination.Destination; + +import javax.inject.Singleton; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.Map; + +@Singleton +public class DestinationRepository implements IDestinationRepository { + private final String fileLocation = ""; + + private Map destinationCache = new HashMap(); + + /*Is there any reason to load it into the array if it's not been used or connected? Q for Sekwah*/ + public void AddDestination(String name, Destination destination) throws IOException { + gson.toJson(destination, new FileWriter(fileLocation + name + ".json")); + } + + private void test() { + destinationCache.get(""); + } + + @Override + public boolean save(String name, Destination destination) { + return false; + } + + public boolean containsKey(String name) { + return Files.exists(Paths.get(fileLocation + "\\" + name + ".json")); + } + + @Override + public boolean delete(String name) { + try { + Files.deleteIfExists(Paths.get(fileLocation + "\\" + name + ".json")); + } catch (IOException e) { + e.printStackTrace(); + } + return false; + } + + @Override + public boolean update(String name, Destination destination) { + return false; + } + + public ImmutableMap get(String s) { + return null; + } } diff --git a/src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryImpl.java deleted file mode 100644 index 50d78c4..0000000 --- a/src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.sekwah.advancedportals.repository; - -import com.google.common.collect.ImmutableMap; -import com.sekwah.advancedportals.core.api.destination.Destination; - -import javax.inject.Singleton; -import java.io.FileWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.HashMap; -import java.util.Map; - -@Singleton -public class DestinationRepositoryImpl implements DestinationRepository{ - private final String fileLocation = ""; - - private Map destinationCache = new HashMap(); - - /*Is there any reason to load it into the array if it's not been used or connected? Q for Sekwah*/ - public void AddDestination(String name, Destination destination) throws IOException { - gson.toJson(destination, new FileWriter(fileLocation + name + ".json")); - } - - private void test() { - destinationCache.get(""); - } - - @Override - public boolean save(String name, Destination destination) { - return false; - } - - public boolean containsKey(String name) { - return Files.exists(Paths.get(fileLocation + "\\" + name + ".json")); - } - - @Override - public boolean delete(String name) { - try { - Files.deleteIfExists(Paths.get(fileLocation + "\\" + name + ".json")); - } catch (IOException e) { - e.printStackTrace(); - } - return false; - } - - @Override - public boolean update(String name, Destination destination) { - return false; - } - - public ImmutableMap get(String s) { - return null; - } -} diff --git a/src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryOld.java b/src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryOld.java deleted file mode 100644 index 9e7bb73..0000000 --- a/src/main/java/com/sekwah/advancedportals/repository/DestinationRepositoryOld.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.sekwah.advancedportals.repository; - -import com.google.common.collect.ImmutableMap; -import com.sekwah.advancedportals.core.api.destination.Destination; - -@Deprecated -public interface DestinationRepositoryOld { - void create(String name, Destination destination); - - void delete(String name); - - ImmutableMap getDestinations(); - - void loadDestinations(); -} diff --git a/src/main/java/com/sekwah/advancedportals/repository/IDestinationRepository.java b/src/main/java/com/sekwah/advancedportals/repository/IDestinationRepository.java new file mode 100644 index 0000000..59159cb --- /dev/null +++ b/src/main/java/com/sekwah/advancedportals/repository/IDestinationRepository.java @@ -0,0 +1,4 @@ +package com.sekwah.advancedportals.repository; + +public interface IDestinationRepository extends IJsonRepository { +} diff --git a/src/main/java/com/sekwah/advancedportals/repository/JsonRepository.java b/src/main/java/com/sekwah/advancedportals/repository/IJsonRepository.java similarity index 88% rename from src/main/java/com/sekwah/advancedportals/repository/JsonRepository.java rename to src/main/java/com/sekwah/advancedportals/repository/IJsonRepository.java index 295b42c..041a578 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/JsonRepository.java +++ b/src/main/java/com/sekwah/advancedportals/repository/IJsonRepository.java @@ -2,7 +2,7 @@ package com.sekwah.advancedportals.repository; import com.google.gson.Gson; -public interface JsonRepository { +public interface IJsonRepository { Gson gson = new Gson(); public boolean save(String name, T t); diff --git a/src/main/java/com/sekwah/advancedportals/repository/IPortalRepository.java b/src/main/java/com/sekwah/advancedportals/repository/IPortalRepository.java new file mode 100644 index 0000000..e277f60 --- /dev/null +++ b/src/main/java/com/sekwah/advancedportals/repository/IPortalRepository.java @@ -0,0 +1,7 @@ +package com.sekwah.advancedportals.repository; + +import com.sekwah.advancedportals.core.data.PortalLocation; + +public interface IPortalRepository extends IJsonRepository { + +} diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java b/src/main/java/com/sekwah/advancedportals/repository/IPortalTempDataRepository.java similarity index 94% rename from src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java rename to src/main/java/com/sekwah/advancedportals/repository/IPortalTempDataRepository.java index aa1130c..809b4f9 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java +++ b/src/main/java/com/sekwah/advancedportals/repository/IPortalTempDataRepository.java @@ -6,7 +6,7 @@ import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.UUID; -public interface PortalTempDataRepository { +public interface IPortalTempDataRepository { void addSelectedPortal(UUID selectedPlayer, String portal); void removeSelectedPortal(UUID uuid); diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java b/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java index c6f6597..5d74eb2 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java +++ b/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java @@ -1,7 +1,41 @@ package com.sekwah.advancedportals.repository; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.inject.Singleton; import com.sekwah.advancedportals.core.data.PortalLocation; -public interface PortalRepository extends JsonRepository { +import java.util.UUID; +import java.util.concurrent.TimeUnit; +@Singleton +public class PortalRepository implements IPortalRepository { + Cache selectedPortal = CacheBuilder.newBuilder() + .concurrencyLevel(4) + .expireAfterAccess(30, TimeUnit.DAYS) + .build(); + + public String getSelectedPortal(UUID uuid) { + return selectedPortal.getIfPresent(uuid); + } + + @Override + public boolean save(String name, PortalLocation portalLocation) { + return false; + } + + @Override + public boolean containsKey(String name) { + return false; + } + + @Override + public boolean delete(String name) { + return false; + } + + @Override + public boolean update(String name, PortalLocation portalLocation) { + return false; + } } diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java deleted file mode 100644 index 380e8d0..0000000 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.sekwah.advancedportals.repository; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.inject.Singleton; -import com.sekwah.advancedportals.core.data.PortalLocation; - -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -@Singleton -public class PortalRepositoryImpl implements PortalRepository { - Cache selectedPortal = CacheBuilder.newBuilder() - .concurrencyLevel(4) - .expireAfterAccess(30, TimeUnit.DAYS) - .build(); - - public String getSelectedPortal(UUID uuid) { - return selectedPortal.getIfPresent(uuid); - } - - @Override - public boolean save(String name, PortalLocation portalLocation) { - return false; - } - - @Override - public boolean containsKey(String name) { - return false; - } - - @Override - public boolean delete(String name) { - return false; - } - - @Override - public boolean update(String name, PortalLocation portalLocation) { - return false; - } -} diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java deleted file mode 100644 index 2eb19c2..0000000 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.sekwah.advancedportals.repository; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Table; -import com.google.inject.Singleton; -import com.sekwah.advancedportals.core.data.PlayerLocation; -import com.sekwah.advancedportals.core.data.PortalLocation; -import com.sekwah.advancedportals.core.connector.container.PlayerContainer; - -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -@Singleton -@Deprecated -public class PortalTempDataRepositoryImpl implements PortalTempDataRepository { - Cache selectedPortal = CacheBuilder.newBuilder() - .concurrencyLevel(4) - .expireAfterAccess(30, TimeUnit.DAYS) - .build(); - - Table selectedPositions = HashBasedTable.create(); - - @Override - public void addSelectedPortal(UUID selectedPlayer, String portal) { - selectedPortal.put(selectedPlayer, portal); - } - - @Override - public void removeSelectedPortal(UUID uuid) { - selectedPortal.invalidate(uuid); - } - - @Override - public void addSelectedPosition(UUID uuid, boolean isPos1, PortalLocation portalLocation) { - selectedPositions.put(uuid, isPos1, portalLocation); - } - - @Override - public void removeSelectedPosition(UUID uuid, boolean isPos1) { - selectedPositions.remove(uuid, isPos1); - } - - @Override - public void removeAllSelectedHand(UUID uuid) { - selectedPositions.remove(uuid, true); - selectedPositions.remove(uuid, false); - } - - @Override - public void activateCooldown(PlayerContainer player) { - - } - - @Override - public void playerLeave(PlayerContainer player) { - - } - - @Override - public boolean inPortalRegion(PlayerLocation loc) { - return false; - } -} diff --git a/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java b/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java index cdbea59..0325633 100644 --- a/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java +++ b/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java @@ -10,7 +10,7 @@ import com.sekwah.advancedportals.core.api.warphandler.TagHandler; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.connector.container.PlayerContainer; -import com.sekwah.advancedportals.repository.DestinationRepositoryImpl; +import com.sekwah.advancedportals.repository.DestinationRepository; import javax.inject.Inject; import java.io.IOException; @@ -24,10 +24,10 @@ import java.util.HashMap; */ public class DestinationServices { - DestinationRepositoryImpl destinationRepository; + DestinationRepository destinationRepository; @Inject - private DestinationServices(DestinationRepositoryImpl destinationRepository) { + private DestinationServices(DestinationRepository destinationRepository) { this.destinationRepository = destinationRepository; } diff --git a/src/main/java/com/sekwah/advancedportals/services/PortalServices.java b/src/main/java/com/sekwah/advancedportals/services/PortalServices.java index a87532d..783da62 100644 --- a/src/main/java/com/sekwah/advancedportals/services/PortalServices.java +++ b/src/main/java/com/sekwah/advancedportals/services/PortalServices.java @@ -4,16 +4,16 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.data.PlayerLocation; import com.sekwah.advancedportals.core.data.PortalLocation; import com.sekwah.advancedportals.core.connector.container.PlayerContainer; -import com.sekwah.advancedportals.repository.PortalRepository; +import com.sekwah.advancedportals.repository.IPortalRepository; import java.util.UUID; public class PortalServices { - private final PortalRepository portalRepository; + private final IPortalRepository portalRepository; @Inject - public PortalServices(PortalRepository portalRepository) { + public PortalServices(IPortalRepository portalRepository) { this.portalRepository = portalRepository; }