Skip to content

Use default case for Unit methods #3753

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
simon-lgb wants to merge 1 commit into
base: develop
Choose a base branch
from
+4 −26
Open

Use default case for Unit methods #3753

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
17 changes: 3 additions & 14 deletions io.openems.common/src/io/openems/common/channel/Unit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,22 +502,11 @@ public String format(Object value, OpenemsType type) {
case NONE -> //
value.toString();

case AMPERE, DECIMAL_DEGREE, DEGREE_CELSIUS, DEZIDEGREE_CELSIUS, MONEY_PER_MEGAWATT_HOUR, HERTZ, MILLIAMPERE,
MICROAMPERE, MILLIHERTZ, MILLIVOLT, MICROVOLT, PERCENT, VOLT, VOLT_AMPERE, VOLT_AMPERE_REACTIVE, WATT,
KILOWATT, MILLIWATT, WATT_HOURS, OHM, KILOOHM, SECONDS, AMPERE_HOURS, HOUR, CUMULATED_SECONDS,
KILOAMPERE_HOURS, KILOVOLT_AMPERE, KILOVOLT_AMPERE_REACTIVE, KILOVOLT_AMPERE_REACTIVE_HOURS,
KILOWATT_HOURS, MICROOHM, MILLIAMPERE_HOURS, MILLIOHM, MILLISECONDS, MINUTE, THOUSANDTH,
VOLT_AMPERE_HOURS, VOLT_AMPERE_REACTIVE_HOURS, WATT_HOURS_BY_WATT_PEAK, CUMULATED_WATT_HOURS, BAR,
MILLIBAR, TENTHOUSANDTH, DEZIAMPERE, DEZIVOLT, GRAMS_PER_CUBIC_METER, PARTS_PER_MILLION, KILOJOULE,
KILOJOULES_PER_KILOGRAM, MILLILITER_PER_MINUTE, MIKROSIEMENS_PER_CENTIMETRE, PERCENT_VN, PROMILLE_VN,
PERCENT_PN, PROMILLE_PN, PERCENT_PN_PER_SECOND, PROMILLE_PN_PER_SECOND, PERCENT_PER_HERTZ,
PROMILLE_PER_HERTZ, PERCENT_LN_PER_SECOND, PROMILLE_LN_PER_SECOND, QMAX_PER_PERCENT_VN,
QMAX_PER_DECIPERCENT_VN, QMAX_PER_PERCENT_PN, QMAX_PER_DECIPERCENT_PN, PERCENT_PN_PER_MINUTE,
PROMILLE_PN_PER_MINUTE -> //
value + " " + this.symbol;

case ON_OFF -> //
value == null ? "UNDEFINED" : ((Boolean) value).booleanValue() ? "ON" : "OFF";

default -> //
value + " " + this.symbol;
};
}

Expand Down
13 changes: 1 addition & 12 deletions io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,11 @@ public RrdDb getExistingUpdatedRrdDb(//
*/
public static ChannelDef getDsDefForChannel(final Unit channelUnit) {
return switch (channelUnit) {
case AMPERE, AMPERE_HOURS, DECIMAL_DEGREE, DEGREE_CELSIUS, DEZIDEGREE_CELSIUS, MONEY_PER_MEGAWATT_HOUR, HERTZ,
HOUR, KILOAMPERE_HOURS, KILOOHM, KILOVOLT_AMPERE, KILOVOLT_AMPERE_REACTIVE, KILOWATT, MICROOHM,
MICROAMPERE, MICROVOLT, MILLIAMPERE_HOURS, MILLIAMPERE, MILLIHERTZ, MILLIOHM, MILLISECONDS, MILLIVOLT,
MILLIWATT, MINUTE, NONE, WATT, VOLT, VOLT_AMPERE, VOLT_AMPERE_REACTIVE, WATT_HOURS_BY_WATT_PEAK, OHM,
SECONDS, THOUSANDTH, WATT_HOURS, KILOWATT_HOURS, VOLT_AMPERE_HOURS, VOLT_AMPERE_REACTIVE_HOURS,
KILOVOLT_AMPERE_REACTIVE_HOURS, BAR, MILLIBAR, TENTHOUSANDTH, DEZIAMPERE, DEZIVOLT,
GRAMS_PER_CUBIC_METER, PARTS_PER_MILLION, KILOJOULE, KILOJOULES_PER_KILOGRAM, MILLILITER_PER_MINUTE,
MIKROSIEMENS_PER_CENTIMETRE, PERCENT_PER_HERTZ, PERCENT_PN_PER_SECOND, PERCENT_PN, PERCENT_VN,
PROMILLE_VN, PROMILLE_PN, PROMILLE_PN_PER_SECOND, PROMILLE_PER_HERTZ, PERCENT_LN_PER_SECOND,
PROMILLE_LN_PER_SECOND, QMAX_PER_PERCENT_VN, QMAX_PER_DECIPERCENT_VN, QMAX_PER_PERCENT_PN,
QMAX_PER_DECIPERCENT_PN, PROMILLE_PN_PER_MINUTE, PERCENT_PN_PER_MINUTE ->
new ChannelDef(DsType.GAUGE, Double.NaN, Double.NaN, ConsolFun.AVERAGE);
case PERCENT -> new ChannelDef(DsType.GAUGE, 0, 100, ConsolFun.AVERAGE);
case ON_OFF -> new ChannelDef(DsType.GAUGE, 0, 1, ConsolFun.AVERAGE);
case CUMULATED_SECONDS, CUMULATED_WATT_HOURS ->
new ChannelDef(DsType.GAUGE, Double.NaN, Double.NaN, ConsolFun.MAX);
default -> new ChannelDef(DsType.GAUGE, Double.NaN, Double.NaN, ConsolFun.AVERAGE);
};
}

Expand Down