100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fix deprecations (#2104)
Eric Bariaux34f0e27ad8ef
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/Gateway.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/Gateway.javaindex 17765f13e..3e767f0ac 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/Gateway.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/Gateway.java@@ -48,7 +48,7 @@ public class Gateway {* @return Credentials that can be used to authenticate to the IKEA TRÅDFRI gateway*/public Credentials connect(String securityCode) {- String identity = RandomStringUtils.randomAlphanumeric(16);+ String identity = RandomStringUtils.insecure().nextAlphanumeric(16);AuthenticateRequest request = new AuthenticateRequest();request.setIdentity(identity);setCredentials("Client_identity", securityCode);diff --git a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.javaindex 4d2317456..c10408dbc 100644--- a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java+++ b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java@@ -32,7 +32,6 @@ import org.apache.http.client.config.RequestConfig;import org.apache.http.impl.client.HttpClientBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;-import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;import org.jboss.resteasy.client.jaxrs.internal.BasicAuthentication;import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.openremote.container.json.JacksonConfig;@@ -185,10 +184,8 @@ public class WebTargetBuilder {HttpClient apacheClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();- ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine(apacheClient);ResteasyClientBuilderImpl clientBuilder = new ResteasyClientBuilderImpl()- .httpEngine(engine).connectionPoolSize(connectionPoolSize).connectionCheckoutTimeout(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS).readTimeout(overrideSocketTimeout, TimeUnit.MILLISECONDS)diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 88addb210..5cf27482d 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -126,13 +126,11 @@ public class MapService implements ContainerService {mapConfiguration.sources.clear();mapConfiguration.sources.put("vector_tiles", ValueUtil.JSON.convertValue(vectorTiles, MapSourceConfig.class));- Iterator<Map.Entry<String, JsonNode>> fields = sources.fields();- while (fields.hasNext()) {- Map.Entry<String, JsonNode> field = fields.next();- if (!Objects.equals(field.getKey(), "vector_tiles")) {+ sources.propertyStream()+ .filter(field -> !Objects.equals(field.getKey(), "vector_tiles"))+ .forEach(field -> {mapConfiguration.sources.put(field.getKey(), ValueUtil.JSON.convertValue(field.getValue(), MapSourceConfig.class));- }- }+ });mapConfig.remove("override");if (mapConfiguration.override != null) {@@ -611,13 +609,12 @@ public class MapService implements ContainerService {public void saveMapMetadata(Metadata metadata) {Optional<JsonNode> options = Optional.ofNullable(mapConfig.get("options"));if (metadata.isValid() && options.isPresent()) {- Iterator<Map.Entry<String, JsonNode>> fields = options.get().fields();- while (fields.hasNext()) {- Map.Entry<String, JsonNode> field = fields.next();- ObjectNode value = (ObjectNode)field.getValue();- value.set("center", metadata.getCenter());- value.set("bounds", metadata.getBounds());- }+ options.get().propertyStream()+ .forEach(field -> {+ ObjectNode value = (ObjectNode)field.getValue();+ value.set("center", metadata.getCenter());+ value.set("bounds", metadata.getBounds());+ });configurationService.saveMapConfig(mapConfig);mapConfig = configurationService.getMapConfig();mapSettings.clear();