dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13477 from thingsboard/fix/ws-json

Browse Source 
Add JsonIgnore to TelemetrySubscriptionUpdate.getValues
This commit is contained in:
Viacheslav Klimov 2025-05-30 11:28:03 +03:00 committed by GitHub
commit 0453dd873c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java
View File

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.service.ws.telemetry.sub;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.With;
@ -73,6 +74,7 @@ public class TelemetrySubscriptionUpdate {
this.errorMsg = errorMsg != null ? errorMsg : errorCode.getDefaultMsg();
}
@JsonIgnore
public Map<String, List<TsValue>> getValues() {
if (data == null || data.isEmpty()) {
return Collections.emptyMap();

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/WsClient.java
View File

@ -61,7 +61,7 @@ public class WsClient extends WebSocketClient {
latch.countDown();
}
} catch (IOException e) {
log.error("ws message can't be read");
log.error("ws message can't be read", e);
}
}
}