From 523d2eaf5b97eaa3b650c40ac4c7cf6bb7ed7336 Mon Sep 17 00:00:00 2001 From: Simon Langebrake Date: Wed, 3 Jun 2026 11:32:25 +0200 Subject: [PATCH] Use default case for Unit methods --- .../src/io/openems/common/channel/Unit.java | 17 +++-------------- .../edge/timedata/rrd4j/Rrd4jSupplier.java | 13 +------------ 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/io.openems.common/src/io/openems/common/channel/Unit.java b/io.openems.common/src/io/openems/common/channel/Unit.java index 92b8e2205f..f4243dab5f 100644 --- a/io.openems.common/src/io/openems/common/channel/Unit.java +++ b/io.openems.common/src/io/openems/common/channel/Unit.java @@ -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; }; } diff --git a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jSupplier.java b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jSupplier.java index c8e3941ae3..60b69b1ad9 100644 --- a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jSupplier.java +++ b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jSupplier.java @@ -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); }; }