Skip to content
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

[wundergroundupdatereceiver] Fix parsing of dateutc query parameter #18415

Merged
merged 1 commit into from
Mar 23, 2025
Merged

[wundergroundupdatereceiver] Fix parsing of dateutc query parameter #18415

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
14 changes: 7 additions & 7 deletions ...penhab/binding/wundergroundupdatereceiver/internal/WundergroundUpdateReceiverHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

import static org.openhab.binding.wundergroundupdatereceiver.internal.WundergroundUpdateReceiverBindingConstants.*;

import java.time.ZonedDateTime;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -60,6 +62,9 @@ public String getStationId() {
return config.stationId;
}

// The format can be "yyyy-MM-dd H:mm:ss" from the device
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd H:mm:ss");

private final Logger logger = LoggerFactory.getLogger(WundergroundUpdateReceiverHandler.class);
private final WundergroundUpdateReceiverServlet wundergroundUpdateReceiverServlet;
private final WundergroundUpdateReceiverDiscoveryService discoveryService;
Expand Down Expand Up @@ -183,19 +188,14 @@ private void buildChannel(ThingBuilder thingBuilder, String parameter, String va
private DateTimeType safeResolvUtcDateTime(String dateUtc) {
if (!dateUtc.isEmpty() && !NOW.equals(dateUtc)) {
try {
// Supposedly the format is "yyyy-MM-dd hh:mm:ss" from the device
return new DateTimeType(ZonedDateTime.parse(dateUtc.replace(" ", "T") + "Z"));
return new DateTimeType(LocalDateTime.parse(dateUtc, FORMATTER).atZone(ZoneOffset.UTC));
} catch (Exception ex) {
logger.warn("The device is submitting unparsable datetime values: {}", dateUtc);
}
}
return new DateTimeType();
}

public void updateChannelState(String channelId, String[] stateParts) {
updateChannelState(channelId, String.join("", stateParts));
}

public void updateChannelState(String parameterName, String state) {
Optional<Channel> channel = getThing().getChannels().stream()
.filter(ch -> parameterName.equals(ch.getUID().getIdWithoutGroup())).findFirst();
Expand Down
2 changes: 1 addition & 1 deletion ...g/wundergroundupdatereceiver/internal/WundergroundUpdateReceiverDiscoveryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void programmaticChannelsAreAddedCorrectlyOnce() {
}

@Test
void aRequestWithAnUnregisteredStationidIsAddedToTheQueueOnce()
void aRequestWithAnUnregisteredStationIdIsAddedToTheQueueOnce()
throws ServletException, NamespaceException, IOException {
// Given
final String queryString = """
Expand Down
10 changes: 5 additions & 5 deletions ...ab/binding/wundergroundupdatereceiver/internal/WundergroundUpdateReceiverServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ void onDisposeAllHandlersAreRemovedAndServletIsInactive() throws ServletExceptio
}

@Test
void OnDisposeAllHandlersAreRemovedAndServletIsInactiveEvenThoughBackgroundDiscoveryIsEnabled()
void onDisposeAllHandlersAreRemovedAndServletIsInactiveEvenThoughBackgroundDiscoveryIsEnabled()
throws ServletException, NamespaceException {
// Given
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
Expand Down Expand Up @@ -249,7 +249,7 @@ void aGetRequestIsCorrectlyParsed() throws IOException {
// Given
ThingUID testThingUID = new ThingUID(WundergroundUpdateReceiverBindingConstants.THING_TYPE_UPDATE_RECEIVER,
"test-receiver");
final String queryString = "ID=dfggger&PASSWORD=XXXXXX&tempf=26.1&humidity=74&dewptf=18.9&windchillf=26.1&winddir=14&windspeedmph=1.34&windgustmph=2.46&rainin=0.00&dailyrainin=0.00&weeklyrainin=0.00&monthlyrainin=0.08&yearlyrainin=3.06&solarradiation=42.24&UV=1&indoortempf=69.3&indoorhumidity=32&baromin=30.39&AqNOX=21&lowbatt=1&dateutc=2021-02-07%2014:04:03&softwaretype=WH2600%20V2.2.8&action=updateraw&realtime=1&rtfreq=5";
final String queryString = "ID=dfggger&PASSWORD=XXXXXX&tempf=26.1&humidity=74&dewptf=18.9&windchillf=26.1&winddir=14&windspeedmph=1.34&windgustmph=2.46&rainin=0.00&dailyrainin=0.00&weeklyrainin=0.00&monthlyrainin=0.08&yearlyrainin=3.06&solarradiation=42.24&UV=1&indoortempf=69.3&indoorhumidity=32&baromin=30.39&AqNOX=21&lowbatt=1&dateutc=2021-02-07%209:04:03&softwaretype=WH2600%20V2.2.8&action=updateraw&realtime=1&rtfreq=5";
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
List<Channel> channels = List.of(
ChannelBuilder
Expand Down Expand Up @@ -337,7 +337,7 @@ discoveryService, new WundergroundUpdateReceiverUnknownChannelTypeProvider(), ch
// Then
verify(callback).stateUpdated(
new ChannelUID(TEST_THING_UID, METADATA_GROUP, WundergroundUpdateReceiverBindingConstants.DATEUTC),
StringType.valueOf("2021-02-07 14:04:03"));
StringType.valueOf("2021-02-07 9:04:03"));
verify(callback).stateUpdated(
new ChannelUID(TEST_THING_UID, METADATA_GROUP, WundergroundUpdateReceiverBindingConstants.LOW_BATTERY),
OnOffType.ON);
Expand Down Expand Up @@ -393,7 +393,7 @@ void aGetRequestWithIndexedParametresAreCorrectlyParsed() throws IOException {
// Given
ThingUID testThingUID = new ThingUID(WundergroundUpdateReceiverBindingConstants.THING_TYPE_UPDATE_RECEIVER,
"test-receiver");
final String queryString = "ID=dfggger&PASSWORD=XXXXXX&temp1f=26.1&humidity=74&temp2f=25.1&lowbatt=1&soilmoisture1=78&soilmoisture2=73&dateutc=2021-02-07%2014:04:03&softwaretype=WH2600%20V2.2.8&action=updateraw&realtime=1&rtfreq=5";
final String queryString = "ID=dfggger&PASSWORD=XXXXXX&temp1f=26.1&humidity=74&temp2f=25.1&lowbatt=1&soilmoisture1=78&soilmoisture2=73&dateutc=2021-02-07%2004:04:03&softwaretype=WH2600%20V2.2.8&action=updateraw&realtime=1&rtfreq=5";
WundergroundUpdateReceiverServlet sut = new WundergroundUpdateReceiverServlet(discoveryService);
List<Channel> channels = List.of(
ChannelBuilder
Expand Down Expand Up @@ -451,7 +451,7 @@ discoveryService, new WundergroundUpdateReceiverUnknownChannelTypeProvider(), ch
// Then
verify(callback).stateUpdated(
new ChannelUID(TEST_THING_UID, METADATA_GROUP, WundergroundUpdateReceiverBindingConstants.DATEUTC),
StringType.valueOf("2021-02-07 14:04:03"));
StringType.valueOf("2021-02-07 04:04:03"));
verify(callback).stateUpdated(
new ChannelUID(TEST_THING_UID, METADATA_GROUP, WundergroundUpdateReceiverBindingConstants.LOW_BATTERY),
OnOffType.ON);
Expand Down