Commit Graph

27 Commits

Author SHA1 Message Date
Sami Salonen
fbf55d5886 [modbus] fix defaults for tcp and serial things and some other minor cleanup (#10147)
* [modbus] More strict nullness. Remove apache.commons.lang from itests
* [modbus] Defaults for tcp and serial things according to docs
* [modbus] further explicit defaults
* [modbus] document default encoding for serial.
RTU is pretty much the only one used in the field.
Previous default was ascii implicitly.
* [modbus] verify defaults are used for undefined configuration parameters

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
2021-02-17 11:41:40 +01:00
Sami Salonen
51ea77f022 [modbus] Modbus transformations: cascaded/chained transformations and new-style transformation string (#9945)
* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR #10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
2021-02-02 08:33:07 +01:00
Sami Salonen
d5e83e395b [modbus] Replace apache commons lang usage with plain java (#10002)
* [modbus] fix item creation in tests

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
2021-02-01 12:07:52 +01:00
Wouter Born
59dffd03a4 Resolve itests for BOM changes (#9828)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-15 22:09:59 +01:00
Sami Salonen
4e1d49cee1 [modbus] itests: Fix testRefreshOnData (#9668)
* [modbus] itests: Fix testRefreshOnData

Resolves #9617

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] using default timeouts for waitForAssert

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] mvn spotless:apply

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
2021-01-06 22:15:38 +01:00
Wouter Born
0816045a59 Update Mockito, JUnit and use MockitoExtensions in itests (#9702)
* Updates Mockito to 3.7.0
* Updates JUnit to 5.7.0
* Use MockitoExtensions where possible

Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-06 14:30:40 +01:00
Wouter Born
d6364aceb1 Update license headers to 2021 (#9620)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-02 22:03:14 +01:00
Wouter Born
d1ef41851c [modbus] Disable unstable ModbusDataHandlerTest#testRefreshOnData itest (#9653)
Related to #9617

Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-02 17:58:21 +01:00
Andrew Fiddian-Green
aebe1d4a0b [modbus] Added support for RTU encoding over TCP (#9435)
* [modbus] add support for rtu encoded over tcp
* [modbus] move classes to openhab/jamod
* [modbus] spotless
* [modbus] revert EndpointPoolConfiguration
* [modbus] remove virtual serial
* [modbus] resolve dependencies
* [modbus.studer] add support for RTU over TCP bridge

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
2020-12-27 21:53:53 -08:00
Wouter Born
075b7265c0 Resolve itest runbundles for XStream 1.4.15 (#9489)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-24 00:58:48 +01:00
Wouter Born
ecac667258 Apply Spotless, update skeleton project version, resolve itest runbundles (#9459)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-22 10:37:44 +01:00
jenkins
e4554f4aa6 [unleash-maven-plugin] Preparation for next development cycle. 2020-12-21 10:36:42 +00:00
Kai Kreuzer
f152a58a31 [modbus] Moved modbus transport from addons to core (#9268)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-12-09 00:12:43 +01:00
Wouter Born
d2e5c3e7dd Remove SmartHome leftovers (#9283)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-08 18:03:49 +01:00
Sami Salonen
b806ed45d0 [modbus] Modbus register array backed by bytes and other simplifications (#8865)
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
2020-11-26 18:07:49 +01:00
J-N-K
ba4c96d99d [infrastructure] move infered nullness warnings to error and update EEA (#8949)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
2020-11-12 21:07:11 +01:00
J-N-K
bd664ff0c8 [infrastructure] add external null-annotations (#8848)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
2020-10-31 00:29:03 +01:00
Christoph Weitkamp
47d05055db Revert "[modbus] Disable failing test (#8884)" (#8895)
This reverts commit 6398773007.
2020-10-31 00:22:09 +01:00
Wouter Born
6398773007 [modbus] Disable failing test (#8884)
Related to #8880

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-27 22:30:27 +01:00
Wouter Born
be7e9c9680 Configure XStream security and resolve itest bundles (#8663)
* Configures XStream security to prevent "Security framework of XStream not initialized, XStream is probably vulnerable" warnings.
* Resolves the itest bundles for the upgrade to XStream 1.4.13

Related to openhab/openhab-core#1688

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-04 22:10:04 +02:00
Wouter Born
d42efe0b22 Upgrade Maven compiler and fix/upgrade some TP dependencies (#8636)
Upgrades the compiler and its dependencies so the compiler results of Maven builds are more similar to those generated in recent Eclipse versions.

To fix compilation issues in Eclipse for add-ons using classes from javax.xml.stream several dependencies were upgraded/excluded.

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-03 18:23:16 +02:00
Hilbrand Bouwkamp
ea55540f8b Fix openhab-addons url in NOTICE files (#8614)
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2020-09-30 10:08:31 +02:00
Kai Kreuzer
613c2e1082 removed pom.xml.versionsBackup files (#8552)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-09-23 09:00:21 +02:00
Wouter Born
c82f6c4e77 Fix and reenable more integration tests (#8535)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-22 08:19:04 +02:00
Wouter Born
7f39d01a0f Remove/ignore Eclipse project files (#8529)
Fixes #8451

Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-21 22:50:37 +02:00
Wouter Born
bd82ca82df Migrate tests to JUnit 5 (#8519)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-21 18:21:26 +02:00
Kai Kreuzer
6df6783b60 added migrated 2.x add-ons
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-09-21 03:37:19 +02:00