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

[netatmo] Avoid requesting favorite stations when not needed #12777

Merged
merged 5 commits into from
May 22, 2022
Merged

[netatmo] Avoid requesting favorite stations when not needed #12777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b504d53
[netatmo] Avoid requesting favorite stations when not needed
lolodomo May 21, 2022
924689b
Handle review comments
lolodomo May 21, 2022
d5f0473
Add new method getFavoriteAndGuestStationsData
lolodomo May 21, 2022
29a63ef
Enhanced description for method getOwnedStationData
lolodomo May 21, 2022
0ff31f6
getFavoriteAndGuestStationsData returns a collection of NAMain
lolodomo May 22, 2022
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: 2 additions & 2 deletions ...ab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/WeatherApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public StationDataResponse getStationsData(@Nullable String deviceId, boolean ge
return response;
}

public NAMain getStationData(String deviceId) throws NetatmoException {
ListBodyResponse<NAMain> answer = getStationsData(deviceId, true).getBody();
public NAMain getStationData(String deviceId, boolean getFavorites) throws NetatmoException {
lolodomo marked this conversation as resolved.
Show resolved Hide resolved
ListBodyResponse<NAMain> answer = getStationsData(deviceId, getFavorites).getBody();
if (answer != null) {
NAMain station = answer.getElement(deviceId);
if (station != null) {
Expand Down
3 changes: 3 additions & 0 deletions ...c/main/java/org/openhab/binding/netatmo/internal/handler/capability/DeviceCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@
public class DeviceCapability extends Capability {
private static final int DATA_AGE_LIMIT_S = 3600;

protected boolean readonly = true;;
lolodomo marked this conversation as resolved.
Show resolved Hide resolved

public DeviceCapability(CommonInterface handler) {
super(handler);
}

@Override
protected void updateNAMain(NAMain newData) {
readonly = newData.isReadOnly();
if (firstLaunch) {
newData.getPlace().ifPresent(place -> {
place.getCity().map(city -> properties.put(PROPERTY_CITY, city));
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/openhab/binding/netatmo/internal/handler/capability/WeatherCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public WeatherCapability(CommonInterface handler) {
@Override
protected List<NAObject> updateReadings(WeatherApi api) {
try {
return List.of(api.getStationData(handler.getId()));
return List.of(api.getStationData(handler.getId(), readonly));
lolodomo marked this conversation as resolved.
Show resolved Hide resolved
} catch (NetatmoException e) {
logger.warn("Error retrieving weather data '{}' : {}", handler.getId(), e.getMessage());
}
Expand Down