Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-04 22:41:41 +01:00
Code Issues Projects Releases Wiki Activity

Add since tags and remove some internal deprecated code

Browse Source
This commit is contained in:
Aurora Lahtela 2022-08-31 10:08:37 +03:00
parent 8004e990d9
commit aaec5eda8b
26 changed files with 45 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/common/src/main/java/com/djrapitops/plan/PlanSystem.java
View File

@ -145,7 +145,10 @@ public class PlanSystem implements SubSystem {
logger.info("§2");
}
@Deprecated
/**
* @deprecated Use {@link com.djrapitops.plan.delivery.webserver.Addresses} instead.
*/
@Deprecated(since = "Addresses.java")
public String getMainAddress() {
return webServerSystem.getAddresses().getMainAddress().orElse(webServerSystem.getAddresses().getFallbackLocalhostAddress());
}

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

@ -37,7 +37,7 @@ import java.util.UUID;
* @author AuroraLS3
* @deprecated Plan API v4 has been deprecated, use the APIv5 instead (https://github.com/plan-player-analytics/Plan/wiki/APIv5).
*/
@Deprecated
@Deprecated(since = "5.0")
public interface PlanAPI {
static PlanAPI getInstance() {

2
Plan/common/src/main/java/com/djrapitops/plan/api/data/PlayerContainer.java
View File

@ -31,7 +31,7 @@ import java.util.Optional;
* @author AuroraLS3
* @deprecated Plan API v4 has been deprecated, use the APIv5 instead (https://github.com/plan-player-analytics/Plan/wiki/APIv5).
*/
@Deprecated
@Deprecated(since = "5.0")
public class PlayerContainer {
private final com.djrapitops.plan.delivery.domain.container.PlayerContainer container;

2
Plan/common/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java
View File

@ -29,7 +29,7 @@ import java.util.UUID;
* @see InspectContainer
* @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
*/
@Deprecated
@Deprecated(since = "5.0")
public final class AnalysisContainer extends InspectContainer {
private final Map<String, Map<UUID, ? extends Serializable>> playerTableValues;

2
Plan/common/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java
View File

@ -29,7 +29,7 @@ import java.util.TreeMap;
* @see TableContainer
* @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
*/
@Deprecated
@Deprecated(since = "5.0")
public class InspectContainer {
protected final List<String> values;

2
Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java
View File

@ -28,7 +28,7 @@ import java.util.List;
* @author AuroraLS3
* @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
*/
@Deprecated
@Deprecated(since = "5.0")
public class TableContainer {
protected final String[] header;

2
Plan/common/src/main/java/com/djrapitops/plan/data/plugin/BanData.java
View File

@ -25,7 +25,7 @@ import java.util.UUID;
* @author AuroraLS3
* @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
*/
@Deprecated
@Deprecated(since = "5.0")
public interface BanData {
boolean isBanned(UUID uuid);

2
Plan/common/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java
View File

@ -35,7 +35,7 @@ import java.util.UUID;
* @author AuroraLS3
* @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
*/
@Deprecated
@Deprecated(since = "5.0")
public abstract class PluginData {
private final ContainerSize size;

2
Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java
View File

@ -24,6 +24,6 @@ import com.djrapitops.plan.delivery.domain.container.DynamicDataContainer;
* @author AuroraLS3
* @deprecated AnalysisContainer is no longer used.
*/
@Deprecated
@Deprecated(since = "5.0")
public class AnalysisContainer extends DynamicDataContainer {
}

4
Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/WebUser.java
View File

@ -24,10 +24,10 @@ import java.util.Objects;
* Object containing webserver security user information.
*
* @author AuroraLS3
* <p>
* @deprecated Use {@link com.djrapitops.plan.delivery.domain.auth.User} instead
* TODO Rewrite Authentication stuff
*/
@Deprecated
@Deprecated(since = "2022-02-12, User.java")
public class WebUser {
private final String username;

10
Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/auth/User.java
View File

@ -70,12 +70,18 @@ public class User implements Comparable<User> {
return passwordHash;
}
@Deprecated
/**
* @deprecated Permission list should be used instead.
*/
@Deprecated(since = "2022-05-04", forRemoval = true)
public int getPermissionLevel() {
return permissionLevel;
}
@Deprecated
/**
* @deprecated Permission list should be used instead.
*/
@Deprecated(since = "2022-05-04", forRemoval = true)
public void setPermissionLevel(int permissionLevel) {
this.permissionLevel = permissionLevel;
}

2
Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/AnalysisKeys.java
View File

@ -25,7 +25,7 @@ package com.djrapitops.plan.delivery.domain.keys;
* @see com.djrapitops.plan.data.store.containers.AnalysisContainer for Suppliers for each Key.
* @deprecated AnalysisContainer can no longer be obtained, so this is deprecated.
*/
@Deprecated
@Deprecated(since = "5.0")
public class AnalysisKeys {
public static final PlaceholderKey<Integer> TIME_ZONE = CommonPlaceholderKeys.TIME_ZONE;

2
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/icon/Family.java
View File

@ -22,7 +22,7 @@ public enum Family {
SOLID("fa"),
REGULAR("far"),
BRAND("fab"),
@Deprecated
@Deprecated(since = "5.0")
LINE(" material-icons");
private final String familyClass;

5
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/DynamicHtmlTable.java
View File

@ -23,7 +23,10 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.List;
@Deprecated
/**
* @deprecated Table html generation is to be done in frontend in the future.
*/
@Deprecated(since = "5.5")
public class DynamicHtmlTable implements HtmlTable {
private final Header[] headers;
private final List<Object[]> rows;

5
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/HtmlTable.java
View File

@ -29,7 +29,10 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Deprecated
/**
* @deprecated Table html generation is to be done in frontend in the future.
*/
@Deprecated(since = "5.5")
public interface HtmlTable {
static HtmlTable fromExtensionTable(Table table, com.djrapitops.plan.extension.icon.Color tableColor) {

5
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/structure/HtmlTableWithColoredHeader.java
View File

@ -22,7 +22,10 @@ import com.djrapitops.plan.extension.table.Table;
import java.util.List;
@Deprecated
/**
* @deprecated Table html generation is to be done in frontend in the future.
*/
@Deprecated(since = "5.5")
public class HtmlTableWithColoredHeader implements HtmlTable {
private final Header[] headers;
private final Color headerColor;

56
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/PlayerKill.java
View File

@ -21,7 +21,6 @@ import com.djrapitops.plan.delivery.domain.PlayerIdentifier;
import com.djrapitops.plan.delivery.domain.ServerIdentifier;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
/**
@ -37,41 +36,6 @@ public class PlayerKill implements DateHolder {
private final long date;
private final ServerIdentifier server;
/**
* Creates a PlayerKill object with given parameters.
*
* @param killer UUID of the killer.
* @param victim UUID of the victim.
* @param weapon Weapon used.
* @param date Epoch millisecond at which the kill occurred.
*/
@Deprecated
public PlayerKill(UUID killer, UUID victim, String weapon, long date) {
this.killer = new Killer(killer, null);
this.victim = new Victim(victim, null);
this.weapon = weapon;
this.date = date;
this.server = new ServerIdentifier(null, "");
}
@Deprecated
public PlayerKill(UUID killer, UUID victim, String weapon, long date, String victimName) {
this.killer = new Killer(killer, null);
this.victim = new Victim(victim, victimName);
this.weapon = weapon;
this.date = date;
this.server = new ServerIdentifier(null, "");
}
@Deprecated
public PlayerKill(UUID killer, UUID victim, String weapon, long date, String victimName, String killerName) {
this.killer = new Killer(killer, killerName);
this.victim = new Victim(victim, victimName);
this.weapon = weapon;
this.date = date;
this.server = new ServerIdentifier(null, "");
}
public PlayerKill(Killer killer, Victim victim, ServerIdentifier server, String weapon, long date) {
this.killer = killer;
this.victim = victim;
@ -80,26 +44,6 @@ public class PlayerKill implements DateHolder {
this.server = server;
}
@Deprecated
public UUID getKillerUUID() {
return killer.getUuid();
}
@Deprecated
public UUID getVictimUUID() {
return victim.getUuid();
}
@Deprecated
public Optional<String> getVictimName() {
return Optional.ofNullable(victim.getName());
}
@Deprecated
public Optional<String> getKillerName() {
return Optional.ofNullable(killer.getName());
}
public Killer getKiller() {
return killer;
}

2
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/UserInfo.java
View File

@ -58,7 +58,7 @@ public class UserInfo {
/**
* @deprecated Join address is now stored in {@link FinishedSession#getExtraData()}, this method may become unreliable in the future.
*/
@Deprecated
@Deprecated(since = "5.4 build 1722")
public String getJoinAddress() {
return joinAddress;
}

7
Plan/common/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java
View File

@ -67,12 +67,7 @@ public enum ThemeVal {
GRAPH_MAX_PING("GraphColors.Ping.Max", "#ffa000"),
GRAPH_MIN_PING("GraphColors.Ping.Min", "#ffd54f"),
WORLD_MAP_HIGH("GraphColors.WorldMap_High", "#267f00"),
WORLD_MAP_LOW("GraphColors.WorldMap_Low", "#EEFFEE"),
@Deprecated
PARSED_SESSION_ACCORDION("ParsedElements.SessionAccordion", "teal"),
@Deprecated
PARSED_SERVER_ACCORDION("ParsedElements.ServerAccordion", "light-green");
WORLD_MAP_LOW("GraphColors.WorldMap_Low", "#EEFFEE");
private final String themePath;
private final String defaultValue;

2
Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/UserInfoTable.java
View File

@ -45,7 +45,7 @@ public class UserInfoTable {
/**
* @deprecated Join address is now stored in {@link JoinAddressTable}, this column may become unreliable in the future.
*/
@Deprecated
@Deprecated(since = "5.4 build 1722")
public static final String JOIN_ADDRESS = "join_address";
public static final String INSERT_STATEMENT = "INSERT INTO " + TABLE_NAME + " (" +

5
Plan/common/src/main/java/com/djrapitops/plan/storage/file/PlanFiles.java
View File

@ -67,11 +67,6 @@ public class PlanFiles implements SubSystem {
return dataFolder.toPath();
}
@Deprecated
public Path getCustomizationDirectory() {
return config.get().getResourceSettings().getCustomizationDirectory();
}
public File getLogsFolder() {
try {
File folder = getFileFromPluginFolder("logs");

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/icon/Color.java
View File

@ -21,7 +21,7 @@ import java.util.Optional;
/**
* @deprecated This Class exists to keep plugins that used PluginData from breaking.
*/
@Deprecated
@Deprecated(since = "5.0")
public enum Color {
RED("col-red"),
PINK("col-pink"),

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/icon/Family.java
View File

@ -21,7 +21,7 @@ import java.util.Optional;
/**
* @deprecated This Class exists to keep plugins that used PluginData from breaking.
*/
@Deprecated
@Deprecated(since = "5.0")
public enum Family {
SOLID(" fa fa-", "\"></i>"),
REGULAR(" far fa-", "\"></i>"),

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/icon/Icon.java
View File

@ -19,7 +19,7 @@ package com.djrapitops.plan.utilities.html.icon;
/**
* @deprecated This Class exists to keep plugins that used PluginData from breaking.
*/
@Deprecated
@Deprecated(since = "5.0")
public class Icon {
private Family type;

3
Plan/common/src/test/java/com/djrapitops/plan/storage/database/DatabaseTestPreparer.java
View File

@ -41,6 +41,9 @@ public interface DatabaseTestPreparer {
ServerUUID serverUUID();
/**
* @deprecated Dependencies may not include the full system in the future.
*/
@Deprecated
PlanSystem system();

5
Plan/velocity/src/test/java/utilities/mocks/PlanVelocityMocker.java
View File

@ -55,11 +55,6 @@ public class PlanVelocityMocker {
return this;
}
@Deprecated
public PlanVelocityMocker withLogging() {
return this;
}
public PlanVelocityMocker withProxy() {
ProxyServer server = Mockito.mock(ProxyServer.class);