Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MongoDB Persistence] Fix error 500 and various improvements (openhab…
…#10584) * [MongoDB Persistence] Rename connectToDatabase to tryConnectToDatabase. Currently, the implementation throws a RuntimeException. This fails horribly in query() and store(), because the exception is never caught and connection reestablishment won't happen. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Fix JavaDoc Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Fix Bundle name The correct database name is "MongoDB" without a space. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Also check for connection validity in isConnected() When the connection was established successfully once, and the server goes down (e. g. a restart of the DB server), the connection still seems to be OK. This would throw an exception later on, which is not caught and connection reestablishment won't happen. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Disconnect from database before reconnecting to database. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Disconnect from database when connection procedure fails. When, for example, the creation of the index fails (disk full, ...), the connection is still there, but the collection isn't created with it's appropriate indices. Thus, disconnect when the procedure fails to ensure no database connection remains valid. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Fix logic Create the shared collection with its indices when collectionPerItem is disabled, not enabled. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Access database via getDatabase() Preparation for synchronization. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Remove global mongoCollection variable. This allows to easify implementing necessary multithreading locks. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Codestyle improvements. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Move isConnected-Check into tryConnectToDatabase. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Synchronize all connection handling methods. Though the MongoDB driver is thread-safe, we still need to synchronize connection establishment/closing/... Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Remove all unnecessary @NonNullByDefault attributes. The given attributes should not be NotNullByDefault, because some may be null, too. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Remove duplicate logging. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Test the db connection after creating the MongoClient. The mongo always succeeds in creating the connection. We have to actually force it to test the connection to try to connect to the server. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Fix date query. Issues: - Second should have been getEndDate, not getBeginDate - Send a Date object as the other version wasn't serializable. - EndDate would have overridden beginDate. Fixes openhab#10574 Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Add debug log for MongoDB query sent to the server. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Reorder index on collections. The order (Item, Timestamp) makes much more sense and should be better for performance. All queries are always done with an item, and the dates are optional. Also, the database server can now execute a range query for the date. Existing indices are not dropped for backwards compatibility with other systems analyzing the data. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Add @author JavaDoc as per developer guidelines. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Improve logging Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Add @NonNullByDefault This was removed in 1f8e452 by mistake. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Do not use isConnected() to test the connection. The new method throws the real underlying exception instead of a generic one. This allows for detailed logging. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> * [MongoDB Persistence] Remove useless @inheritdoc as per code analysis tool. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net> Signed-off-by: John Marshall <john.marshall.au@gmail.com>
- Loading branch information