Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Use interfaces where possible instead of specific implementations (#1417)

Wouter Born31c33641b4db
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BaseMeshNetwork.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BaseMeshNetwork.java
index 4f62c782a..ded8a8c74 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BaseMeshNetwork.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BaseMeshNetwork.java
@@ -65,7 +65,7 @@ abstract public class BaseMeshNetwork {
List<ProvisionedMeshNode> nodes = new ArrayList<>();
List<Group> groups = new ArrayList<>();
List<Scene> scenes = new ArrayList<>();
- protected Map<Integer, ArrayList<Integer>> networkExclusions = new HashMap<>();
+ protected Map<Integer, List<Integer>> networkExclusions = new HashMap<>();
//Library related attributes
int unicastAddress = 0x0001;
boolean lastSelected;
@@ -896,7 +896,7 @@ abstract public class BaseMeshNetwork {
/**
* Returns the map of network exclusions
*/
- public synchronized Map<Integer, ArrayList<Integer>> getNetworkExclusions() {
+ public synchronized Map<Integer, List<Integer>> getNetworkExclusions() {
return Collections.unmodifiableMap(networkExclusions);
}
@@ -971,7 +971,7 @@ abstract public class BaseMeshNetwork {
//Exclude node
node.setExcluded(true);
notifyNodeUpdated(node);
- ArrayList<Integer> addresses = networkExclusions.get(ivIndex.getIvIndex());
+ List<Integer> addresses = networkExclusions.get(ivIndex.getIvIndex());
if (addresses == null) {
addresses = new ArrayList<>();
}
diff --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.java
index 2cefd99b3..9d7d9808a 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
@@ -283,9 +283,9 @@ public class MeshManagerApi implements MeshMngrApi{
}
if (!mMeshNetwork.ivIndex.getIvRecoveryFlag()) {
- final Iterator<Map.Entry<Integer, ArrayList<Integer>>> iterator = mMeshNetwork.networkExclusions.entrySet().iterator();
+ final Iterator<Map.Entry<Integer, List<Integer>>> iterator = mMeshNetwork.networkExclusions.entrySet().iterator();
while (iterator.hasNext()) {
- final Map.Entry<Integer, ArrayList<Integer>> exclusions = iterator.next();
+ final Map.Entry<Integer, List<Integer>> exclusions = iterator.next();
final int expectedIncrement = exclusions.getKey() + 2;
if (mMeshNetwork.ivIndex.getIvIndex() >= expectedIncrement) {
// Clear the last known sequence number of addresses that are to be removed from the exclusion list.
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshNetwork.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshNetwork.java
index e1189c4f2..feb324b41 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshNetwork.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshNetwork.java
@@ -211,7 +211,7 @@ public class MeshNetwork extends BaseMeshNetwork{
}
// Populate all addresses that are currently in use
- final ArrayList<Integer> usedAddresses = new ArrayList<>();
+ final List<Integer> usedAddresses = new ArrayList<>();
for (ProvisionedMeshNode node : nodes) {
usedAddresses.addAll(node.getElements().keySet());
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/Provisioner.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/Provisioner.java
index 6696e8d5f..81eda06c4 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/Provisioner.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/Provisioner.java
@@ -251,21 +251,21 @@ public class Provisioner {
public boolean addRange(final Range allocatedRange) {
if (allocatedRange instanceof AllocatedUnicastRange) {
allocatedUnicastRanges.add((AllocatedUnicastRange) allocatedRange);
- final ArrayList<AllocatedUnicastRange> ranges = new ArrayList<>(allocatedUnicastRanges);
+ final List<AllocatedUnicastRange> ranges = new ArrayList<>(allocatedUnicastRanges);
Collections.sort(ranges, addressRangeComparator);
allocatedUnicastRanges.clear();
allocatedUnicastRanges.addAll(Range.mergeUnicastRanges(ranges));
return true;
} else if (allocatedRange instanceof AllocatedGroupRange) {
allocatedGroupRanges.add((AllocatedGroupRange) allocatedRange);
- final ArrayList<AllocatedGroupRange> ranges = new ArrayList<>(allocatedGroupRanges);
+ final List<AllocatedGroupRange> ranges = new ArrayList<>(allocatedGroupRanges);
Collections.sort(ranges, addressRangeComparator);
allocatedGroupRanges.clear();
allocatedGroupRanges.addAll(Range.mergeGroupRanges(ranges));
return true;
} else if (allocatedRange instanceof AllocatedSceneRange) {
allocatedSceneRanges.add((AllocatedSceneRange) allocatedRange);
- final ArrayList<AllocatedSceneRange> ranges = new ArrayList<>(allocatedSceneRanges);
+ final List<AllocatedSceneRange> ranges = new ArrayList<>(allocatedSceneRanges);
Collections.sort(allocatedSceneRanges, sceneRangeComparator);
allocatedSceneRanges.clear();
allocatedSceneRanges.addAll(Range.mergeSceneRanges(ranges));
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/control/BlockAcknowledgementMessage.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/control/BlockAcknowledgementMessage.java
index eb74583a2..8cbe8eb32 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/control/BlockAcknowledgementMessage.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/control/BlockAcknowledgementMessage.java
@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.bluetooth.mesh.control;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
public class BlockAcknowledgementMessage extends TransportControlMessage {
@@ -86,8 +87,8 @@ public class BlockAcknowledgementMessage extends TransportControlMessage {
* @param blockAcknowledgement acknowledgement payload received
* @param segmentCount number of segments
*/
- public static ArrayList<Integer> getSegmentsToBeRetransmitted(final byte[] blockAcknowledgement, final int segmentCount) {
- final ArrayList<Integer> retransmitSegments = new ArrayList<>();
+ public static List<Integer> getSegmentsToBeRetransmitted(final byte[] blockAcknowledgement, final int segmentCount) {
+ final List<Integer> retransmitSegments = new ArrayList<>();
final int blockAck = ByteBuffer.wrap(blockAcknowledgement).order(ByteOrder.BIG_ENDIAN).getInt();
for (int i = 0; i < segmentCount; i++) {
int bit = (blockAck >> i) & 1;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyStatus.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyStatus.java
index 8622f5cd0..86ef85b76 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyStatus.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigAppKeyStatus.java
@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.bluetooth.mesh.transport;
import org.openremote.agent.protocol.bluetooth.mesh.opcodes.ConfigMessageOpCodes;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
/**
@@ -50,7 +51,7 @@ public class ConfigAppKeyStatus extends ConfigStatusMessage {
mStatusCode = mParameters[0];
mStatusCodeName = getStatusCodeName(mStatusCode);
- final ArrayList<Integer> keyIndexes = decode(mParameters.length, 1);
+ final List<Integer> keyIndexes = decode(mParameters.length, 1);
mNetKeyIndex = keyIndexes.get(0);
mAppKeyIndex = keyIndexes.get(1);
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.java
index 22edfd0c4..db63dd0b1 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
@@ -20,6 +20,7 @@
package org.openremote.agent.protocol.bluetooth.mesh.transport;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
// import static org.openremote.agent.protocol.bluetooth.mesh.NetworkKey.KeyRefreshPhase;
@@ -53,7 +54,7 @@ public class ConfigKeyRefreshPhaseStatus extends ConfigStatusMessage {
mStatusCode = mParameters[0];
mStatusCodeName = getStatusCodeName(mStatusCode);
- final ArrayList<Integer> keyIndexes = decode(mParameters.length, 1);
+ final List<Integer> keyIndexes = decode(mParameters.length, 1);
mNetKeyIndex = keyIndexes.get(0);
transition = mParameters[3];
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.java
index 67b7a2efb..fd8850eb9 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
@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.bluetooth.mesh.transport;
import org.openremote.agent.protocol.bluetooth.mesh.opcodes.ConfigMessageOpCodes;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
/**
@@ -49,7 +50,7 @@ public class ConfigNetKeyStatus extends ConfigStatusMessage {
final void parseStatusParameters() {
mStatusCode = mParameters[0];
mStatusCodeName = getStatusCodeName(mStatusCode);
- final ArrayList<Integer> keyIndexes = decode(mParameters.length, 1);
+ 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();
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigStatusMessage.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigStatusMessage.java
index cc3ba1a59..77cd5487e 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigStatusMessage.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ConfigStatusMessage.java
@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.bluetooth.mesh.transport;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
+import java.util.List;
import static org.openremote.agent.protocol.bluetooth.mesh.transport.ConfigStatusMessage.StatusCodeNames.fromStatusCode;
@@ -54,26 +55,26 @@ public abstract class ConfigStatusMessage extends MeshMessage {
return mParameters;
}
- protected ArrayList<Integer> decode(final int dataSize, final int offset) {
- final ArrayList<Integer> arrayList = new ArrayList<>();
+ protected List<Integer> decode(final int dataSize, final int offset) {
+ final List<Integer> list = new ArrayList<>();
final int size = dataSize - offset;
if (size == 0) {
- return arrayList;
+ return list;
}
if (size == 2) {
final byte[] netKeyIndex = new byte[]{(byte) (mParameters[offset + 1] & 0x0F), mParameters[offset]};
final int keyIndex = encode(netKeyIndex);
- arrayList.add(keyIndex);
+ list.add(keyIndex);
} else {
final int firstKeyIndex = encode(new byte[]{(byte) (mParameters[offset + 1] & 0x0F), mParameters[offset]});
final int secondNetKeyIndex = encode(new byte[]{
(byte) ((mParameters[offset + 2] & 0xF0) >> 4),
(byte) (mParameters[offset + 2] << 4 | ((mParameters[offset + 1] & 0xF0) >> 4))});
- arrayList.add(firstKeyIndex);
- arrayList.add(secondNetKeyIndex);
- arrayList.addAll(decode(dataSize, offset + 3));
+ list.add(firstKeyIndex);
+ list.add(secondNetKeyIndex);
+ list.addAll(decode(dataSize, offset + 3));
}
- return arrayList;
+ return list;
}
private static int encode(final byte[] netKeyIndex) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/DefaultNoOperationMessageState.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/DefaultNoOperationMessageState.java
index 558ba68a0..b889f2435 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/DefaultNoOperationMessageState.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/DefaultNoOperationMessageState.java
@@ -457,7 +457,7 @@ class DefaultNoOperationMessageState extends MeshMessageState {
final TransportControlMessage transportControlMessage = controlMessage.getTransportControlMessage();
if (transportControlMessage.getState() == TransportControlMessage.TransportControlMessageState.LOWER_TRANSPORT_BLOCK_ACKNOWLEDGEMENT) {
LOG.info("Acknowledgement payload: " + MeshParserUtils.bytesToHex(controlMessage.getTransportControlPdu(), false));
- final ArrayList<Integer> retransmitPduIndexes = BlockAcknowledgementMessage.getSegmentsToBeRetransmitted(controlMessage.getTransportControlPdu(), segmentCount);
+ final List<Integer> retransmitPduIndexes = BlockAcknowledgementMessage.getSegmentsToBeRetransmitted(controlMessage.getTransportControlPdu(), segmentCount);
mMeshStatusCallbacks.onBlockAcknowledgementReceived(controlMessage.getSrc(), controlMessage);
executeResend(retransmitPduIndexes);
} else {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/Element.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/Element.java
index 56fbedd16..4f0cbfec1 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/Element.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/Element.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -70,10 +71,10 @@ public final class Element {
this.meshModels = models;
}
- private void sortModels(final HashMap<Integer, MeshModel> unorderedElements) {
+ private void sortModels(final Map<Integer, MeshModel> unorderedElements) {
final Set<Integer> unorderedKeys = unorderedElements.keySet();
- final ArrayList<Integer> orderedKeys = new ArrayList<>(unorderedKeys);
+ final List<Integer> orderedKeys = new ArrayList<>(unorderedKeys);
Collections.sort(orderedKeys);
for (int key : orderedKeys) {
meshModels.put(key, unorderedElements.get(key));
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ProvisionedMeshNode.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ProvisionedMeshNode.java
index ba291ccc7..88d4c536e 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ProvisionedMeshNode.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/ProvisionedMeshNode.java
@@ -90,10 +90,10 @@ public final class ProvisionedMeshNode extends ProvisionedBaseMeshNode {
ttl = provisioner.getGlobalTtl();
mTimeStampInMillis = System.currentTimeMillis();
final MeshModel model = SigModelParser.getSigModel(SigModelParser.CONFIGURATION_CLIENT);
- final HashMap<Integer, MeshModel> models = new HashMap<>();
+ final Map<Integer, MeshModel> models = new HashMap<>();
models.put(model.getModelId(), model);
final Element element = new Element(unicastAddress, 0, models);
- final HashMap<Integer, Element> elements = new HashMap<>();
+ final Map<Integer, Element> elements = new HashMap<>();
elements.put(unicastAddress, element);
mElements = elements;
nodeFeatures = new Features(Features.UNSUPPORTED, Features.UNSUPPORTED, Features.UNSUPPORTED, Features.UNSUPPORTED);
@@ -312,7 +312,7 @@ public final class ProvisionedMeshNode extends ProvisionedBaseMeshNode {
if (mAddedAppKeys.isEmpty()) {
mAddedAppKeys.addAll(addAppKeyList(indexes, new ArrayList<>()));
} else {
- final ArrayList<NodeKey> tempList = new ArrayList<>(mAddedAppKeys);
+ final List<NodeKey> tempList = new ArrayList<>(mAddedAppKeys);
for (ApplicationKey applicationKey : keyIndexes) {
if (applicationKey.getBoundNetKeyIndex() == netKeyIndex) {
for (NodeKey nodeKey : mAddedAppKeys) {
@@ -328,7 +328,7 @@ public final class ProvisionedMeshNode extends ProvisionedBaseMeshNode {
}
}
- private List<NodeKey> addAppKeyList(final List<Integer> indexes, final ArrayList<NodeKey> tempList) {
+ private List<NodeKey> addAppKeyList(final List<Integer> indexes, final List<NodeKey> tempList) {
for (Integer index : indexes) {
tempList.add(new NodeKey(index, false));
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/SceneRegisterStatus.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/SceneRegisterStatus.java
index eeaa75d10..cd880a7c2 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/SceneRegisterStatus.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/SceneRegisterStatus.java
@@ -25,6 +25,7 @@ import org.openremote.agent.protocol.bluetooth.mesh.utils.MeshAddress;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
/**
@@ -36,7 +37,7 @@ public final class SceneRegisterStatus extends GenericStatusMessage implements S
private static final int OP_CODE = ApplicationMessageOpCodes.SCENE_REGISTER_STATUS;
private int mStatus;
private int mCurrentScene;
- private final ArrayList<Integer> mSceneList = new ArrayList<>();
+ private final List<Integer> mSceneList = new ArrayList<>();
/**
* Constructs the GenericOnOffStatus mMessage.
@@ -78,7 +79,7 @@ public final class SceneRegisterStatus extends GenericStatusMessage implements S
*
* @return true if on and false other wise
*/
- public final int getStatus() {
+ public int getStatus() {
return mStatus;
}
@@ -91,7 +92,7 @@ public final class SceneRegisterStatus extends GenericStatusMessage implements S
*
* @return true if on and false other wise
*/
- public final int getCurrentScene() {
+ public int getCurrentScene() {
return mCurrentScene;
}
@@ -100,7 +101,7 @@ public final class SceneRegisterStatus extends GenericStatusMessage implements S
*
* @return scene list
*/
- public ArrayList<Integer> getSceneList() {
+ public List<Integer> getSceneList() {
return mSceneList;
}
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/AlgorithmType.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/AlgorithmType.java
index 539160920..55d2e356a 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/AlgorithmType.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/AlgorithmType.java
@@ -20,6 +20,7 @@
package org.openremote.agent.protocol.bluetooth.mesh.utils;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
public enum AlgorithmType {
@@ -67,9 +68,9 @@ public enum AlgorithmType {
* @param algorithmTypeValue algorithm type
* @return selected output action type
*/
- public static ArrayList<AlgorithmType> getAlgorithmTypeFromBitMask(final short algorithmTypeValue) {
+ public static List<AlgorithmType> getAlgorithmTypeFromBitMask(final short algorithmTypeValue) {
final AlgorithmType[] algorithmTypes = {FIPS_P_256_ELLIPTIC_CURVE};
- final ArrayList<AlgorithmType> supportedAlgorithms = new ArrayList<>();
+ final List<AlgorithmType> supportedAlgorithms = new ArrayList<>();
for (AlgorithmType algorithmType : algorithmTypes) {
if ((algorithmTypeValue & algorithmType.ordinal()) == algorithmType.ordinal()) {
supportedAlgorithms.add(algorithmType);
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/InputOOBAction.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/InputOOBAction.java
index fbcb8ad9b..cd265e844 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/InputOOBAction.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/InputOOBAction.java
@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.bluetooth.mesh.utils;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
+import java.util.List;
import java.util.logging.Logger;
public enum InputOOBAction {
@@ -90,9 +91,9 @@ public enum InputOOBAction {
}
}
- public static ArrayList<InputOOBAction> parseInputActionsFromBitMask(final int inputAction) {
+ public static List<InputOOBAction> parseInputActionsFromBitMask(final int inputAction) {
final InputOOBAction[] inputActions = {PUSH, TWIST, INPUT_NUMERIC, INPUT_ALPHA_NUMERIC};
- final ArrayList<InputOOBAction> supportedActionValues = new ArrayList<>();
+ final List<InputOOBAction> supportedActionValues = new ArrayList<>();
for (InputOOBAction action : inputActions) {
if ((inputAction & action.inputOOBAction) == action.inputOOBAction) {
supportedActionValues.add(action);
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/OutputOOBAction.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/OutputOOBAction.java
index 9211fab3c..905b34eb2 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/OutputOOBAction.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/OutputOOBAction.java
@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.bluetooth.mesh.utils;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
import java.util.logging.Logger;
@@ -102,9 +103,9 @@ public enum OutputOOBAction {
* @param outputAction type of output action
* @return selected output action type
*/
- public static ArrayList<OutputOOBAction> parseOutputActionsFromBitMask(final int outputAction) {
+ public static List<OutputOOBAction> parseOutputActionsFromBitMask(final int outputAction) {
final OutputOOBAction[] outputActions = {BLINK, BEEP, VIBRATE, OUTPUT_NUMERIC, OUTPUT_ALPHA_NUMERIC};
- final ArrayList<OutputOOBAction> supportedActionValues = new ArrayList<>();
+ final List<OutputOOBAction> supportedActionValues = new ArrayList<>();
for (OutputOOBAction action : outputActions) {
if ((outputAction & action.outputOOBAction) == action.outputOOBAction) {
supportedActionValues.add(action);
@@ -185,4 +186,4 @@ public enum OutputOOBAction {
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java
index 506290a8c..e4b83fb4c 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/DeviceObserver.java
@@ -8,6 +8,7 @@ import org.openremote.agent.protocol.tradfri.util.CoapClient;
import org.openremote.model.util.ValueUtil;
import java.util.ArrayList;
+import java.util.List;
/**
* The class that observes a device to automagically detect changes
@@ -43,19 +44,19 @@ public class DeviceObserver extends Observer {
public void callEventHandlers(String payload) {
try {
DeviceResponse response = objectMapper.readValue(payload, DeviceResponse.class);
- ArrayList<DeviceEvent> events = new ArrayList<>();
- ArrayList<EventHandler<?>> called = new ArrayList<>();
+ List<DeviceEvent> events = new ArrayList<>();
+ List<EventHandler<?>> called = new ArrayList<>();
if (device.isLight()){
LightProperties oldProperties = (LightProperties) device.getProperties();
if(response.getLightProperties() != null && response.getLightProperties().length > 0) device.setProperties(response.getLightProperties()[0]);
LightProperties newProperties = (LightProperties) device.getProperties();
events.add(new LightEvent(device.toLight()));
- ArrayList<DeviceEvent> changeEvents = new ArrayList<>();
+ List<DeviceEvent> changeEvents = new ArrayList<>();
if (checkChanges(oldProperties.getOn(), newProperties.getOn())) changeEvents.add(new LightChangeOnEvent(device.toLight(), oldProperties, newProperties));
if (checkChanges(oldProperties.getBrightness(), newProperties.getBrightness())) changeEvents.add(new LightChangeBrightnessEvent(device.toLight(), oldProperties, newProperties));
if (checkChanges(oldProperties.getColourX(), newProperties.getColourX()) || checkChanges(oldProperties.getColourY(), newProperties.getColourY()) || checkChanges(oldProperties.getHue(), newProperties.getHue()) || checkChanges(oldProperties.getSaturation(), newProperties.getSaturation())) changeEvents.add(new LightChangeColourEvent(device.toLight(), oldProperties, newProperties));
if (checkChanges(oldProperties.getColourTemperature(), newProperties.getColourTemperature())) changeEvents.add(new LightChangeColourTemperatureEvent(device.toLight(), oldProperties, newProperties));
- if (changeEvents.size() > 0){
+ if (!changeEvents.isEmpty()){
events.add(new LightChangeEvent(device.toLight(), oldProperties, newProperties));
events.addAll(changeEvents);
}
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.java
index 307505b0b..17765f13e 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
@@ -142,7 +142,7 @@ public class Gateway {
* @return An array of the devices registered to the IKEA TRÅDFRI gateway
*/
public Device[] getDevices(){
- ArrayList<Device> deviceList = new ArrayList<>();
+ List<Device> deviceList = new ArrayList<>();
int[] deviceIds = getDeviceIds();
if(deviceIds == null) return null;
for(int deviceId: deviceIds){
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/GatewayObserver.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/GatewayObserver.java
index 1392ec9d2..19d53e937 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/GatewayObserver.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/device/GatewayObserver.java
@@ -9,6 +9,7 @@ import org.openremote.agent.protocol.tradfri.util.CoapClient;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
/**
* The class that observes an IKEA TRÅDFRI gateway to automagically detect changes
@@ -64,7 +65,7 @@ public class GatewayObserver extends Observer {
public void callEventHandlers(String payload) {
try {
int[] deviceIds = objectMapper.readValue(payload, int[].class);
- ArrayList<EventHandler<?>> called = new ArrayList<>();
+ List<EventHandler<?>> called = new ArrayList<>();
GatewayEvent event = new GatewayEvent(gateway);
for (EventHandler<?> eventHandler : gateway.getEventHandlers()) {
if (eventHandler.getEventType().isAssignableFrom(event.getClass()) && !called.contains(eventHandler)) {
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.java
index 3eb3d0bf7..1aae50b87 100644
--- a/container/src/main/java/org/openremote/container/web/WebService.java
+++ b/container/src/main/java/org/openremote/container/web/WebService.java
@@ -364,7 +364,7 @@ public abstract class WebService implements ContainerService {
public static Set<String> getAllowedOrigins(Container container) {
// Set allowed origins using external hostnames and WEBSERVER_ALLOWED_ORIGINS
- HashSet<String> allowedOrigins = new HashSet<>(
+ Set<String> allowedOrigins = new HashSet<>(
getExternalHostnames(container)
.stream().map(hostname -> "https://" + hostname).toList()
);
diff --git a/model/src/main/java/org/openremote/model/flow/Flow.java b/model/src/main/java/org/openremote/model/flow/Flow.java
index adac486e3..2a694b1a2 100644
--- a/model/src/main/java/org/openremote/model/flow/Flow.java
+++ b/model/src/main/java/org/openremote/model/flow/Flow.java
@@ -200,7 +200,7 @@ public class Flow extends FlowObject {
public Wire removeWire(Wire wire) {
Wire removed = null;
- ArrayList<Wire> collection = new ArrayList<>(Arrays.asList(getWires()));
+ List<Wire> collection = new ArrayList<>(Arrays.asList(getWires()));
Iterator<Wire> it = collection.iterator();
while (it.hasNext()) {
if (it.next().equals(wire)) {
@@ -214,7 +214,7 @@ public class Flow extends FlowObject {
public Wire removeWireBetweenSlots(Slot sourceSlot, Slot sinkSlot) {
Wire removed = null;
- ArrayList<Wire> collection = new ArrayList<>(Arrays.asList(getWires()));
+ List<Wire> collection = new ArrayList<>(Arrays.asList(getWires()));
Iterator<Wire> it = collection.iterator();
while (it.hasNext()) {
Wire wire = it.next();