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

Adjust to core changes (#14952)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K
2023-05-08 09:35:36 +02:00
committed by GitHub
parent 5fe6d325a3
commit c3a9a4c7b6
14 changed files with 124 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.persistence.mongodb/src/main/java/org/openhab/persistence/mongodb/internal/MongoDBPersistenceService.java
View File

@@ -331,6 +331,11 @@ public class MongoDBPersistenceService implements QueryablePersistenceService {
}
String realItemName = filter.getItemName();
if (realItemName == null) {
logger.warn("Item name is missing in filter {}", filter);
return List.of();
}
String collectionName = collectionPerItem ? realItemName : this.collection;
@Nullable
DBCollection collection = connectToCollection(collectionName);
@@ -354,7 +359,8 @@ public class MongoDBPersistenceService implements QueryablePersistenceService {
if (filter.getItemName() != null) {
query.put(FIELD_ITEM, filter.getItemName());
}
if (filter.getState() != null && filter.getOperator() != null) {
State filterState = filter.getState();
if (filterState != null && filter.getOperator() != null) {
@Nullable
String op = convertOperator(filter.getOperator());
@@ -363,7 +369,7 @@ public class MongoDBPersistenceService implements QueryablePersistenceService {
return Collections.emptyList();
}
Object value = convertValue(filter.getState());
Object value = convertValue(filterState);
query.put(FIELD_VALUE, new BasicDBObject(op, value));
}