Strolch
/
strolch-plc
mirror of https://github.com/strolch-li/strolch-plc.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Fixed compile error due to version.toJson() change

This commit is contained in:
Robert von Burg 2023-08-28 15:04:39 +02:00
parent 779a79631b
commit 8a88a0d0db
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plc-gw-client/src/main/java/li/strolch/plc/gw/client/PlcGwClientHandler.java
View File

@ -580,10 +580,10 @@ public class PlcGwClientHandler extends StrolchComponent implements GlobalPlcLis
if (this.versions == null) {
this.versions = new JsonObject();
VersionQueryResult versionQueryResult = getContainer().getAgent().getVersion();
this.versions.add(AGENT_VERSION, versionQueryResult.getAgentVersion().toJson());
this.versions.add(APP_VERSION, versionQueryResult.getAppVersion().toJson());
this.versions.add(AGENT_VERSION, versionQueryResult.getAgentVersion().toJson(true));
this.versions.add(APP_VERSION, versionQueryResult.getAppVersion().toJson(true));
this.versions.add(COMPONENT_VERSIONS,
versionQueryResult.getComponentVersions().stream().map(ComponentVersion::toJson)
versionQueryResult.getComponentVersions().stream().map(v -> v.toJson(true))
.collect(JsonArray::new, JsonArray::add, JsonArray::addAll));
}
@ -591,7 +591,7 @@ public class PlcGwClientHandler extends StrolchComponent implements GlobalPlcLis
}
public JsonArray getIpAddresses() {
if (this.ipAddresses == null || this.ipAddresses.size() == 0 ||
if (this.ipAddresses == null || this.ipAddresses.isEmpty() ||
(System.currentTimeMillis() - this.ipAddressesUpdateTime > 10000L)) {
try {
this.ipAddresses = NetworkHelper.findInet4Addresses().stream().map(add -> {