Skip to content

Remove deprecated MetaItemType.DATA_POINTS_MAX_AGE_DAYS usages #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wborn wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −29
Open

Remove deprecated MetaItemType.DATA_POINTS_MAX_AGE_DAYS usages #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ems/src/main/java/org/openremote/extension/ems/agent/EmsDayAheadAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,16 @@ public class EmsDayAheadAsset extends Asset<EmsDayAheadAsset> {
public static final AttributeDescriptor<String> COLLECT_TIME_FORECASTS = new AttributeDescriptor<>("collectTimeForecasts", ValueType.TEXT);

public static final AttributeDescriptor<String> LAST_UPDATE_FORECASTS = new AttributeDescriptor<>("lastUpdateForecasts", ValueType.TEXT,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
);

public static final AttributeDescriptor<Double> TARIFF_EXPORT_DAY_AHEAD = new AttributeDescriptor<>("tariffExportDayAheadForecast", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits("EUR", UNITS_PER, UNITS_KILO, UNITS_WATT, UNITS_HOUR);

public static final AttributeDescriptor<Double> TARIFF_IMPORT_DAY_AHEAD = new AttributeDescriptor<>("tariffImportDayAheadForecast", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits("EUR", UNITS_PER, UNITS_KILO, UNITS_WATT, UNITS_HOUR);
Expand Down
5 changes: 0 additions & 5 deletions ems/src/main/java/org/openremote/extension/ems/agent/EmsElectricityBatteryAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
public static final ValueDescriptor<EmsElectricityBatteryConnectionStatusValueType> CONNECTION_STATUS_VALUE_TYPE = new ValueDescriptor<>("EmsElectricityBatteryConnectionStatusValueType", EmsElectricityBatteryConnectionStatusValueType.class);

public static final AttributeDescriptor<EmsElectricityBatteryConnectionStatusValueType> CONNECTION_STATUS = new AttributeDescriptor<>("connectionStatus", CONNECTION_STATUS_VALUE_TYPE,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
);
Expand All @@ -67,15 +66,13 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
).withUnits(UNITS_KILO, UNITS_WATT, UNITS_HOUR);

public static final AttributeDescriptor<Double> ENERGY_LEVEL = new AttributeDescriptor<>("energyLevel", ValueType.POSITIVE_NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT, UNITS_HOUR);

public static final AttributeDescriptor<Double> ENERGY_LEVEL_PERCENTAGE = new AttributeDescriptor<>("energyLevelPercentage", ValueType.POSITIVE_NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
Expand All @@ -89,15 +86,13 @@ public enum EmsElectricityBatteryConnectionStatusValueType {
).withUnits(UNITS_PERCENTAGE);

public static final AttributeDescriptor<Double> POWER = new AttributeDescriptor<>("power", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_SETPOINT = new AttributeDescriptor<>("powerSetpoint", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
Expand Down
12 changes: 0 additions & 12 deletions ems/src/main/java/org/openremote/extension/ems/agent/EmsEnergyOptimisationAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ public class EmsEnergyOptimisationAsset extends Asset<EmsEnergyOptimisationAsset
public static final AttributeDescriptor<Boolean> ENABLE_DETAILED_LOGGING = new AttributeDescriptor<>("enableDetailedLogging", ValueType.BOOLEAN);

public static final AttributeDescriptor<Double> ENERGY_EXPORT_TOTAL = new AttributeDescriptor<>("energyExportTotal", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT, UNITS_HOUR);

public static final AttributeDescriptor<Double> ENERGY_IMPORT_TOTAL = new AttributeDescriptor<>("energyImportTotal", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT, UNITS_HOUR);
Expand All @@ -70,31 +68,27 @@ public enum OptimisationMethodValueType {
);

public static final AttributeDescriptor<Double> POWER_CONSUMPTION = new AttributeDescriptor<>("powerConsumption", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_FLEXIBLE = new AttributeDescriptor<>("powerFlexible", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_NET = new AttributeDescriptor<>("powerNet", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_PRODUCTION = new AttributeDescriptor<>("powerProduction", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
Expand All @@ -105,7 +99,6 @@ public enum OptimisationMethodValueType {
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_LIMIT_MAXIMUM_PROFILE_MANUAL = new AttributeDescriptor<>("powerLimitMaximumProfileManual", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
Expand All @@ -116,7 +109,6 @@ public enum OptimisationMethodValueType {
);

public static final AttributeDescriptor<Double> POWER_LIMIT_MAXIMUM_PROFILE_TOTAL = new AttributeDescriptor<>("powerLimitMaximumProfileTotal", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
Expand All @@ -126,7 +118,6 @@ public enum OptimisationMethodValueType {
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_LIMIT_MINIMUM_PROFILE_MANUAL = new AttributeDescriptor<>("powerLimitMinimumProfileManual", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
Expand All @@ -137,22 +128,19 @@ public enum OptimisationMethodValueType {
);

public static final AttributeDescriptor<Double> POWER_LIMIT_MINIMUM_PROFILE_TOTAL = new AttributeDescriptor<>("powerLimitMinimumProfileTotal", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> TARIFF_EXPORT = new AttributeDescriptor<>("tariffExport", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits("EUR", UNITS_PER, UNITS_KILO, UNITS_WATT, UNITS_HOUR);

public static final AttributeDescriptor<Double> TARIFF_IMPORT = new AttributeDescriptor<>("tariffImport", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.RULE_STATE),
Expand Down
9 changes: 0 additions & 9 deletions ems/src/main/java/org/openremote/extension/ems/agent/EmsGOPACSAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,30 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
);

public static final AttributeDescriptor<Double> CURRENT_POWER_FLEX_REQUEST = new AttributeDescriptor<>("currentPowerFlexRequest", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_LIMIT_MAXIMUM_PROFILE_FLEX_ORDER = new AttributeDescriptor<>("powerLimitMaximumProfileFlexOrder", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_LIMIT_MINIMUM_PROFILE_FLEX_ORDER = new AttributeDescriptor<>("powerLimitMinimumProfileFlexOrder", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_MAXIMUM_FLEX_REQUEST = new AttributeDescriptor<>("powerMaximumFlexRequest", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
).withUnits(UNITS_KILO, UNITS_WATT);

public static final AttributeDescriptor<Double> POWER_MINIMUM_FLEX_REQUEST = new AttributeDescriptor<>("powerMinimumFlexRequest", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
Expand Down Expand Up @@ -109,7 +104,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
);

public static final AttributeDescriptor<Double> REDISPATCH_REQUESTED_POWER = new AttributeDescriptor<>("redispatchRequestedPower", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
Expand All @@ -134,7 +128,6 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
// --- Redispatch bid attributes (auto-calculated, operator-overridable) ---

public static final AttributeDescriptor<Double> REDISPATCH_SUGGESTED_POWER = new AttributeDescriptor<>("redispatchSuggestedPower", ValueType.NUMBER,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 7),
new MetaItem<>(MetaItemType.HAS_PREDICTED_DATA_POINTS),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
Expand All @@ -159,13 +152,11 @@ public class EmsGOPACSAsset extends Asset<EmsGOPACSAsset> {
// --- Redispatch history (stored as data points for time-series history) ---

public static final AttributeDescriptor<ObjectMap> REDISPATCH_ANNOUNCEMENT_HISTORY = new AttributeDescriptor<>("redispatchAnnouncementHistory", ValueType.JSON_OBJECT,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 90),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
);

public static final AttributeDescriptor<ObjectMap> REDISPATCH_BID_HISTORY = new AttributeDescriptor<>("redispatchBidHistory", ValueType.JSON_OBJECT,
new MetaItem<>(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, 90),
new MetaItem<>(MetaItemType.READ_ONLY),
new MetaItem<>(MetaItemType.STORE_DATA_POINTS)
);
Expand Down
Loading