diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e3f56e8f..2bda4df93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Removing deprecated classes and methods [#540](https://github.com/ie3-institute/PowerSystemDataModel/issues/540) ## [3.0.0] - 2023-02-16 diff --git a/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java b/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java index 267ed5603..14e630dfa 100644 --- a/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java +++ b/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java @@ -39,21 +39,4 @@ public void setEdgeWeightQuantity( weight.to(ImpedanceWeightedEdge.DEFAULT_IMPEDANCE_UNIT).getValue().doubleValue(); super.setEdgeWeight(edge, weightDouble); } - - /** - * The only purpose for overriding this method is to provide a better indication of the unit that - * is expected to be passed in. It is highly advised to use the {@link - * ImpedanceWeightedGraph#setEdgeWeightQuantity(ImpedanceWeightedEdge, ComparableQuantity)} for - * safety purposes that the provided edge weight is correct. - * - * @param edge the edge whose weight should be altered - * @param impedanceInOhm the weight of the {@link ImpedanceWeightedEdge} in ohm - * @deprecated Use {@link ImpedanceWeightedGraph#setEdgeWeightQuantity(ImpedanceWeightedEdge, - * ComparableQuantity)} instead, as it provides means for proper unit handling - */ - @Override - @Deprecated(since = "Deprecated since 2.1.0. See Javadocs for more information.") - public void setEdgeWeight(ImpedanceWeightedEdge edge, double impedanceInOhm) { - super.setEdgeWeight(edge, impedanceInOhm); - } } diff --git a/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java b/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java index ab822182e..53b22a205 100644 --- a/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java +++ b/src/main/java/edu/ie3/datamodel/graph/SubGridGate.java @@ -53,24 +53,6 @@ public static SubGridGate fromTransformer3W( }; } - /** @deprecated since 3.0. Use {@link #link()} instead */ - @Deprecated(since = "3.0") - public TransformerInput getLink() { - return link; - } - - /** @deprecated since 3.0. Use {@link #superiorNode()} instead */ - @Deprecated(since = "3.0") - public NodeInput getSuperiorNode() { - return superiorNode; - } - - /** @deprecated since 3.0. Use {@link #inferiorNode()} instead */ - @Deprecated(since = "3.0") - public NodeInput getInferiorNode() { - return inferiorNode; - } - public int getSuperiorSubGrid() { return superiorNode.getSubnet(); } diff --git a/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java b/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java index 8d8e07f30..9ad2cacf7 100644 --- a/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java +++ b/src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java @@ -42,10 +42,6 @@ public class CsvFileConnector implements DataConnector { private final Map, BufferedCsvWriter> entityWriters = new HashMap<>(); private final Map timeSeriesWriters = new HashMap<>(); - // ATTENTION: Do not finalize. It's meant for lazy evaluation. - @Deprecated(since = "3.0", forRemoval = true) - private Map - individualTimeSeriesMetaInformation; private final FileNamingStrategy fileNamingStrategy; private final String baseDirectoryName; @@ -216,27 +212,6 @@ public BufferedReader initReader(String filePath) throws FileNotFoundException { new InputStreamReader(new FileInputStream(fullPath), StandardCharsets.UTF_8), 16384); } - /** - * Get time series meta information for a given uuid. - * - *

This method lazily evaluates the mapping from all time series files to their meta - * information. - * - * @param timeSeriesUuid The time series in question - * @return An option on the queried information - * @deprecated since 3.0. Use {@link #getCsvIndividualTimeSeriesMetaInformation(ColumnScheme...)} - * instead - */ - @Deprecated(since = "3.0", forRemoval = true) - public Optional - getIndividualTimeSeriesMetaInformation(UUID timeSeriesUuid) { - if (Objects.isNull(individualTimeSeriesMetaInformation)) - individualTimeSeriesMetaInformation = getCsvIndividualTimeSeriesMetaInformation(); - - return Optional.ofNullable(individualTimeSeriesMetaInformation.get(timeSeriesUuid)) - .map(edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation::new); - } - /** * Receive the information for specific time series. They are given back filtered by the column * scheme in order to allow for accounting the different content types. @@ -366,60 +341,4 @@ public void shutdown() { } }); } - - /** - * Enhancing the {@link IndividualTimeSeriesMetaInformation} with the full path to csv file - * - * @deprecated since 3.0. Use {@link - * edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation} instead - */ - @Deprecated(since = "3.0", forRemoval = true) - public static class CsvIndividualTimeSeriesMetaInformation - extends edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation { - private final String fullFilePath; - - public CsvIndividualTimeSeriesMetaInformation( - UUID uuid, - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme columnScheme, - String fullFilePath) { - super(uuid, columnScheme); - this.fullFilePath = fullFilePath; - } - - public CsvIndividualTimeSeriesMetaInformation( - edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation metaInformation, - String fullFilePath) { - this(metaInformation.getUuid(), metaInformation.getColumnScheme(), fullFilePath); - } - - public String getFullFilePath() { - return fullFilePath; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof CsvIndividualTimeSeriesMetaInformation that)) return false; - if (!super.equals(o)) return false; - return fullFilePath.equals(that.fullFilePath); - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), fullFilePath); - } - - @Override - public String toString() { - return "CsvIndividualTimeSeriesMetaInformation{" - + "uuid=" - + getUuid() - + ", columnScheme=" - + getColumnScheme() - + ", fullFilePath='" - + fullFilePath - + '\'' - + '}'; - } - } } diff --git a/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java b/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java index c24bac240..9980bc064 100644 --- a/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java +++ b/src/main/java/edu/ie3/datamodel/io/csv/CsvFileDefinition.java @@ -56,21 +56,6 @@ public CsvFileDefinition( this.csvSep = csvSep; } - /** @deprecated since 3.0. Use {@link #directoryPath()} instead */ - @Deprecated(since = "3.0") - public String getDirectoryPath() { - return directoryPath; - } - - /** - * @return The file name including extension - * @deprecated since 3.0. Use {@link #fileName()} instead - */ - @Deprecated(since = "3.0") - public String getFileName() { - return fileName; - } - /** * @return The path to the file relative to a not explicitly defined base directory, including the * file extension @@ -79,18 +64,6 @@ public String getFilePath() { return !directoryPath.isEmpty() ? FilenameUtils.concat(directoryPath, fileName) : fileName; } - /** @deprecated since 3.0. Use {@link #headLineElements()} instead */ - @Deprecated(since = "3.0") - public String[] getHeadLineElements() { - return headLineElements; - } - - /** @deprecated since 3.0. Use {@link #csvSep()} instead */ - @Deprecated(since = "3.0") - public String getCsvSep() { - return csvSep; - } - @Override public boolean equals(Object o) { // equals implementation is required here because diff --git a/src/main/java/edu/ie3/datamodel/io/csv/FileNameMetaInformation.java b/src/main/java/edu/ie3/datamodel/io/csv/FileNameMetaInformation.java deleted file mode 100644 index f60770230..000000000 --- a/src/main/java/edu/ie3/datamodel/io/csv/FileNameMetaInformation.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * © 2021. TU Dortmund University, - * Institute of Energy Systems, Energy Efficiency and Energy Economics, - * Research group Distribution grid planning and operation -*/ -package edu.ie3.datamodel.io.csv; - -import java.util.Objects; -import java.util.UUID; - -/** - * Meta information, that can be derived from a certain file name - * - * @deprecated since 3.0. Use {@link edu.ie3.datamodel.io.naming.TimeSeriesMetaInformation} instead - */ -@Deprecated(since = "3.0", forRemoval = true) -public abstract class FileNameMetaInformation { - private final UUID uuid; - - protected FileNameMetaInformation(UUID uuid) { - this.uuid = uuid; - } - - public UUID getUuid() { - return uuid; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof FileNameMetaInformation that)) return false; - return uuid.equals(that.uuid); - } - - @Override - public int hashCode() { - return Objects.hash(uuid); - } - - @Override - public String toString() { - return "FileNameMetaInformation{" + "uuid=" + uuid + '}'; - } -} diff --git a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/ColumnScheme.java b/src/main/java/edu/ie3/datamodel/io/csv/timeseries/ColumnScheme.java deleted file mode 100644 index caf683d31..000000000 --- a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/ColumnScheme.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * © 2021. TU Dortmund University, - * Institute of Energy Systems, Energy Efficiency and Energy Economics, - * Research group Distribution grid planning and operation -*/ -package edu.ie3.datamodel.io.csv.timeseries; - -import edu.ie3.datamodel.models.value.*; -import edu.ie3.util.StringUtils; -import java.util.Arrays; -import java.util.Objects; -import java.util.Optional; - -/** - * Yet supported column schemes in individual time series - * - * @deprecated since 3.0. Use {@link edu.ie3.datamodel.io.naming.timeseries.ColumnScheme} instead - */ -@Deprecated(since = "3.0", forRemoval = true) -public enum ColumnScheme { - ENERGY_PRICE("c", EnergyPriceValue.class), - ACTIVE_POWER("p", PValue.class), - APPARENT_POWER("pq", SValue.class), - HEAT_DEMAND("h", HeatDemandValue.class), - ACTIVE_POWER_AND_HEAT_DEMAND("ph", HeatAndPValue.class), - APPARENT_POWER_AND_HEAT_DEMAND("pqh", HeatAndSValue.class), - WEATHER("weather", WeatherValue.class); - - private final String scheme; - private final Class valueClass; - - @Deprecated - ColumnScheme(String scheme, Class valueClass) { - this.scheme = scheme; - this.valueClass = valueClass; - } - - public String getScheme() { - return scheme; - } - - public Class getValueClass() { - return valueClass; - } - - public static Optional parse(String key) { - String cleanString = StringUtils.cleanString(key).toLowerCase(); - return Arrays.stream(ColumnScheme.values()) - .filter(entry -> Objects.equals(entry.scheme, cleanString)) - .findFirst(); - } - - public static Optional parse(Class valueClass) { - /* IMPORTANT NOTE: Make sure to start with child classes and then use parent classes to allow for most precise - * parsing (child class instances are also assignable to parent classes) */ - - if (EnergyPriceValue.class.isAssignableFrom(valueClass)) return Optional.of(ENERGY_PRICE); - if (HeatAndSValue.class.isAssignableFrom(valueClass)) - return Optional.of(APPARENT_POWER_AND_HEAT_DEMAND); - if (SValue.class.isAssignableFrom(valueClass)) return Optional.of(APPARENT_POWER); - if (HeatAndPValue.class.isAssignableFrom(valueClass)) - return Optional.of(ACTIVE_POWER_AND_HEAT_DEMAND); - if (PValue.class.isAssignableFrom(valueClass)) return Optional.of(ACTIVE_POWER); - if (HeatDemandValue.class.isAssignableFrom(valueClass)) return Optional.of(HEAT_DEMAND); - if (WeatherValue.class.isAssignableFrom(valueClass)) return Optional.of(WEATHER); - return Optional.empty(); - } -} diff --git a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/IndividualTimeSeriesMetaInformation.java b/src/main/java/edu/ie3/datamodel/io/csv/timeseries/IndividualTimeSeriesMetaInformation.java deleted file mode 100644 index fd9f0db40..000000000 --- a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/IndividualTimeSeriesMetaInformation.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * © 2021. TU Dortmund University, - * Institute of Energy Systems, Energy Efficiency and Energy Economics, - * Research group Distribution grid planning and operation -*/ -package edu.ie3.datamodel.io.csv.timeseries; - -import edu.ie3.datamodel.io.csv.FileNameMetaInformation; -import java.util.Objects; -import java.util.UUID; - -/** - * Specific meta information, that can be derived from a individual time series file - * - * @deprecated since 3.0. Use {@link - * edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation} instead - */ -@Deprecated(since = "3.0", forRemoval = true) -public class IndividualTimeSeriesMetaInformation extends FileNameMetaInformation { - private final ColumnScheme columnScheme; - - public IndividualTimeSeriesMetaInformation(UUID uuid, ColumnScheme columnScheme) { - super(uuid); - this.columnScheme = columnScheme; - } - - public IndividualTimeSeriesMetaInformation( - edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation - newMetaInformation) { - super(newMetaInformation.getUuid()); - this.columnScheme = - ColumnScheme.parse(newMetaInformation.getColumnScheme().toString()) - .orElseThrow( - () -> - new RuntimeException( - "Cannot convert new column scheme " - + newMetaInformation.getColumnScheme().getScheme() - + " to deprecated column scheme!")); - } - - public ColumnScheme getColumnScheme() { - return columnScheme; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof IndividualTimeSeriesMetaInformation that)) return false; - if (!super.equals(o)) return false; - return columnScheme == that.columnScheme; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), columnScheme); - } - - @Override - public String toString() { - return "IndividualTimeSeriesMetaInformation{" - + "uuid=" - + getUuid() - + ", columnScheme=" - + columnScheme - + '}'; - } -} diff --git a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/LoadProfileTimeSeriesMetaInformation.java b/src/main/java/edu/ie3/datamodel/io/csv/timeseries/LoadProfileTimeSeriesMetaInformation.java deleted file mode 100644 index 86a3a984b..000000000 --- a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/LoadProfileTimeSeriesMetaInformation.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * © 2021. TU Dortmund University, - * Institute of Energy Systems, Energy Efficiency and Energy Economics, - * Research group Distribution grid planning and operation -*/ -package edu.ie3.datamodel.io.csv.timeseries; - -import edu.ie3.datamodel.io.csv.FileNameMetaInformation; -import java.util.Objects; -import java.util.UUID; - -/** - * Specific meta information, that can be derived from a load profile time series file - * - * @deprecated since 3.0. Use {@link - * edu.ie3.datamodel.io.naming.timeseries.LoadProfileTimeSeriesMetaInformation} instead - */ -@Deprecated(since = "3.0", forRemoval = true) -public class LoadProfileTimeSeriesMetaInformation extends FileNameMetaInformation { - private final String profile; - - public LoadProfileTimeSeriesMetaInformation(UUID uuid, String profile) { - super(uuid); - this.profile = profile; - } - - public LoadProfileTimeSeriesMetaInformation( - edu.ie3.datamodel.io.naming.timeseries.LoadProfileTimeSeriesMetaInformation metaInformation) { - super(metaInformation.getUuid()); - this.profile = metaInformation.getProfile(); - } - - public String getProfile() { - return profile; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof LoadProfileTimeSeriesMetaInformation that)) return false; - if (!super.equals(o)) return false; - return profile.equals(that.profile); - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), profile); - } - - @Override - public String toString() { - return "LoadProfileTimeSeriesMetaInformation{" - + "uuid='" - + getUuid() - + '\'' - + ", profile='" - + profile - + '\'' - + '}'; - } -} diff --git a/src/main/java/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategy.java b/src/main/java/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategy.java index 566c1b86f..d46cdf8bf 100644 --- a/src/main/java/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategy.java +++ b/src/main/java/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategy.java @@ -124,34 +124,6 @@ public Pattern getIndividualTimeSeriesPattern() { return individualTimeSeriesPattern; } - /** - * Extracts meta information from a valid source name for an individual time series - * - * @param sourceName Name of the source to extract information from, e.g. file name or SQL table - * name - * @return Meta information form individual time series source name - * @deprecated since 3.0. Use {@link #individualTimesSeriesMetaInformation(String)} instead - */ - @Deprecated(since = "3.0", forRemoval = true) - public edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation - extractIndividualTimesSeriesMetaInformation(String sourceName) { - Matcher matcher = getIndividualTimeSeriesPattern().matcher(sourceName); - if (!matcher.matches()) - throw new IllegalArgumentException( - "Cannot extract meta information on individual time series from '" + sourceName + "'."); - - String columnSchemeKey = matcher.group("columnScheme"); - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme columnScheme = - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.parse(columnSchemeKey) - .orElseThrow( - () -> - new IllegalArgumentException( - "Cannot parse '" + columnSchemeKey + "' to valid column scheme.")); - - return new edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation( - UUID.fromString(matcher.group("uuid")), columnScheme); - } - /** * Extracts meta information from a valid source name for an individual time series * @@ -178,25 +150,6 @@ public IndividualTimeSeriesMetaInformation individualTimesSeriesMetaInformation( UUID.fromString(matcher.group("uuid")), columnScheme); } - /** - * Extracts meta information from a valid file name for a load profile time series - * - * @param fileName File name to extract information from - * @return Meta information form load profile time series file name - * @deprecated since 3.0. Use {@link #loadProfileTimesSeriesMetaInformation(String)} instead - */ - @Deprecated(since = "3.0", forRemoval = true) - public edu.ie3.datamodel.io.csv.timeseries.LoadProfileTimeSeriesMetaInformation - extractLoadProfileTimesSeriesMetaInformation(String fileName) { - Matcher matcher = getLoadProfileTimeSeriesPattern().matcher(fileName); - if (!matcher.matches()) - throw new IllegalArgumentException( - "Cannot extract meta information on load profile time series from '" + fileName + "'."); - - return new edu.ie3.datamodel.io.csv.timeseries.LoadProfileTimeSeriesMetaInformation( - UUID.fromString(matcher.group("uuid")), matcher.group("profile")); - } - /** * Extracts meta information from a valid file name for a load profile time series * diff --git a/src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java b/src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java index 7db3a984b..db6c5a643 100644 --- a/src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java +++ b/src/main/java/edu/ie3/datamodel/io/naming/FileNamingStrategy.java @@ -6,9 +6,7 @@ package edu.ie3.datamodel.io.naming; import edu.ie3.datamodel.io.IoUtil; -import edu.ie3.datamodel.io.csv.FileNameMetaInformation; import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation; -import edu.ie3.datamodel.io.naming.timeseries.LoadProfileTimeSeriesMetaInformation; import edu.ie3.datamodel.models.UniqueEntity; import edu.ie3.datamodel.models.timeseries.TimeSeries; import edu.ie3.datamodel.models.timeseries.TimeSeriesEntry; @@ -214,22 +212,6 @@ public Pattern getLoadProfileTimeSeriesPattern() { } } - /** - * Extracts meta information from a file name, of a time series. - * - * @param path Path to the file - * @return The meeting meta information - * @deprecated since 3.0. Use {@link #timeSeriesMetaInformation(Path)} instead. - */ - @Deprecated(since = "3.0", forRemoval = true) - public FileNameMetaInformation extractTimeSeriesMetaInformation(Path path) { - /* Extract file name from possibly fully qualified path */ - Path fileName = path.getFileName(); - if (fileName == null) - throw new IllegalArgumentException("Unable to extract file name from path '" + path + "'."); - return extractTimeSeriesMetaInformation(fileName.toString()); - } - /** * Extracts meta information from a file name, of a time series. * @@ -244,27 +226,6 @@ public TimeSeriesMetaInformation timeSeriesMetaInformation(Path path) { return timeSeriesMetaInformation(fileName.toString()); } - /** - * Extracts meta information from a file name, of a time series. Here, a file name without - * leading path has to be provided - * - * @param fileName File name - * @return The meeting meta information - * @deprecated since 3.0. Use {@link #timeSeriesMetaInformation(String)} instead. - */ - @Deprecated(since = "3.0", forRemoval = true) - public FileNameMetaInformation extractTimeSeriesMetaInformation(String fileName) { - - TimeSeriesMetaInformation meta = timeSeriesMetaInformation(fileName); - if (meta instanceof IndividualTimeSeriesMetaInformation ind) { - return new edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation(ind); - } else if (meta instanceof LoadProfileTimeSeriesMetaInformation load) { - return new edu.ie3.datamodel.io.csv.timeseries.LoadProfileTimeSeriesMetaInformation(load); - } else - throw new IllegalArgumentException( - "Unknown format of '" + fileName + "'. Cannot extract meta information."); - } - /** * Extracts meta information from a file name, of a time series. Here, a file name without * leading path has to be provided diff --git a/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java b/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java index 72b6b1fa8..21c05bb67 100644 --- a/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java +++ b/src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java @@ -12,19 +12,6 @@ * time series can be obtained from */ public record FieldSourceToMethod(FieldSource source, Method method) { - - /** @deprecated since 3.0. Use {@link #source()} instead */ - @Deprecated(since = "3.0") - public FieldSource getSource() { - return source; - } - - /** @deprecated since 3.0. Use {@link #method()} instead */ - @Deprecated(since = "3.0") - public Method getMethod() { - return method; - } - @Override public String toString() { return "FieldSourceToMethod{" + "source=" + source + ", method=" + method + '}'; diff --git a/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesMappingSource.java b/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesMappingSource.java index 05f905728..7c5f4a73a 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesMappingSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesMappingSource.java @@ -33,18 +33,6 @@ default Optional getTimeSeriesUuid(UUID modelIdentifier) { return Optional.ofNullable(getMapping().get(modelIdentifier)); } - /** - * Get an option on the given time series meta information - * - * @param timeSeriesUuid Unique identifier of the time series in question - * @return An Option onto the meta information - * @deprecated since 3.0. Use {@link - * TimeSeriesMetaInformationSource#getTimeSeriesMetaInformation()} instead - */ - @Deprecated(since = "3.0", forRemoval = true) - Optional - getTimeSeriesMetaInformation(UUID timeSeriesUuid); - /** Class to represent one entry within the participant to time series mapping */ class MappingEntry extends InputEntity { private final UUID participant; diff --git a/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java b/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java index 34b8c676a..0a98f163e 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java @@ -9,7 +9,6 @@ import edu.ie3.datamodel.models.value.Value; import edu.ie3.util.interval.ClosedInterval; import java.time.ZonedDateTime; -import java.util.EnumSet; import java.util.Optional; /** @@ -17,28 +16,6 @@ * model */ public interface TimeSeriesSource extends DataSource { - - /** - * Checks whether the given column scheme can be used with time series. - * - * @param scheme the column scheme to check - * @return whether the scheme is accepted or not - * @deprecated since 3.0. Use {@link - * TimeSeriesUtils#isSchemeAccepted(edu.ie3.datamodel.io.naming.timeseries.ColumnScheme)} - * instead. - */ - @Deprecated(since = "3.0", forRemoval = true) - static boolean isSchemeAccepted(edu.ie3.datamodel.io.csv.timeseries.ColumnScheme scheme) { - return EnumSet.of( - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.ACTIVE_POWER, - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.APPARENT_POWER, - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.ENERGY_PRICE, - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND, - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.ACTIVE_POWER_AND_HEAT_DEMAND, - edu.ie3.datamodel.io.csv.timeseries.ColumnScheme.HEAT_DEMAND) - .contains(scheme); - } - /** * Obtain the full time series * diff --git a/src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java b/src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java index 128999f11..86c3092be 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java @@ -44,35 +44,6 @@ public class CouchbaseWeatherSource implements WeatherSource { private final String coordinateIdColumnName; private final String timeStampPattern; - /** - * Instantiate a weather source utilising a connection to a couchbase instance obtained via the - * connector. This convenient constructor uses {@link CouchbaseWeatherSource#DEFAULT_KEY_PREFIX} - * as key prefix and {@link CouchbaseWeatherSource#DEFAULT_TIMESTAMP_PATTERN} as timestamp - * pattern. - * - * @param connector Connector, that establishes the connection to the couchbase instance - * @param coordinateSource Source to obtain actual coordinates from - * @param coordinateIdColumnName Name of the column containing the information about the - * coordinate identifier - * @param weatherFactory Factory to transfer field to value mapping into actual java object - * instances - * @deprecated Use {@link CouchbaseWeatherSource#CouchbaseWeatherSource(CouchbaseConnector, - * IdCoordinateSource, String, TimeBasedWeatherValueFactory, String)} instead - */ - @Deprecated(since = "3.0", forRemoval = true) - public CouchbaseWeatherSource( - CouchbaseConnector connector, - IdCoordinateSource coordinateSource, - String coordinateIdColumnName, - TimeBasedWeatherValueFactory weatherFactory) { - this( - connector, - coordinateSource, - coordinateIdColumnName, - weatherFactory, - DEFAULT_TIMESTAMP_PATTERN); - } - /** * Instantiate a weather source utilising a connection to a couchbase instance obtained via the * connector. This convenient constructor uses {@link CouchbaseWeatherSource#DEFAULT_KEY_PREFIX} @@ -101,35 +72,6 @@ public CouchbaseWeatherSource( timeStampPattern); } - /** - * Instantiate a weather source utilising a connection to a couchbase instance obtained via the - * connector. This convenient constructor uses {@link - * CouchbaseWeatherSource#DEFAULT_TIMESTAMP_PATTERN} as timestamp pattern. - * - * @param connector Connector, that establishes the connection to the couchbase instance - * @param coordinateSource Source to obtain actual coordinates from - * @param keyPrefix Prefix of entries, that belong to weather - * @param weatherFactory Factory to transfer field to value mapping into actual java object - * instances - * @deprecated Use {@link CouchbaseWeatherSource#CouchbaseWeatherSource(CouchbaseConnector, - * IdCoordinateSource, String, String, TimeBasedWeatherValueFactory, String)} instead - */ - @Deprecated(since = "3.0", forRemoval = true) - public CouchbaseWeatherSource( - CouchbaseConnector connector, - IdCoordinateSource coordinateSource, - String coordinateIdColumnName, - String keyPrefix, - TimeBasedWeatherValueFactory weatherFactory) { - this( - connector, - coordinateSource, - coordinateIdColumnName, - keyPrefix, - weatherFactory, - DEFAULT_TIMESTAMP_PATTERN); - } - /** * Instantiate a weather source utilising a connection to a couchbase instance obtained via the * connector diff --git a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesMappingSource.java b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesMappingSource.java index cb3fad7a1..df2547122 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesMappingSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesMappingSource.java @@ -41,15 +41,4 @@ public CsvTimeSeriesMappingSource( public Map getMapping() { return mapping; } - - /** - * @deprecated since 3.0. Use {@link - * CsvTimeSeriesMetaInformationSource#getTimeSeriesMetaInformation()} instead - */ - @Override - @Deprecated(since = "3.0", forRemoval = true) - public Optional - getTimeSeriesMetaInformation(UUID timeSeriesUuid) { - return connector.getIndividualTimeSeriesMetaInformation(timeSeriesUuid); - } } diff --git a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java index f380bd11a..d42530882 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java @@ -28,56 +28,6 @@ public class CsvTimeSeriesSource extends CsvDataSource implements TimeSeriesSource { private final IndividualTimeSeries timeSeries; - /** - * Factory method to build a source from given meta information - * - * @param csvSep the separator string for csv columns - * @param folderPath path to the folder holding the time series files - * @param fileNamingStrategy strategy for the file naming of time series files / data sinks - * @param metaInformation The given meta information - * @throws SourceException If the given meta information are not supported - * @return The source - * @deprecated since 3.0. Use {@link CsvTimeSeriesSource#getSource(java.lang.String, - * java.lang.String, edu.ie3.datamodel.io.naming.FileNamingStrategy, - * edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation)} instead. - */ - @Deprecated(since = "3.0", forRemoval = true) - public static CsvTimeSeriesSource getSource( - String csvSep, - String folderPath, - FileNamingStrategy fileNamingStrategy, - edu.ie3.datamodel.io.connectors.CsvFileConnector.CsvIndividualTimeSeriesMetaInformation - metaInformation) - throws SourceException { - if (!TimeSeriesSource.isSchemeAccepted(metaInformation.getColumnScheme())) - throw new SourceException( - "Unsupported column scheme '" + metaInformation.getColumnScheme() + "'."); - - Class valClass = metaInformation.getColumnScheme().getValueClass(); - - return create(csvSep, folderPath, fileNamingStrategy, metaInformation, valClass); - } - - /** @deprecated since 3.0 */ - @Deprecated(since = "3.0", forRemoval = true) - private static CsvTimeSeriesSource create( - String csvSep, - String folderPath, - FileNamingStrategy fileNamingStrategy, - edu.ie3.datamodel.io.connectors.CsvFileConnector.CsvIndividualTimeSeriesMetaInformation - metaInformation, - Class valClass) { - TimeBasedSimpleValueFactory valueFactory = new TimeBasedSimpleValueFactory<>(valClass); - return new CsvTimeSeriesSource<>( - csvSep, - folderPath, - fileNamingStrategy, - metaInformation.getUuid(), - metaInformation.getFullFilePath(), - valClass, - valueFactory); - } - /** * Factory method to build a source from given meta information * diff --git a/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesMappingSource.java b/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesMappingSource.java index f49a8aa4e..f34728c9a 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesMappingSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesMappingSource.java @@ -44,19 +44,6 @@ public Map getMapping() { .collect(Collectors.toMap(MappingEntry::getParticipant, MappingEntry::getTimeSeries)); } - /** - * @deprecated since 3.0. Use {@link - * SqlTimeSeriesMetaInformationSource#getTimeSeriesMetaInformation()} instead - */ - @Override - @Deprecated(since = "3.0", forRemoval = true) - public Optional - getTimeSeriesMetaInformation(UUID timeSeriesUuid) { - return getDbTables(schemaName, "%" + timeSeriesUuid.toString()).stream() - .findFirst() - .map(entityPersistenceNamingStrategy::extractIndividualTimesSeriesMetaInformation); - } - @Override protected Optional createEntity(Map fieldToValues) { SimpleEntityData entityData = new SimpleEntityData(fieldToValues, MappingEntry.class); diff --git a/src/main/java/edu/ie3/datamodel/utils/GridAndGeoUtils.java b/src/main/java/edu/ie3/datamodel/utils/GridAndGeoUtils.java index 325257599..ef7da382c 100644 --- a/src/main/java/edu/ie3/datamodel/utils/GridAndGeoUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/GridAndGeoUtils.java @@ -19,19 +19,6 @@ private GridAndGeoUtils() { throw new IllegalStateException("Utility classes cannot be instantiated."); } - /** - * Builds a straight line string between the both nodes - * - * @param a Starting point of the line string - * @param b Ending point of the line string - * @return The equivalent straight line string - * @deprecated Use {@link #buildSafeLineStringBetweenNodes(NodeInput, NodeInput)} instead - */ - @Deprecated(since = "1.1.0", forRemoval = true) - public static LineString buildLineStringBetweenNodes(NodeInput a, NodeInput b) { - return buildSafeLineStringBetweenPoints(a.getGeoPosition(), b.getGeoPosition()); - } - /** * Builds a straight line string between the both nodes that can be compared safely even if the * two provided nodes contain exactly equal coordinates diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvRawGridSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvRawGridSourceTest.groovy index 32a9975f9..74170ae3a 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvRawGridSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvRawGridSourceTest.groovy @@ -723,7 +723,7 @@ class CsvRawGridSourceTest extends Specification implements CsvTestDataMeta { then: "all elements are there" actual.present actual.get().with { - /* It's okay, to only test the uuids, because content is tested with the other test mehtods */ + /* It's okay, to only test the uuids, because content is tested with the other test methods */ assert nodes.size() == expected.nodes.size() assert nodes.each {entry -> expected.nodes.contains({it.uuid == entry.uuid})} assert lines.size() == expected.lines.size()