From d813aa547e94f43af8e38a69080997db913b8faa Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 28 Jan 2018 19:35:22 +0200 Subject: [PATCH] Removed old API class in main.java.com.djrapitops.plan (Didn't help) --- .../djrapitops/plan/utilities/Base64Util.java | 6 + .../main/java/com/djrapitops/plan/Plan.java | 29 -- .../java/com/djrapitops/plan/api/API.java | 292 ------------------ 3 files changed, 6 insertions(+), 321 deletions(-) delete mode 100644 Plan/src/main/java/main/java/com/djrapitops/plan/Plan.java delete mode 100644 Plan/src/main/java/main/java/com/djrapitops/plan/api/API.java diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/Base64Util.java b/Plan/src/main/java/com/djrapitops/plan/utilities/Base64Util.java index 8ecdfa385..64d15d04b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/Base64Util.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/Base64Util.java @@ -13,6 +13,12 @@ import java.util.Base64; */ public class Base64Util { + /** + * Hides public constructor. + */ + private Base64Util() { + } + public static String encode(String decoded) { byte[] encoded = Base64.getEncoder().encode(decoded.getBytes()); return new String(encoded); diff --git a/Plan/src/main/java/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/main/java/com/djrapitops/plan/Plan.java deleted file mode 100644 index 3562f21bf..000000000 --- a/Plan/src/main/java/main/java/com/djrapitops/plan/Plan.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licence is provided in the jar as license.yml also here: - * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml - */ -package main.java.com.djrapitops.plan; - -import main.java.com.djrapitops.plan.api.API; - -/** - * Older package version of Plan. - * - * @author Rsl1122 - * @deprecated Use com.djrapitops.plan.Plan instead. - */ -@Deprecated -public class Plan { - - /** - * Old method for getting old API. - * - * @return new instance of the old API object to not break old API. - * @deprecated Use PlanAPI.getInstance() instead as new API. - */ - @Deprecated - public static API getPlanAPI() { - return new API(com.djrapitops.plan.Plan.getInstance()); - } - -} \ No newline at end of file diff --git a/Plan/src/main/java/main/java/com/djrapitops/plan/api/API.java b/Plan/src/main/java/main/java/com/djrapitops/plan/api/API.java deleted file mode 100644 index 6a5555863..000000000 --- a/Plan/src/main/java/main/java/com/djrapitops/plan/api/API.java +++ /dev/null @@ -1,292 +0,0 @@ -package main.java.com.djrapitops.plan.api; - -import com.djrapitops.plan.Plan; -import com.djrapitops.plan.api.exceptions.connection.WebException; -import com.djrapitops.plan.api.exceptions.database.DBException; -import com.djrapitops.plan.data.calculation.AnalysisData; -import com.djrapitops.plan.data.plugin.PluginData; -import com.djrapitops.plan.system.database.databases.Database; -import com.djrapitops.plan.system.info.InfoSystem; -import com.djrapitops.plan.system.info.connection.WebExceptionLogger; -import com.djrapitops.plan.system.info.request.GenerateAnalysisPageRequest; -import com.djrapitops.plan.system.info.server.ServerInfo; -import com.djrapitops.plan.system.webserver.response.DefaultResponses; -import com.djrapitops.plan.system.webserver.response.cache.PageId; -import com.djrapitops.plan.system.webserver.response.cache.ResponseCache; -import com.djrapitops.plan.system.webserver.response.pages.AnalysisPageResponse; -import com.djrapitops.plan.utilities.analysis.Analysis; -import com.djrapitops.plan.utilities.uuid.UUIDUtility; -import com.djrapitops.plugin.api.utility.log.Log; -import com.djrapitops.plugin.utilities.Verify; -import org.bukkit.OfflinePlayer; - -import java.util.Collection; -import java.util.Collections; -import java.util.UUID; - -import static org.bukkit.Bukkit.getOfflinePlayer; - -/** - * This class contains the API methods for Bukkit version of the plugin. - *

- * Methods can be called from Asynchronous task and are thread safe unless - * otherwise stated. - *

- * More information about API methods can be found on GitHub. - * - * @author Rsl1122 - * @see PluginData - * @since 4.0.0 - * @deprecated Old version of Plan API, use PlanAPI.getInstance() instead. - */ -@Deprecated -public class API { - - private final Plan plugin; - - /** - * Creates a new API instance - not supposed to be called outside {@code Plan.onEnable}. - * - * @param plugin Current instance of Plan - */ - public API(Plan plugin) { - this.plugin = plugin; - } - - /** - * Condition whether or not the plugin enabled successfully. - * - * @return true if plugin is enabled correctly. - */ - @Deprecated - public boolean isEnabled() { - return plugin.isEnabled(); - } - - /** - * Add a source of plugin data to the Plugins tab on Analysis and/or Inspect - * page. - *

- * Refer to documentation on GitHub or Javadoc of PluginData to set-up a - * data source that extends PluginData correctly. - * - * @param dataSource an object that extends PluginData-object, thus allowing - * Analysis and Inspect to manage the data of a plugin correctly. - * @see PluginData - */ - @Deprecated - public void addPluginDataSource(PluginData dataSource) { - if (isEnabled()) { - plugin.getHookHandler().addPluginDataSource(dataSource); - } - } - - /** - * Used to get a relative link to InspectPage of a player. - *

- * This method is useful if you have a table and want to link to the inspect - * page. - *

- * Html.LINK.parse("Link", "PlayerName") can be used to get a link - * {@code PlayerName} - * - * @param name Name of the player - * @return {@code ../player/PlayerName} - */ - @Deprecated - public String getPlayerInspectPageLink(String name) { - if (name == null) { - return "#"; - } - return "../player/" + name.replace(" ", "%20").replace(".", "%2E"); - } - - /** - * Condition if Players's Inspect page is cached to ResponseCache. - * - * @param uuid UUID of the player. - * @return true/false - * @deprecated use {@code isPlayerHtmlCached} - */ - @Deprecated - public boolean isPlayersDataInspectCached(UUID uuid) { - return isPlayerHtmlCached(uuid); - } - - /** - * Condition if Players's Inspect page is cached to ResponseCache of the providing WebServer. - *

- * Using BungeeCord: Will send a {@code IsCachedWebAPI} request to check if the page is in Bungee's ResponseCache. - * Only Bukkit: Checks ResponseCache for page. - * - * @param uuid UUID of the player. - * @return true/false - */ - @Deprecated - public boolean isPlayerHtmlCached(UUID uuid) { - return ResponseCache.isCached(PageId.PLAYER.of(uuid)); - } - - /** - * Cache Players's Inspect page to the ResponseCache of the providing WebServer. - * - * @param uuid UUID of the player. - * @deprecated use {@code cachePlayerHtml} - */ - @Deprecated - public void cacheUserDataToInspectCache(UUID uuid) { - cachePlayerHtml(uuid); - } - - /** - * Cache Players's Inspect page to the ResponseCache of the providing WebServer. - *

- * Using BungeeCord: Will send a {@code PostHtmlWebAPI} request after calculating the inspect page. - * Only Bukkit: Calculates inspect page and places it in the ResponseCache. - * - * @param uuid UUID of the player. - * @deprecated use {@code cachePlayerHtml} - */ - @Deprecated - public void cachePlayerHtml(UUID uuid) { - try { - InfoSystem.getInstance().generateAndCachePlayerPage(uuid); - } catch (WebException e) { - Log.toLog(this.getClass().getName(), e); - } - } - - /** - * Used to get the full Html of the Inspect page as a string. - *

- * Re-calculates the inspect html on this server. - * - * @param uuid UUID of the player. - * @return player.html with all placeholders replaced. - */ - @Deprecated - public String getPlayerHtmlAsString(UUID uuid) { - return ResponseCache.loadResponse(PageId.PLAYER.of(uuid), DefaultResponses.NOT_FOUND::get).getContent(); - } - - /** - * Condition if the Analysis has been run and is cached to the AnalysisCache. - * - * @return true/false - */ - @Deprecated - public boolean isAnalysisCached() { - return ResponseCache.isCached(PageId.SERVER.of(ServerInfo.getServerUUID())); - } - - /** - * Run the analysis. - */ - @Deprecated - public void updateAnalysisCache() { - if (!Analysis.isAnalysisBeingRun()) { - WebExceptionLogger.logIfOccurs(this.getClass(), () -> - InfoSystem.getInstance().sendRequest(new GenerateAnalysisPageRequest(ServerInfo.getServerUUID())) - ); - } - } - - /** - * Used to get the full HTML of the Analysis page as a string. - *

- * Condition if the data is cached to AnalysisCache before calling this. - * - * @return server.html with all placeholders replaced. - * @throws NullPointerException if AnalysisData has not been cached. - */ - @Deprecated - public String getAnalysisHtmlAsString() { - return ResponseCache.loadResponse(PageId.SERVER.of(ServerInfo.getServerUUID()), AnalysisPageResponse::refreshNow).getContent(); - } - - /** - * Used to get the AnalysisData object. - *

- * Condition if the data is cached to AnalysisCache before calling this. - * - * @return AnalysisData object. - * @see AnalysisData - */ - @Deprecated - public AnalysisData getAnalysisDataFromCache() { - throw new UnsupportedOperationException("No longer supported"); - } - - /** - * Used to get the PlayerName of a player who has played on the server. - * Should be called from an Async thread. - * - * @param uuid UUID of the player. - * @return PlayerName, eg "Rsl1122" - * @throws IllegalArgumentException If uuid is null. - * @throws IllegalStateException If the player has not played on the server before. - */ - @Deprecated - public String getPlayerName(UUID uuid) { - Verify.nullCheck(uuid); - try { - String playerName = Database.getActive().fetch().getPlayerName(uuid); - if (playerName != null) { - return playerName; - } - } catch (DBException e) { - Log.toLog(API.class, e); - } - OfflinePlayer offlinePlayer = getOfflinePlayer(uuid); - if (offlinePlayer != null) { - return offlinePlayer.getName(); - } - throw new IllegalStateException("Player has not played on this server before."); - } - - /** - * Uses UUIDUtility to turn PlayerName to UUID. - * - * @param playerName Player's name - * @return UUID of the Player - * @throws Exception if player's name is not registered at Mojang - * @deprecated Typo in method name, use playerNameToUUID instead - */ - @Deprecated - public UUID PlayerNameToUUID(String playerName) { - return playerNameToUUID(playerName); - } - - /** - * Uses UUIDUtility to turn PlayerName to UUID. - * - * @param playerName Player's name - * @return UUID of the Player - * @throws IllegalArgumentException if player's name is not registered at Mojang - */ - @Deprecated - public UUID playerNameToUUID(String playerName) { - UUID uuid = UUIDUtility.getUUIDOf(playerName); - if (uuid == null) { - throw new IllegalArgumentException("UUID did not get a match"); - } - return uuid; - } - - /** - * Get the saved UUIDs in the database. - *

- * Should be called from async thread. - * - * @return Collection of UUIDs that can be found in the database. - * @since 3.4.2 - */ - @Deprecated - public Collection getSavedUUIDs() { - try { - return Database.getActive().fetch().getSavedUUIDs(); - } catch (DBException e) { - return Collections.EMPTY_SET; - } - } -}