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.

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

Merge upstream changes #1

Merged
merged 722 commits into from
Sep 13, 2020
Merged

Merge upstream changes #1

merged 722 commits into from
Sep 13, 2020

Conversation

oliverrahner
Copy link
Owner

No description provided.

KaaNee and others added 30 commits July 7, 2020 19:17
Signed-off-by: Kai Neuhaus <github@kaineuhaus.com>
- Add representation-property to thing definitions

Signed-off-by: Bob Adair <bob.github@att.net>
- Avoid updating the inbox at each poll

Fix #8065

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
… is unchanged (#8078)

- Do not update the discovery inbox while the location is unchanged

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
* Review comments considered
* Last minor change

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
…8085)

Signed-off-by: Rob Nielsen <rob.nielsen@yahoo.com>
Fix json parsing
Improve error handling
Remove unused Exception
* Changes for new build system
* Original
* Bugfixed for new version and merge request
* Added license information and author
* Added contributor and readme information
* Uncommented test comment for production use
* Removed the waitForUpdate variable - not used
* Added two configurations params for pulling interval and activating the smart bulbs
* [amazonechocontrol]
Formatting change
Fix for Announcment Channel
* Bugfixed discovery
* Bugfixed wrong entries of the amazon echo devices as lights
* [amazonechocontrol]
Fix for Announcment Channel
* Implemented recursive searching for devices, filtered smart plugs
* Added smart plugs
* Removed unused code, renamed new function and it's references
* Added translation
* Added documentation
* Added capabilities to smart home device
* Added dynamic channel adding
Improve smart home discover and and add options for openHAB smarthome devices
Handle on/off in percentage channel
Smart Home Device Handling
Update Smart Home Device Handling
Move Polling Timer to Account Handler
Remove polling from smart home handler
Alexa guard support
* [amazonechocontrol] Bugfix for login in Australia (#6034)
Fix invalid device state
Bugfix and docu for announcment
Fix duplicate channel registration
Fix updates
Skill device detection
Improve channel handling
Color Name handling
Single device update
Color handling
Handle Security Panel Controller
Color handling
Alexa.AcousticEventSensor added
Code cleanup
Alexa.TemperatureSensor Interface
PowerLevelController, PercentageController
Add readme
Add To Do List
Fix nullable warning in Announcment
Fix nullable warning
Prepare Release Notes
SmartHome update groups
Fix spelling
Fix group initialization
* Removed unused file
* Removed unused file
* Error fixes
* codestyle
* Fix issues, codestyle and refactoring
* address review comment

Co-authored-by: Lkn94 <message@lukasknoeller.de>
Co-authored-by: Michael Geramb <mail@michael-geramb.at>
Co-authored-by: Lukas Knöller <lukask@hobbyblogging.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
* add dynamic state descriptions and fix property updates
* fixes and improvements

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
* re-factoring WIP

Signed-off-by: Markus Michels <markus7017@gmail.com>
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Related to #8027

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
* Implement like/unlike for remote streaming services
* Fix formatting
* Address review feedback
* Combine like/unlike to single rate channel
* Address review comments

Signed-off-by: Mark Hilbush <mark@hilbush.com>
* some cleanups

Signed-off-by: Eugen Freiter <freiter@gmx.de>
Also-by: Jarle Hjortland <jarlebh@gmail.com> (github: jarlebh)
Signed-off-by: Jan Gustafsson <jannegpriv@gmail.com> (github: jannegpriv)
)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
* [netatmo] Null annotations Part 3 of 3
Fix #7913
* Video status only set when there is a video in the event
* Add a setting to enable/disable the background discovery
Fix #8083
* Cache Optional result in local variable

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
* [modbus] connection closing behaviour finetuned

The binding closes TCP/serial connections connections as per user
configuration. It is either
- every time, immediately after a transaction (reconnectAfterMillis=0)
- *after* a read/write transaction, if the connection has been open "too
  long" (configurable with reconnectAfterMillis)

We have an obvious downside to this simple logic -- the connection
can remain open "indefinitely" if there are no transactions occurring.
With Modbus we are quite often dealing with PLCs and other embedded
systems with limited resources, and "reserving" the connection is not
always something we want.

Previously (2.5.x branch) connections were also closed when
- a regular poll task was unregistered (i.e. we stop reading regularly
from a modbus server ("slave"). Since most users have regular polling in
place, so this ensured that connections do get closed.

In this commit, the behaviour is adjusted such that connections are
closed when last communication interface pointing to the server/serial
port (i.e. "endpoint") is close()'d.

With modbus binding this basically means when the tcp or serial thing
is removed / disabled, the connections is closed/freed, but only if it
is the last thing pointing to that server or serial port.

Since modbus.sunspec binding reuses modbus serial & tcp endpoint things,
the same note applies for modbus.sunspec binding.

This is change in functional behaviour but in a way is logical. We can
further introduce to have "delayed"/"deferred"/"debounce" connection
closing connections as per the setting reconnectAfterMillis even in
situations where communication interface is still open.

* [modbus] Check and disconnect idle connections without transactions
* [modbus] mvn spotless:apply
* [modbubs] Fixed log message
* [modbus] Race condition fix

The CountDownLatch was used as a guard (latch.await) in many tests to
wait for callbacks to be called before proceeding with assertions.

Since the latch was countDown() beginning of the callback, we introduced
a race condition with the subsequent assertions and updating the other
counters used in the subsequent assertions.

This commit updates the CountDownLatch as the last step of the callback,
resolving the race condition.

* [modbus] small test fix
* [modbus] readcallback changed to nonnull
* [modbus] Refactored ModbusCommunicationInterface to have seperate callback for result and failure

However I had to dig deep to reach all the affected parts.
Also there is a new callback, and a new "result" type to communicate
the failures.
* [modbus] SmokeTest refactored to new api
* [modbus] Modbus bundle refactored to use the new api
* [modbus][sunspec] refactored sunspec bundle to use the new modbus API
* [modbus] refactor modbus tests to use the new api
* [modbus] Removed ModbusWriteCallback interface from ModbusDataThingHandler
Also reset ModbusDataThingHandler testWriteHandling generic to it's original form
* [modbus] ModbusDataThingHandler does not implement ModbusReadCallback anymore
Instead it has a public onReadResult method. ModbusPollerThingHandler changed to
work with ModbusDataThingHandler children.
* [modbus] Fixed caching in ModbusPollerThingHandler
* [modbus] read modbus data as Optionals
* [modbus] toString for PollResult
* [modbus] fixed confusing variable name
* [modbus] Disallow null callbacks
* [modbus] mvn spotless:apply
* [modbus] Removing Nullable decorations
* [modbus] submitOneTimeWrite simplification
* [modbus] Less verbose logging
* [modbus] submitOneTimePoll simplification
* [modbus] Less verbose logging
* [modbus] Many null warnings removed
* [modbus] Fix: no need for a @nonnull annotation because it is default
* [modbus] Removing unneeded Nullable, using final in immutables
* [modbus] Explicit functional interface
* [modbus] @nullable and @NonNullByDefault aligned with coding conventions
* [modbus] Collections.emptyMap instead of allocating new map every time.

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

Co-authored-by: Nagy Attila Gábor <mrbig@sneaker.hu>
Signed-off-by: Bob Adair <bob.github@att.net>
Signed-off-by: Andreas Scherbaum <andreas@scherbaum.la>
Signed-off-by: toweosp <toweosp@gmail.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>
- Replaced Joda time

Signed-off-by: Jan Gustafsson <jannegpriv@gmail.com>
* Remove deprecated discovery interfaces

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
Signed-off-by: EvilPingu <ckittel@gmx.de>
Fix #5440

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Signed-off-by: Bob Adair <bob.github@att.net>
Signed-off-by: Wietse van Buitenen <thewiep@gmail.com>
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Related to #8027

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
wborn and others added 29 commits September 7, 2020 21:04
The footer doesn't use tabs or proper indentation so after the aggregated feature file was generated a subsequent build would fail.

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
…es (#8427)

* add @notnullbydefault to classes in command
* replace org.apache.commons.lang.builder.ToStringBuilder with StringBuilder (#7722)

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>
String.format used the wrong decimal separator (might just be that I used a different locale setting for that instance) which caused the binding to stop working. This is a small fix to correct that.

Signed-off-by: Anders Alfredsson <andersb86@gmail.com>
…8428)

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
* Don't follow 302 redirects (jetty default), these should be forwarded back to the cloud service.  This is required for authentication to work in OH 3.0

Signed-off-by: Dan Cunningham <dan@digitaldan.com>
Signed-off-by: Bob Adair <bob.github@att.net>
Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Ted Jordan <silverfunk@gmail.com>
We don't use Git modules and no longer use PullApprove

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Ondrej Pecta <opecta@gmail.com>
* update openwebnet4j to 0.3.0.
* Closes #8436 

Signed-off-by: Massimo Valla <mvcode00@gmail.com>
Upgrades the Travis CI build environment to Ubuntu 18.04 (Bionic Beaver).
The openjdk8 package is unsupported in newer Ubuntu versions.

Also fixes the following Travis configuration validation warnings:

* deprecated key sudo (The key `sudo` has no effect anymore.)
* missing os, using the default linux

Removes $HOME/.bnd/cache which does not exist after builds.

It's also no longer necessary to disable IPv6 with builds.
This was an actual issue in the hueemulation add-on which was fixed by #7305.

Signed-off-by: Wouter Born <github@maindrain.net>
Co-authored-by: Christian Uebber <ntnkbtce2km@temp.mailbox.org>
Besides that there are some minor changes in the examples section of README file.

Signed-off-by: Krzysztof Goworek <krzysztof.goworek@gmail.com>
Signed-off-by: Clayton Tabone <taboneclayton@gmail.com>
Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Wouter Born <github@maindrain.net>
Fixes exceptions thrown in OH3 when building discovery results for things with bridges where the thing UID is missing the bridge UID.

Related to openhab/openhab-core#1481

Signed-off-by: Wouter Born <github@maindrain.net>
Migrated from the openHAB 1 version.

Signed-off-by: Christian Niessner <github-marvkis@christian-niessner.de>
These changes were necessary to fix errors when opening these projects in Eclipse.

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
* Newer pool2 resolves many bugs present in the old version.
* Hacky workaround for faultiness of setEvictionPolicyClassName(String) in OSGi (POOL-338) is not needed anymore, thanks to new setEvictionPolicy(EvictionPolicy).
* Codeowners update for modbus itests

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
…ec (#8370)

* Related to discussion in #8228
* Documented where the limits come from.
* Internet is full of interpretation and variations. We follow the spec.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
…ng (#8396)

Signed-off-by: Markus Michels <markus7017@gmail.com>
Signed-off-by: Dan Cunningham <dan@digitaldan.com>
* [mqtt.generic] Add CIE xyY color support

Signed-off-by: Aitor Iturrioz <riturrioz@gmail.com>
@oliverrahner oliverrahner merged commit 918c6fd into oliverrahner:2.5.x Sep 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.