Skip to content

[frenchgovtenergydata] Fix IllegalArgumentException for thing type tempo #19424

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

Merged
jlaur merged 2 commits into from
Oct 3, 2025
Merged

[frenchgovtenergydata] Fix IllegalArgumentException for thing type tempo #19424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae4253
fix tempo tariff EMPTY_LINE format
lo92fr Oct 2, 2025
6cbd725
refactor empty_line by on idea from jlaur
lo92fr Oct 3, 2025
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
4 changes: 3 additions & 1 deletion ...ydata/src/main/java/org/openhab/binding/frenchgovtenergydata/internal/dto/BaseTariff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ public class BaseTariff extends Tariff {
public final double variableHT;
public final double variableTTC;

public static final int LEN_CONTROL = 7;

public BaseTariff(String line) {
super(line, 7);
super(line, LEN_CONTROL);
try {
this.variableHT = parseDouble(values[5]);
this.variableTTC = parseDouble(values[6]);
Expand Down
4 changes: 3 additions & 1 deletion ...ydata/src/main/java/org/openhab/binding/frenchgovtenergydata/internal/dto/HpHcTariff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ public class HpHcTariff extends Tariff {
public final double hpHT;
public final double hpTTC;

public static final int LEN_CONTROL = 9;

public HpHcTariff(String line) {
super(line, 9);
super(line, LEN_CONTROL);
try {
this.hcHT = parseDouble(values[5]);
this.hcTTC = parseDouble(values[6]);
Expand Down
4 changes: 3 additions & 1 deletion ...data/src/main/java/org/openhab/binding/frenchgovtenergydata/internal/dto/TempoTariff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ public class TempoTariff extends Tariff {
public final double redHpHT;
public final double redHpTTC;

public static final int LEN_CONTROL = 17;

public TempoTariff(String line) {
super(line, 17);
super(line, LEN_CONTROL);
try {
this.blueHcHT = parseDouble(values[5]);
this.blueHcTTC = parseDouble(values[6]);
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/org/openhab/binding/frenchgovtenergydata/internal/handler/BaseTariffHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
@NonNullByDefault
public class BaseTariffHandler extends TariffHandler<BaseTariff> {
private static final String DATASET_ID = "c13d05e5-9e55-4d03-bf7e-042a2ade7e49";
private static final String EMPTY_LINE = ";".repeat(BaseTariff.LEN_CONTROL - 1);

public BaseTariffHandler(Thing thing) {
super(thing, DATASET_ID);
}

@Override
protected Stream<BaseTariff> interpretLines(List<String> lines) {
return lines.stream().map(BaseTariff::new);
return lines.stream().filter(line -> !line.equals(EMPTY_LINE)).map(BaseTariff::new);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/openhab/binding/frenchgovtenergydata/internal/handler/HpHcTariffHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
*/
@NonNullByDefault
public class HpHcTariffHandler extends TariffHandler<HpHcTariff> {
private static final String EMPTY_LINE = ";;;;;;;;";
private static final String DATASET_ID = "f7303b3a-93c7-4242-813d-84919034c416";
private static final String EMPTY_LINE = ";".repeat(HpHcTariff.LEN_CONTROL - 1);

public HpHcTariffHandler(Thing thing) {
super(thing, DATASET_ID);
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/openhab/binding/frenchgovtenergydata/internal/handler/TempoTariffHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
*/
@NonNullByDefault
public class TempoTariffHandler extends TariffHandler<TempoTariff> {
private static final String EMPTY_LINE = ";;;;;;;;";
private static final String DATASET_ID = "0c3d1d36-c412-4620-8566-e5cbb4fa2b5a";
private static final String EMPTY_LINE = ";".repeat(TempoTariff.LEN_CONTROL - 1);

public TempoTariffHandler(Thing thing) {
super(thing, DATASET_ID);
Expand Down