public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gardena] Fix close all valves command (#15390)

Browse Source 
* Fix #15039
* codestyle

Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-08-14 08:10:29 +02:00 committed by GitHub
parent 1fd7280c51
commit 6ace1548b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java
View File

@ -199,8 +199,8 @@ public class GardenaSmartImpl implements GardenaSmart, GardenaSmartWebSocketList
AbstractTypedContentProvider contentProvider = null; AbstractTypedContentProvider contentProvider = null;
String contentType = "application/vnd.api+json"; String contentType = "application/vnd.api+json";
if (content != null) { if (content != null) {
if (content instanceof Fields) { if (content instanceof Fields contentAsFields) {
contentProvider = new FormContentProvider((Fields) content); contentProvider = new FormContentProvider(contentAsFields);
contentType = "application/x-www-form-urlencoded"; contentType = "application/x-www-form-urlencoded";
} else { } else {
contentProvider = new StringContentProvider(gson.toJson(content)); contentProvider = new StringContentProvider(gson.toJson(content));

2
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java
View File

@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
public class GardenaSmartWebSocket { public class GardenaSmartWebSocket {
private final Logger logger = LoggerFactory.getLogger(GardenaSmartWebSocket.class); private final Logger logger = LoggerFactory.getLogger(GardenaSmartWebSocket.class);
private final GardenaSmartWebSocketListener socketEventListener; private final GardenaSmartWebSocketListener socketEventListener;
private final int MAX_UNANSWERED_PINGS = 5; private static final int MAX_UNANSWERED_PINGS = 5;
private WebSocketSession session; private WebSocketSession session;
private WebSocketClient webSocketClient; private WebSocketClient webSocketClient;

4
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/discovery/GardenaDeviceDiscoveryService.java
View File

@ -62,8 +62,8 @@ public class GardenaDeviceDiscoveryService extends AbstractDiscoveryService
@Override @Override
public void setThingHandler(@Nullable ThingHandler handler) { public void setThingHandler(@Nullable ThingHandler handler) {
if (handler instanceof GardenaAccountHandler) { if (handler instanceof GardenaAccountHandler gardenaAccountHandler) {
this.accountHandler = (GardenaAccountHandler) handler; this.accountHandler = gardenaAccountHandler;
this.accountHandler.setDiscoveryService(this); this.accountHandler.setDiscoveryService(this);
} }
} }

3
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaAccountHandler.java
View File

@ -279,11 +279,10 @@ public class GardenaAccountHandler extends BaseBridgeHandler implements GardenaS
continue; continue;
} }
final ThingHandler thingHandler = gardenaThing.getHandler(); final ThingHandler thingHandler = gardenaThing.getHandler();
if (!(thingHandler instanceof GardenaThingHandler)) { if (!(thingHandler instanceof GardenaThingHandler gardenaThingHandler)) {
logger.debug("Handler for thingUID:{} is not a 'GardenaThingHandler' ({})", thingUID, thingHandler); logger.debug("Handler for thingUID:{} is not a 'GardenaThingHandler' ({})", thingUID, thingHandler);
continue; continue;
} }
final GardenaThingHandler gardenaThingHandler = (GardenaThingHandler) thingHandler;
try { try {
gardenaThingHandler.updateProperties(device); gardenaThingHandler.updateProperties(device);
for (Channel channel : gardenaThing.getChannels()) { for (Channel channel : gardenaThing.getChannels()) {

6
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaThingHandler.java
View File

@ -261,14 +261,14 @@ public class GardenaThingHandler extends BaseThingHandler {
String commandName = channelUID.getIdWithoutGroup().toUpperCase(); String commandName = channelUID.getIdWithoutGroup().toUpperCase();
String groupId = channelUID.getGroupId(); String groupId = channelUID.getGroupId();
if (groupId != null) { if (groupId != null) {
if (groupId.startsWith("valve") && groupId.endsWith("_commands")) { if ("valveSet_commands".equals(groupId)) {
return new ValveSetCommand(ValveSetControl.valueOf(commandName));
} else if (groupId.startsWith("valve") && groupId.endsWith("_commands")) {
return new ValveCommand(ValveControl.valueOf(commandName), return new ValveCommand(ValveControl.valueOf(commandName),
getDevice().getLocalService(dataItemProperty).commandDuration); getDevice().getLocalService(dataItemProperty).commandDuration);
} else if ("mower_commands".equals(groupId)) { } else if ("mower_commands".equals(groupId)) {
return new MowerCommand(MowerControl.valueOf(commandName), return new MowerCommand(MowerControl.valueOf(commandName),
getDevice().getLocalService(dataItemProperty).commandDuration); getDevice().getLocalService(dataItemProperty).commandDuration);
} else if ("valveSet_commands".equals(groupId)) {
return new ValveSetCommand(ValveSetControl.valueOf(commandName));
} else if ("powerSocket_commands".equals(groupId)) { } else if ("powerSocket_commands".equals(groupId)) {
return new PowerSocketCommand(PowerSocketControl.valueOf(commandName), return new PowerSocketCommand(PowerSocketControl.valueOf(commandName),
getDevice().getLocalService(dataItemProperty).commandDuration); getDevice().getLocalService(dataItemProperty).commandDuration);

39
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/dto/Device.java
View File

@ -113,38 +113,37 @@ public class Device {
public void setDataItem(DataItem<?> dataItem) throws GardenaException { public void setDataItem(DataItem<?> dataItem) throws GardenaException {
if (dataItem instanceof DeviceDataItem) { if (dataItem instanceof DeviceDataItem) {
// ignore // ignore
} else if (dataItem instanceof LocationDataItem) { } else if (dataItem instanceof LocationDataItem locationDataItem) {
LocationDataItem locationDataItem = (LocationDataItem) dataItem;
Location locationAttributes = locationDataItem.attributes; Location locationAttributes = locationDataItem.attributes;
if (locationAttributes != null) { if (locationAttributes != null) {
location = locationAttributes.name; location = locationAttributes.name;
} }
} else if (dataItem instanceof CommonServiceDataItem) { } else if (dataItem instanceof CommonServiceDataItem commonServiceItem) {
common = (CommonServiceDataItem) dataItem; common = commonServiceItem;
} else if (dataItem instanceof MowerServiceDataItem) { } else if (dataItem instanceof MowerServiceDataItem mowerServiceItemm) {
mower = (MowerServiceDataItem) dataItem; mower = mowerServiceItemm;
} else if (dataItem instanceof PowerSocketServiceDataItem) { } else if (dataItem instanceof PowerSocketServiceDataItem powerSocketItem) {
powerSocket = (PowerSocketServiceDataItem) dataItem; powerSocket = powerSocketItem;
} else if (dataItem instanceof SensorServiceDataItem) { } else if (dataItem instanceof SensorServiceDataItem sensorServiceItem) {
sensor = (SensorServiceDataItem) dataItem; sensor = sensorServiceItem;
} else if (dataItem instanceof ValveSetServiceDataItem) { } else if (dataItem instanceof ValveSetServiceDataItem valveSetServiceItem) {
valveSet = (ValveSetServiceDataItem) dataItem; valveSet = valveSetServiceItem;
} else if (dataItem instanceof ValveServiceDataItem) { } else if (dataItem instanceof ValveServiceDataItem valveServiceItem) {
String valveNumber = StringUtils.substringAfterLast(dataItem.id, ":"); String valveNumber = StringUtils.substringAfterLast(dataItem.id, ":");
if ("".equals(valveNumber) || "wc".equals(valveNumber) || "0".equals(valveNumber)) { if ("".equals(valveNumber) || "wc".equals(valveNumber) || "0".equals(valveNumber)) {
valve = (ValveServiceDataItem) dataItem; valve = valveServiceItem;
} else if ("1".equals(valveNumber)) { } else if ("1".equals(valveNumber)) {
valveOne = (ValveServiceDataItem) dataItem; valveOne = valveServiceItem;
} else if ("2".equals(valveNumber)) { } else if ("2".equals(valveNumber)) {
valveTwo = (ValveServiceDataItem) dataItem; valveTwo = valveServiceItem;
} else if ("3".equals(valveNumber)) { } else if ("3".equals(valveNumber)) {
valveThree = (ValveServiceDataItem) dataItem; valveThree = valveServiceItem;
} else if ("4".equals(valveNumber)) { } else if ("4".equals(valveNumber)) {
valveFour = (ValveServiceDataItem) dataItem; valveFour = valveServiceItem;
} else if ("5".equals(valveNumber)) { } else if ("5".equals(valveNumber)) {
valveFive = (ValveServiceDataItem) dataItem; valveFive = valveServiceItem;
} else if ("6".equals(valveNumber)) { } else if ("6".equals(valveNumber)) {
valveSix = (ValveServiceDataItem) dataItem; valveSix = valveServiceItem;
} else { } else {
throw new GardenaException("Unknown valveNumber in dataItem with id: " + dataItem.id); throw new GardenaException("Unknown valveNumber in dataItem with id: " + dataItem.id);
} }