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
Use SequencedCollection methods (#2037)
Wouter Bornf7369a46f455
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshNetwork.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshNetwork.javaindex a81dcb164..6d0a9fc98 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshNetwork.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshNetwork.java@@ -463,7 +463,7 @@ public class BluetoothMeshNetwork extends BluetoothCentralManagerCallback implem}if (meshProxies.size() > 0) {synchronized (BluetoothMeshNetwork.this) {- BluetoothMeshNetwork.this.bluetoothMeshProxy = meshProxies.get(0);+ BluetoothMeshNetwork.this.bluetoothMeshProxy = meshProxies.getFirst();BluetoothMeshNetwork.this.bluetoothMeshProxy.setRxDataCallback(BluetoothMeshNetwork.this);BluetoothMeshNetwork.this.bluetoothMeshProxy.connect(statusConsumer, new BluetoothMeshProxyConnectCallback() {@Overridediff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshManagerApi.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshManagerApi.javaindex bc562e344..f3d3aec7a 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshManagerApi.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshManagerApi.java@@ -461,7 +461,7 @@ public class MeshManagerApi implements MeshMngrApi{final AllocatedGroupRange groupRange = new AllocatedGroupRange(0xC000, 0xCC9A);final AllocatedSceneRange sceneRange = new AllocatedSceneRange(0x0001, 0x3333);final Provisioner provisioner = network.createProvisioner("nRF Mesh Provisioner", unicastRange, groupRange, sceneRange);- final int unicast = provisioner.getAllocatedUnicastRanges().get(0).getLowAddress();+ final int unicast = provisioner.getAllocatedUnicastRanges().getFirst().getLowAddress();provisioner.assignProvisionerAddress(unicast);network.selectProvisioner(provisioner);network.addProvisioner(provisioner);@@ -997,7 +997,7 @@ public class MeshManagerApi implements MeshMngrApi{meshNetwork.setLastSelected(true);//If there is only one provisioner we default to the zerothif (meshNetwork.provisioners.size() == 1) {- meshNetwork.provisioners.get(0).setLastSelected(true);+ meshNetwork.provisioners.getFirst().setLastSelected(true);}/*mMeshNetworkDb.insertNetwork(mMeshNetworkDao,diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyList.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyList.javaindex 45e88c49f..35f8aac84 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyList.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyList.java@@ -51,7 +51,7 @@ public class ConfigAppKeyList extends ConfigStatusMessage {final void parseStatusParameters() {mStatusCode = mParameters[0];mStatusCodeName = getStatusCodeName(mStatusCode);- mNetKeyIndex = decode(3, 1).get(0);+ mNetKeyIndex = decode(3, 1).getFirst();LOG.info("NetKey Index: " + Integer.toHexString(mNetKeyIndex));mKeyIndexes.addAll(decode(mParameters.length, 3));for (Integer keyIndex : mKeyIndexes) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigKeyRefreshPhaseStatus.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigKeyRefreshPhaseStatus.javaindex 1b4721f14..e3444723f 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigKeyRefreshPhaseStatus.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigKeyRefreshPhaseStatus.java@@ -54,7 +54,7 @@ public class ConfigKeyRefreshPhaseStatus extends ConfigStatusMessage {mStatusCodeName = getStatusCodeName(mStatusCode);final List<Integer> keyIndexes = decode(mParameters.length, 1);- mNetKeyIndex = keyIndexes.get(0);+ mNetKeyIndex = keyIndexes.getFirst();transition = mParameters[3];LOG.info("Status code: " + mStatusCode);diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigNetKeyStatus.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigNetKeyStatus.javaindex 2f759838b..364159f32 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigNetKeyStatus.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigNetKeyStatus.java@@ -51,7 +51,7 @@ public class ConfigNetKeyStatus extends ConfigStatusMessage {mStatusCodeName = getStatusCodeName(mStatusCode);final List<Integer> keyIndexes = decode(mParameters.length, 1);//NetKey status will only contain one index so we just take the first element- mNetKeyIndex = keyIndexes.get(0);//ByteBuffer.wrap(netKeyIndex).order(ByteOrder.BIG_ENDIAN).getShort();+ mNetKeyIndex = keyIndexes.getFirst();//ByteBuffer.wrap(netKeyIndex).order(ByteOrder.BIG_ENDIAN).getShort();LOG.info("Status code: " + mStatusCode);LOG.info("Status message: " + mStatusCodeName);diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.javaindex 38333c6f6..f63e44545 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java@@ -260,7 +260,7 @@ public abstract class AbstractHTTPServerProtocol<T extends AbstractHTTPServerPro+ "' for request path: "+ deploymentInfo.getContextPath());// Add the handler before the greedy deployment handler- webService.getRequestHandlers().add(0, requestHandler);+ webService.getRequestHandlers().addFirst(requestHandler);deployment = new WebService.DeploymentInstance(deploymentInfo, requestHandler);} catch (ServletException e) {diff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXConnection.java b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXConnection.javaindex eb60486dc..c9f633304 100644--- a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXConnection.java+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXConnection.java@@ -106,7 +106,7 @@ public class KNXConnection implements NetworkLinkListener, ProcessListener {groupAddressConsumerMap.forEach((groupAddress, datapointConsumerList) -> {if (!datapointConsumerList.isEmpty()) {// Take first data point for the group address and request the value- Pair<StateDP, Consumer<Object>> datapointConsumer = datapointConsumerList.get(0);+ Pair<StateDP, Consumer<Object>> datapointConsumer = datapointConsumerList.getFirst();getGroupAddressValue(datapointConsumer.key.getMainAddress(), datapointConsumer.key.getPriority());}});diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex 673882965..69363b8a5 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -426,7 +426,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {LOG.info("Enabling auth reverse proxy (passing requests through to Keycloak) on web context: /" + keycloakPath);- webService.getRequestHandlers().add(0, pathStartsWithHandler(+ webService.getRequestHandlers().addFirst(pathStartsWithHandler("Keycloak auth proxy","/" + keycloakPath,authProxyHandler));diff --git a/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.java b/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.javaindex 28b63064a..88bff7fe5 100644--- a/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.java+++ b/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.java@@ -347,7 +347,7 @@ public abstract class AbstractFileServlet extends HttpServlet {response.setHeader("Accept-Ranges", "bytes");if (ranges.size() == 1) {- Range range = ranges.get(0);+ Range range = ranges.getFirst();response.setContentType(contentType);response.setHeader("Content-Length", String.valueOf(range.length));@@ -369,7 +369,7 @@ public abstract class AbstractFileServlet extends HttpServlet {ServletOutputStream output = response.getOutputStream();if (ranges.size() == 1) {- Range range = ranges.get(0);+ Range range = ranges.getFirst();stream(resource, output, range.start, range.length);}else {diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.javaindex 65fede762..e5cbb62af 100644--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java@@ -70,7 +70,7 @@ public class ConsoleAppService implements ContainerService {HttpHandler customBaseFileHandler = ManagerWebService.createFileHandler(container, new PathResourceManager(consoleAppDocRoot), null);HttpHandler pathHandler = new PathHandler().addPrefixPath("info", customBaseFileHandler);- managerWebService.getRequestHandlers().add(0, pathStartsWithHandler(+ managerWebService.getRequestHandlers().addFirst(pathStartsWithHandler("Console app info files","info",pathHandler));diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex 1fcb1b28f..7d7493f9b 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -144,8 +144,8 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour}// Check all links are for the same user and realm- String realm = userAssetLinks.get(0).getId().getRealm();- String userId = userAssetLinks.get(0).getId().getUserId();+ String realm = userAssetLinks.getFirst().getId().getRealm();+ String userId = userAssetLinks.getFirst().getId().getUserId();String[] assetIds = new String[userAssetLinks.size()];IntStream.range(0, userAssetLinks.size()).forEach(i -> {@@ -216,8 +216,8 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour}// Check all links are for the same user and realm- String realm = userAssetLinks.get(0).getId().getRealm();- String userId = userAssetLinks.get(0).getId().getUserId();+ String realm = userAssetLinks.getFirst().getId().getRealm();+ String userId = userAssetLinks.getFirst().getId().getUserId();if (userAssetLinks.stream().anyMatch(userAssetLink -> !userAssetLink.getId().getRealm().equals(realm) || !userAssetLink.getId().getUserId().equals(userId))) {throw new BadRequestException("All user asset links must be for the same user");diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 14319826e..f00960370 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -522,7 +522,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicList<Asset<?>> result = findAll(em, query);if (result.isEmpty())return null;- return result.get(0);+ return result.getFirst();}public List<Asset<?>> findAll(AssetQuery query) {diff --git a/manager/src/main/java/org/openremote/manager/asset/ForecastService.java b/manager/src/main/java/org/openremote/manager/asset/ForecastService.javaindex 3a73bca73..3ba88a55b 100644--- a/manager/src/main/java/org/openremote/manager/asset/ForecastService.java+++ b/manager/src/main/java/org/openremote/manager/asset/ForecastService.java@@ -394,7 +394,7 @@ public class ForecastService extends RouteBuilder implements ContainerService {LOG.fine("Calculating forecast values for attribute: " + attr.getAttributeRef());- Long offset = forecastTimestamps.get(0) - (now + weaConfig.getForecastPeriod().toMillis());+ Long offset = forecastTimestamps.getFirst() - (now + weaConfig.getForecastPeriod().toMillis());List<List<Long>> allSampleTimestamps = calculateSampleTimestamps(weaConfig, offset);List<DatapointBucket> historyDatapointBuckets = getHistoryDataFromDb(attr.getAttributeRef(), weaConfig, offset);@@ -538,7 +538,7 @@ public class ForecastService extends RouteBuilder implements ContainerService {if (Long.class == clazz || Integer.class == clazz || Short.class == clazz || Byte.class == clazz ||Double.class == clazz || Float.class == clazz) {if (values.size() == 1) {- values.add(0, Double.valueOf(0));+ values.addFirst(Double.valueOf(0));}Optional<Number> value = values.stream()@@ -566,7 +566,7 @@ public class ForecastService extends RouteBuilder implements ContainerService {return value;} else if (attribute.getTypeClass() == BigDecimal.class) {if (values.size() == 1) {- values.add(0, BigDecimal.valueOf(0));+ values.addFirst(BigDecimal.valueOf(0));}return values.stream()@@ -576,7 +576,7 @@ public class ForecastService extends RouteBuilder implements ContainerService {);} else if (attribute.getTypeClass() == BigInteger.class) {if (values.size() == 1) {- values.add(0, BigInteger.valueOf(0));+ values.addFirst(BigInteger.valueOf(0));}// Attr(t) = Attr(t-p) * a + Attr(t-2p) * (1 - a)// Attr(t) = (Attr(t-p) * 2 / (R + 1) + Attr(t-2p) * (1 - 2 / (R + 1))) * (R + 1)/(R + 1)@@ -598,7 +598,7 @@ public class ForecastService extends RouteBuilder implements ContainerService {forecastAttributes.forEach(attr -> {List<Long> timestamps = attr.getForecastTimestamps();if (timestamps != null && timestamps.size() > 0) {- nextForecastCalculationMap.put(attr, timestamps.get(0));+ nextForecastCalculationMap.put(attr, timestamps.getFirst());}});}@@ -627,14 +627,14 @@ public class ForecastService extends RouteBuilder implements ContainerService {if (oldTimestamps == null || oldTimestamps.size() == 0) {if (newTimestamps.size() > 0) {// force immediate forecast calculation- newTimestamps.add(0, now);+ newTimestamps.addFirst(now);}attr.setForecastTimestamps(newTimestamps);} else if (newTimestamps.size() > 0 && oldTimestamps.size() > 0) {- long offset = oldTimestamps.get(0) - newTimestamps.get(0);+ long offset = oldTimestamps.getFirst() - newTimestamps.getFirst();List<Long> newShiftedTimestamps = newTimestamps.stream().map(timestamp -> timestamp + offset).collect(Collectors.toList());while(true) {- if (newShiftedTimestamps.get(0) < now) {+ if (newShiftedTimestamps.getFirst() < now) {newShiftedTimestamps = newShiftedTimestamps.stream().map(timestamp -> timestamp + ((ForecastConfigurationWeightedExponentialAverage)config).getForecastPeriod().toMillis())@@ -643,9 +643,9 @@ public class ForecastService extends RouteBuilder implements ContainerService {break;}}- if (isServerRestart && (oldTimestamps.get(0) < now || newTimestamps.size() > oldTimestamps.size())) {+ if (isServerRestart && (oldTimestamps.getFirst() < now || newTimestamps.size() > oldTimestamps.size())) {// force immediate forecast calculation- newShiftedTimestamps.add(0, now);+ newShiftedTimestamps.addFirst(now);}attr.setForecastTimestamps(newShiftedTimestamps);}diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.javaindex 60e8294d0..ad7347e18 100644--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java@@ -408,7 +408,7 @@ public class EnergyOptimisationService extends RouteBuilder implements Container}double[] powerNets = new double[intervalCount];- ElectricitySupplierAsset supplierAsset = supplierAssets.get(0);+ ElectricitySupplierAsset supplierAsset = supplierAssets.getFirst();if (LOG.isLoggable(Level.FINEST)) {LOG.finest(getLogPrefix(optimisationAssetId) + "Found child asset of type '" + ElectricitySupplierAsset.class.getSimpleName() + "': " + supplierAsset);diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.javaindex fa2a8a66b..4dcfce1ea 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java@@ -393,8 +393,8 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServireturn;}- ValueDatapoint<?> solarForecastDatapointMax = solarForecastDatapoints.get(0);- ValueDatapoint<?> solarForecastDatapointMin = solarForecastDatapoints.get(solarForecastDatapoints.size() - 1);+ ValueDatapoint<?> solarForecastDatapointMax = solarForecastDatapoints.getFirst();+ ValueDatapoint<?> solarForecastDatapointMin = solarForecastDatapoints.getLast();// Get current timestamp of power forecast attributeElectricityProducerSolarAsset asset = (ElectricityProducerSolarAsset) assetStorageService.find(electricityProducerSolarAsset.getId());diff --git a/manager/src/main/java/org/openremote/manager/event/UndertowHost.java b/manager/src/main/java/org/openremote/manager/event/UndertowHost.javaindex 5bdb9439b..8e26d8b6c 100644--- a/manager/src/main/java/org/openremote/manager/event/UndertowHost.java+++ b/manager/src/main/java/org/openremote/manager/event/UndertowHost.java@@ -91,7 +91,7 @@ public class UndertowHost implements org.apache.camel.component.undertow.UndertowebsocketHttpHandler = pathStartsWithHandler(deploymentName, path, deploymentHandler);// Give web socket handler higher priority than any other handlers already added- container.getService(WebService.class).getRequestHandlers().add(0, websocketHttpHandler);+ container.getService(WebService.class).getRequestHandlers().addFirst(websocketHttpHandler);// Caller expects a CamelWebSocketHandler instancecamelHandler = handler;diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.javaindex 8c3b2191a..8f523ce14 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java@@ -117,7 +117,7 @@ public class GatewayClientResourceImpl extends ManagerWebResource implements Gatthrow new WebApplicationException(BAD_REQUEST);}- if ((realms.size() > 1 || !getAuthenticatedRealmName().equals(realms.get(0))) && !isSuperUser()) {+ if ((realms.size() > 1 || !getAuthenticatedRealmName().equals(realms.getFirst())) && !isSuperUser()) {throw new WebApplicationException(FORBIDDEN);}diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 296d5c61c..88addb210 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -249,7 +249,7 @@ public class MapService implements ContainerService {proxyHandler.handleRequest(exchange);};- webService.getRequestHandlers().add(0, pathStartsWithHandler("Raster Map Tile Proxy", RASTER_MAP_TILE_PATH, proxyWrapper));+ webService.getRequestHandlers().addFirst(pathStartsWithHandler("Raster Map Tile Proxy", RASTER_MAP_TILE_PATH, proxyWrapper));}}diff --git a/manager/src/main/java/org/openremote/manager/notification/LocalizedNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/LocalizedNotificationHandler.javaindex 2828c4548..5bdf54826 100644--- a/manager/src/main/java/org/openremote/manager/notification/LocalizedNotificationHandler.java+++ b/manager/src/main/java/org/openremote/manager/notification/LocalizedNotificationHandler.java@@ -174,13 +174,13 @@ public class LocalizedNotificationHandler extends RouteBuilder implements Notifielse if (target.getType().equals(Notification.TargetType.ASSET)) {List<UserAssetLink> links = assetStorageService.findUserAssetLinks(null, null, target.getId());if (!links.isEmpty()) {- user = identityService.getIdentityProvider().getUser(links.get(0).getId().getUserId());+ user = identityService.getIdentityProvider().getUser(links.getFirst().getId().getUserId());}}// If user has configured their locale (through the user attribute), update the targetLocaleif (user != null && user.getAttributeMap() != null && user.getAttributeMap().containsKey(LOCALE_ATTRIBUTE)) {- targetLocale = user.getAttributeMap().get(LOCALE_ATTRIBUTE).get(0);+ targetLocale = user.getAttributeMap().get(LOCALE_ATTRIBUTE).getFirst();}}diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex 344f92c47..4d14e13a0 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -1005,7 +1005,7 @@ public class JsonRulesBuilder extends RulesBuilder {if (webhookAction.mediaType == null) {Optional<Map.Entry<String, List<String>>> contentTypeHeader = webhook.getHeaders().entrySet().stream().filter((entry) -> entry.getKey().equalsIgnoreCase("content-type")).findFirst();- String contentType = contentTypeHeader.isPresent() ? contentTypeHeader.get().getValue().get(0) : MediaType.APPLICATION_JSON;+ String contentType = contentTypeHeader.isPresent() ? contentTypeHeader.get().getValue().getFirst() : MediaType.APPLICATION_JSON;webhookAction.mediaType = MediaType.valueOf(contentType);}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex c6af4ba5f..79a99e270 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -978,7 +978,7 @@ public class RulesService extends RouteBuilder implements ContainerService {public void fireDeploymentsWithPredictedDataForAsset(String assetId) {List<AttributeInfo> assetStates = getAssetStatesInScope(assetId);if (!assetStates.isEmpty()) {- String realm = assetStates.get(0).getRealm();+ String realm = assetStates.getFirst().getRealm();String[] assetPaths = assetStates.stream().flatMap(assetState -> Arrays.stream(assetState.getPath())).toArray(String[]::new);synchronized (ENGINE_LOCK) {for (RulesEngine<?> rulesEngine : getEnginesInScope(realm, assetPaths)) {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex 162edce9d..36670e966 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -115,7 +115,7 @@ public class RulesetStorageService implements ContainerService {if (result.size() > 1) {throw new IllegalArgumentException("Query returned more than one ruleset");}- return result.get(0);+ return result.getFirst();}public <T extends Ruleset> List<T> findAll(Class<T> rulesetType, RulesetQuery query) {diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.javaindex d63fdadbd..c96764a94 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java@@ -309,7 +309,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {.setParameter("realm", realm).setParameter("username", username).getResultList();- return result.size() > 0 ? result.get(0) : null;+ return result.size() > 0 ? result.getFirst() : null;});}@@ -319,7 +319,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {em.createQuery("select u from User u where u.id = :userId", User.class).setParameter("userId", userId).getResultList();- return result.size() > 0 ? result.get(0) : null;+ return result.size() > 0 ? result.getFirst() : null;});}diff --git a/model-util/src/main/java/CustomExtension.java b/model-util/src/main/java/CustomExtension.javaindex 2c33aed9d..a1dd6fbef 100644--- a/model-util/src/main/java/CustomExtension.java+++ b/model-util/src/main/java/CustomExtension.java@@ -59,7 +59,7 @@ public class CustomExtension extends Extension {new TransformerDefinition(ModelCompiler.TransformationPhase.AfterDeclarationSorting, (TsModelTransformer) (context, model) -> {TsBeanModel provBean = model.getBean(X509ProvisioningConfig.class);if (provBean != null) {- provBean.getExtendsList().remove(0);+ provBean.getExtendsList().removeFirst();provBean.getExtendsList().add(provBean.getParent());}return model;diff --git a/model/src/main/java/org/openremote/model/mail/MailMessage.java b/model/src/main/java/org/openremote/model/mail/MailMessage.javaindex 771a3e5bf..da4204ed0 100644--- a/model/src/main/java/org/openremote/model/mail/MailMessage.java+++ b/model/src/main/java/org/openremote/model/mail/MailMessage.java@@ -68,7 +68,7 @@ public class MailMessage {if (namedHeaders == null || namedHeaders.isEmpty()) {return null;}- return namedHeaders.get(0);+ return namedHeaders.getFirst();}public List<String> getHeaders(String name) {