From ac080ef71da595b6a0d097d7f3eba86ea7840108 Mon Sep 17 00:00:00 2001 From: Andrew Schofield Date: Sat, 2 Jan 2021 21:14:22 +0000 Subject: [PATCH] [draytonwiser] Fix typos in log messages and class names (#9650) In some cases "DraytonWiser" was mis-spelled as "DraytonWise" Signed-off-by: Andrew Schofield --- .../DraytonWiserDiscoveryService.java | 2 +- .../handler/DraytonWiserThingHandler.java | 22 +++++++++---------- .../internal/handler/HeatHubHandler.java | 6 ++--- .../internal/handler/RoomHandler.java | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/discovery/DraytonWiserDiscoveryService.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/discovery/DraytonWiserDiscoveryService.java index 407bcb2a12639..7409db60c8e96 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/discovery/DraytonWiserDiscoveryService.java +++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/discovery/DraytonWiserDiscoveryService.java @@ -79,7 +79,7 @@ protected void startScan() { @Override public void onRefresh(final DraytonWiserDTO domainDTOProxy) { - logger.debug("Received data from Drayton Wise device. Parsing to discover devices."); + logger.debug("Received data from Drayton Wiser device. Parsing to discover devices."); onControllerAdded(domainDTOProxy); domainDTOProxy.getRooms().forEach(this::onRoomAdded); domainDTOProxy.getRoomStats().forEach(r -> onRoomStatAdded(domainDTOProxy, r)); diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/DraytonWiserThingHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/DraytonWiserThingHandler.java index a25eced901942..855248029f44f 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/DraytonWiserThingHandler.java +++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/DraytonWiserThingHandler.java @@ -51,7 +51,7 @@ abstract class DraytonWiserThingHandler extends BaseThingHandler implements D private @Nullable DraytonWiserApi api; private @Nullable T data; - private @Nullable DraytonWiserDTO draytonWiseDTO; + private @Nullable DraytonWiserDTO draytonWiserDTO; private @Nullable ScheduledFuture handleCommandRefreshFuture; protected DraytonWiserThingHandler(final Thing thing) { @@ -120,11 +120,11 @@ public final void dispose() { protected abstract void handleCommand(String channelId, Command command) throws DraytonWiserApiException; @Override - public final void onRefresh(final DraytonWiserDTO draytonWiseDTO) { - this.draytonWiseDTO = draytonWiseDTO; + public final void onRefresh(final DraytonWiserDTO draytonWiserDTO) { + this.draytonWiserDTO = draytonWiserDTO; try { if (ThingHandlerHelper.isHandlerInitialized(this)) { - data = api == null ? null : collectData(draytonWiseDTO); + data = api == null ? null : collectData(draytonWiserDTO); refresh(); if (data == null) { updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR, @@ -162,11 +162,11 @@ protected void updateState(final String channelId, final Supplier stateFu * Returns the handler specific data object only if all data is available. * If not all data is available it should return null. * - * @param draytonWiseDTO data object with domain data as received from the hub + * @param draytonWiserDTO data object with domain data as received from the hub * @return handler data object if available else null * @throws DraytonWiserApiException */ - protected abstract @Nullable T collectData(DraytonWiserDTO draytonWiseDTO) throws DraytonWiserApiException; + protected abstract @Nullable T collectData(DraytonWiserDTO draytonWiserDTO) throws DraytonWiserApiException; protected DraytonWiserApi getApi() { final DraytonWiserApi api = this.api; @@ -186,13 +186,13 @@ protected T getData() { return data; } - protected DraytonWiserDTO getDraytonWiseDTO() { - final DraytonWiserDTO draytonWiseDTO = this.draytonWiseDTO; + protected DraytonWiserDTO getDraytonWiserDTO() { + final DraytonWiserDTO draytonWiserDTO = this.draytonWiserDTO; - if (draytonWiseDTO == null) { - throw new IllegalStateException("DraytonWiseDTO not set"); + if (draytonWiserDTO == null) { + throw new IllegalStateException("DraytonWiserDTO not set"); } - return draytonWiseDTO; + return draytonWiserDTO; } @Override diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HeatHubHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HeatHubHandler.java index 15930af45baec..5939d8012e74d 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HeatHubHandler.java +++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HeatHubHandler.java @@ -115,10 +115,10 @@ public void refresh() { if (getThing().getStatus() != ThingStatus.ONLINE) { updateStatus(ThingStatus.ONLINE); } - final DraytonWiserDTO draytonWiseDTO = new DraytonWiserDTO(domain); + final DraytonWiserDTO draytonWiserDTO = new DraytonWiserDTO(domain); - updateProperties(draytonWiseDTO); - notifyListeners(draytonWiseDTO); + updateProperties(draytonWiserDTO); + notifyListeners(draytonWiserDTO); } logger.debug("Finished refreshing devices"); } diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java index 14f08621e042b..6e3fad1b2111b 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java +++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java @@ -118,7 +118,7 @@ private void setSetPoint(final QuantityType command) throws DraytonWiserApiEx private State getHumidity() { if (getData().getId() != null && getData().getRoomStatId() != null) { - final RoomStatDTO roomStat = getDraytonWiseDTO().getRoomStat(getData().getRoomStatId()); + final RoomStatDTO roomStat = getDraytonWiserDTO().getRoomStat(getData().getRoomStatId()); if (roomStat != null) { final Integer humidity = roomStat.getMeasuredHumidity();