diff --git a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsApiImpl.java b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsApiImpl.java index 4d0f7e95c8c6d..719509d3596f4 100644 --- a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsApiImpl.java +++ b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsApiImpl.java @@ -67,7 +67,6 @@ import org.openhab.binding.ecovacs.internal.api.impl.dto.response.portal.PortalIotCommandXmlResponse; import org.openhab.binding.ecovacs.internal.api.impl.dto.response.portal.PortalIotProductResponse; import org.openhab.binding.ecovacs.internal.api.impl.dto.response.portal.PortalLoginResponse; -import org.openhab.binding.ecovacs.internal.api.util.DataParsingException; import org.openhab.binding.ecovacs.internal.api.util.HashUtil; import org.openhab.core.OpenHAB; import org.slf4j.Logger; @@ -306,7 +305,7 @@ public T sendIotCommand(Device device, DeviceDescription desc, IotDeviceComm } try { return command.convertResponse(commandResponse, desc.protoVersion, gson); - } catch (DataParsingException e) { + } catch (Exception e) { logger.debug("Converting response for command {} failed", command, e); throw new EcovacsApiException(e); } diff --git a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsIotMqDevice.java b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsIotMqDevice.java index 2ecdb9981bb2f..380dc9eeaf6ed 100644 --- a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsIotMqDevice.java +++ b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsIotMqDevice.java @@ -38,7 +38,6 @@ import org.openhab.binding.ecovacs.internal.api.impl.dto.response.portal.PortalLoginResponse; import org.openhab.binding.ecovacs.internal.api.model.CleanLogRecord; import org.openhab.binding.ecovacs.internal.api.model.DeviceCapability; -import org.openhab.binding.ecovacs.internal.api.util.DataParsingException; import org.openhab.core.io.net.http.TrustAllTrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -179,7 +178,7 @@ public void connect(final EventListener listener, ScheduledExecutorService sched String eventName = receivedTopic.split("/")[2].toLowerCase(); logger.trace("{}: Got MQTT message on topic {}: {}", getSerialNumber(), receivedTopic, payload); parser.handleMessage(eventName, payload); - } catch (DataParsingException e) { + } catch (Exception e) { listener.onEventStreamFailure(this, e); } }; diff --git a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsXmppDevice.java b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsXmppDevice.java index f6fad50d69359..100436db56545 100644 --- a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsXmppDevice.java +++ b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/EcovacsXmppDevice.java @@ -147,7 +147,7 @@ public T sendCommand(IotDeviceCommand command) throws EcovacsApiException return command.convertResponse(responseObj, ProtocolVersion.XML, gson); } } - } catch (DataParsingException | ParserConfigurationException | TransformerException e) { + } catch (Exception e) { throw new EcovacsApiException(e); }