]> git.basschouten.com Git - openhab-addons.git/commitdiff
[bluetooth.bluegiga] Refactored and added null annotations (#13974)
authorlsiepel <leosiepel@gmail.com>
Sun, 5 Mar 2023 20:29:10 +0000 (21:29 +0100)
committerGitHub <noreply@github.com>
Sun, 5 Mar 2023 20:29:10 +0000 (21:29 +0100)
* All SAT warnings

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
135 files changed:
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/BlueGigaBluetoothCharacteristic.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/BlueGigaBluetoothDevice.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/BlueGigaResponsePackets.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/BlueGigaTransactionManager.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaAttributeValueEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaAttributeWriteCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaAttributeWriteResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaExecuteWriteCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaExecuteWriteResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaFindByTypeValueCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaFindByTypeValueResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaFindInformationCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaFindInformationFoundEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaFindInformationResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaGroupFoundEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaIndicateConfirmCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaIndicateConfirmResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaIndicatedEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaPrepareWriteCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaPrepareWriteResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaProcedureCompletedEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadByGroupTypeCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadByGroupTypeResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadByHandleCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadByHandleResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadByTypeCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadByTypeResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadLongCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadLongResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadMultipleCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadMultipleResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaReadMultipleResponseEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaWriteCommandCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributeclient/BlueGigaWriteCommandResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaAttributeStatusEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaReadCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaReadResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaReadTypeCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaReadTypeResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaSendAttributesCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaSendAttributesResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaUserReadRequestEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaUserReadResponseCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaUserReadResponseResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaUserWriteResponseCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaUserWriteResponseResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaValueEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaWriteCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/attributedb/BlueGigaWriteResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaChannelMapGetCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaChannelMapGetResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaConnectionStatusEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaDisconnectCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaDisconnectResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaDisconnectedEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaFeatureIndEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaGetRssiCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaGetRssiResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaGetStatusCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaGetStatusResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaUpdateCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaUpdateResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/connection/BlueGigaVersionIndEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaConnectDirectCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaConnectDirectResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaConnectSelectiveCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaConnectSelectiveResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaDiscoverCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaDiscoverResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaEndProcedureCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaEndProcedureResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaScanResponseEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetAdvDataCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetAdvDataResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetAdvParametersCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetAdvParametersResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetModeCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetModeResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetScanParametersCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/gap/BlueGigaSetScanParametersResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaBondStatusEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaBondingFailEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaDeleteBondingCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaDeleteBondingResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaEncryptStartCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaEncryptStartResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaGetBondsCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaGetBondsResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaPassKeyCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaPassKeyResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaPasskeyDisplayEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaPasskeyRequestEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaSetBondableModeCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaSetBondableModeResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaSetParametersCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaSetParametersResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaWhitelistBondsCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/security/BlueGigaWhitelistBondsResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaAddressGetCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaAddressGetResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaBootEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaEndpointWatermarkRxEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaEndpointWatermarkTxEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaGetConnectionsCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaGetConnectionsResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaGetCountersCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaGetCountersResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaGetInfoCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaGetInfoResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaHelloCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaHelloResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaNoLicenseKeyEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaProtocolErrorEvent.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaResetCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaResetResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaWhitelistAppendCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaWhitelistAppendResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaWhitelistClearCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaWhitelistClearResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaWhitelistRemoveCommand.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/command/system/BlueGigaWhitelistRemoveResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/eir/EirDataType.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/eir/EirFlags.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/AttributeChangeReason.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/AttributeValueType.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/BgApiResponse.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/BluetoothAddressType.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/ConnectionStatusFlag.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/GapConnectableMode.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/GapDiscoverMode.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/GapDiscoverableMode.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/ScanResponseType.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/enumeration/SmpIoCapabilities.java
bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/factory/BlueGigaHandlerFactory.java

index 3b070099eb94a2d54ceeed0283370a74db46698c..e520daf1be697f3cca600633ed55ab93291ee2be 100644 (file)
@@ -14,6 +14,7 @@ package org.openhab.binding.bluetooth.bluegiga;
 
 import java.util.UUID;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.bluetooth.BluetoothCharacteristic;
 
 /**
@@ -25,6 +26,7 @@ import org.openhab.binding.bluetooth.BluetoothCharacteristic;
  * @author Connor Petty - Initial contribution
  *
  */
+@NonNullByDefault
 public class BlueGigaBluetoothCharacteristic extends BluetoothCharacteristic {
 
     private boolean notifying;
index 23cac2753e08cf189023d3d693d3242671157deb..7938f3802ce6e8dd7e3600700310de75c9ac7cee 100644 (file)
@@ -32,7 +32,6 @@ import org.openhab.binding.bluetooth.BluetoothAddress;
 import org.openhab.binding.bluetooth.BluetoothBindingConstants;
 import org.openhab.binding.bluetooth.BluetoothCharacteristic;
 import org.openhab.binding.bluetooth.BluetoothDescriptor;
-import org.openhab.binding.bluetooth.BluetoothDevice;
 import org.openhab.binding.bluetooth.BluetoothException;
 import org.openhab.binding.bluetooth.BluetoothService;
 import org.openhab.binding.bluetooth.BluetoothUtils;
@@ -65,7 +64,7 @@ import org.slf4j.LoggerFactory;
  */
 @NonNullByDefault
 public class BlueGigaBluetoothDevice extends BaseBluetoothDevice implements BlueGigaEventListener {
-    private final long TIMEOUT_SEC = 60;
+    private static final long TIMEOUT_SEC = 60;
 
     private final Logger logger = LoggerFactory.getLogger(BlueGigaBluetoothDevice.class);
 
@@ -548,13 +547,17 @@ public class BlueGigaBluetoothDevice extends BaseBluetoothDevice implements Blue
             characteristic.setService(service);
             handleToCharacteristic.put(handle, characteristic);
         } else {
+            @Nullable
             Integer chrHandle = handleToCharacteristic.floorKey(handle);
             if (chrHandle == null) {
                 logger.debug("BlueGiga: Unable to find characteristic for handle {}", handle);
                 return;
             }
+            @Nullable
             BlueGigaBluetoothCharacteristic characteristic = handleToCharacteristic.get(chrHandle);
-            characteristic.addDescriptor(new BluetoothDescriptor(characteristic, attUUID, handle));
+            if (characteristic != null) {
+                characteristic.addDescriptor(new BluetoothDescriptor(characteristic, attUUID, handle));
+            }
         }
     }
 
@@ -749,9 +752,11 @@ public class BlueGigaBluetoothDevice extends BaseBluetoothDevice implements Blue
         } else {
             // it must be one of the descriptors we need to update
             UUID attUUID = handleToUUID.get(handle);
-            BluetoothDescriptor descriptor = characteristic.getDescriptor(attUUID);
-            notifyListeners(BluetoothEventType.DESCRIPTOR_UPDATED, descriptor,
-                    BluetoothUtils.toByteArray(event.getValue()));
+            if (attUUID != null) {
+                BluetoothDescriptor descriptor = characteristic.getDescriptor(attUUID);
+                notifyListeners(BluetoothEventType.DESCRIPTOR_UPDATED, descriptor,
+                        BluetoothUtils.toByteArray(event.getValue()));
+            }
         }
     }
 
index 3170d6357dcdbc52991ee55974f7be94396a1464..8443d9d2a9d597ba549cd0e60c2673a95e1debfa 100644 (file)
@@ -118,8 +118,8 @@ public class BlueGigaBridgeHandler extends AbstractBluetoothBridgeHandler<BlueGi
 
     private final Logger logger = LoggerFactory.getLogger(BlueGigaBridgeHandler.class);
 
-    private final int COMMAND_TIMEOUT_MS = 5000;
-    private final int INITIALIZATION_INTERVAL_SEC = 60;
+    private static final int COMMAND_TIMEOUT_MS = 5000;
+    private static final int INITIALIZATION_INTERVAL_SEC = 60;
 
     private final SerialPortManager serialPortManager;
 
@@ -314,9 +314,11 @@ public class BlueGigaBridgeHandler extends AbstractBluetoothBridgeHandler<BlueGi
 
     @Override
     public void dispose() {
-        if (initTask != null) {
-            initTask.cancel(true);
-            initTask = null;
+        @Nullable
+        ScheduledFuture<?> task = initTask;
+        if (task != null) {
+            task.cancel(true);
+            task = null;
         }
         stop();
         super.dispose();
@@ -355,8 +357,10 @@ public class BlueGigaBridgeHandler extends AbstractBluetoothBridgeHandler<BlueGi
     }
 
     private void cancelScheduledPassiveScan() {
-        if (passiveScanIdleTimer != null) {
-            passiveScanIdleTimer.cancel(true);
+        @Nullable
+        Future<?> scanTimer = passiveScanIdleTimer;
+        if (scanTimer != null) {
+            scanTimer.cancel(true);
         }
     }
 
@@ -367,13 +371,17 @@ public class BlueGigaBridgeHandler extends AbstractBluetoothBridgeHandler<BlueGi
 
     private void stopScheduledTasks() {
         cancelScheduledPassiveScan();
-        if (removeInactiveDevicesTask != null) {
-            removeInactiveDevicesTask.cancel(true);
-            removeInactiveDevicesTask = null;
+        @Nullable
+        ScheduledFuture<?> removeTask = removeInactiveDevicesTask;
+        if (removeTask != null) {
+            removeTask.cancel(true);
+            removeTask = null;
         }
-        if (discoveryTask != null) {
-            discoveryTask.cancel(true);
-            discoveryTask = null;
+        @Nullable
+        ScheduledFuture<?> discoverTask = discoveryTask;
+        if (discoverTask != null) {
+            discoverTask.cancel(true);
+            discoverTask = null;
         }
     }
 
index e7b97ac5cf17f6d4f2d4c527bb33a3cf1c3800d9..23952c36e277dd21261602b926239704bbcd219e 100644 (file)
@@ -103,89 +103,88 @@ class BlueGigaResponsePackets {
 
     private static Logger logger = LoggerFactory.getLogger(BlueGigaResponsePackets.class);
 
-    private static final Map<Integer, Class<?>> packetMap = new HashMap<>();
+    private static final Map<Integer, Class<?>> PACKETMAP = new HashMap<>();
 
     static {
-        packetMap.put(Objects.hash(0x00, 0x06, true), BlueGigaProtocolErrorEvent.class);
-        packetMap.put(Objects.hash(0x00, 0x02, true), BlueGigaEndpointWatermarkRxEvent.class);
-        packetMap.put(Objects.hash(0x00, 0x03, true), BlueGigaEndpointWatermarkTxEvent.class);
-        packetMap.put(Objects.hash(0x00, 0x05, true), BlueGigaNoLicenseKeyEvent.class);
-        packetMap.put(Objects.hash(0x04, 0x05, false), BlueGigaAttributeWriteResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x0A, false), BlueGigaExecuteWriteResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x00, false), BlueGigaFindByTypeValueResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x03, false), BlueGigaFindInformationResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x07, false), BlueGigaIndicateConfirmResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x09, false), BlueGigaPrepareWriteResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x01, false), BlueGigaReadByGroupTypeResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x04, false), BlueGigaReadByHandleResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x02, false), BlueGigaReadByTypeResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x08, false), BlueGigaReadLongResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x0B, false), BlueGigaReadMultipleResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x06, false), BlueGigaWriteCommandResponse.class);
-        packetMap.put(Objects.hash(0x04, 0x01, true), BlueGigaProcedureCompletedEvent.class);
-        packetMap.put(Objects.hash(0x04, 0x05, true), BlueGigaAttributeValueEvent.class);
-        packetMap.put(Objects.hash(0x04, 0x04, true), BlueGigaFindInformationFoundEvent.class);
-        packetMap.put(Objects.hash(0x04, 0x02, true), BlueGigaGroupFoundEvent.class);
-        packetMap.put(Objects.hash(0x04, 0x00, true), BlueGigaIndicatedEvent.class);
-        packetMap.put(Objects.hash(0x04, 0x00, true), BlueGigaReadMultipleResponseEvent.class);
-        packetMap.put(Objects.hash(0x02, 0x01, false), BlueGigaReadResponse.class);
-        packetMap.put(Objects.hash(0x02, 0x02, false), BlueGigaReadTypeResponse.class);
-        packetMap.put(Objects.hash(0x02, 0x02, false), BlueGigaSendAttributesResponse.class);
-        packetMap.put(Objects.hash(0x02, 0x03, false), BlueGigaUserReadResponseResponse.class);
-        packetMap.put(Objects.hash(0x02, 0x04, false), BlueGigaUserWriteResponseResponse.class);
-        packetMap.put(Objects.hash(0x02, 0x00, false), BlueGigaWriteResponse.class);
-        packetMap.put(Objects.hash(0x02, 0x02, true), BlueGigaAttributeStatusEvent.class);
-        packetMap.put(Objects.hash(0x02, 0x01, true), BlueGigaUserReadRequestEvent.class);
-        packetMap.put(Objects.hash(0x02, 0x00, true), BlueGigaValueEvent.class);
-        packetMap.put(Objects.hash(0x03, 0x04, false), BlueGigaChannelMapGetResponse.class);
-        packetMap.put(Objects.hash(0x03, 0x00, false), BlueGigaDisconnectResponse.class);
-        packetMap.put(Objects.hash(0x03, 0x01, false), BlueGigaGetRssiResponse.class);
-        packetMap.put(Objects.hash(0x03, 0x07, false), BlueGigaGetStatusResponse.class);
-        packetMap.put(Objects.hash(0x03, 0x02, false), BlueGigaUpdateResponse.class);
-        packetMap.put(Objects.hash(0x03, 0x04, true), BlueGigaDisconnectedEvent.class);
-        packetMap.put(Objects.hash(0x03, 0x02, true), BlueGigaFeatureIndEvent.class);
-        packetMap.put(Objects.hash(0x03, 0x00, true), BlueGigaConnectionStatusEvent.class);
-        packetMap.put(Objects.hash(0x03, 0x01, true), BlueGigaVersionIndEvent.class);
-        packetMap.put(Objects.hash(0x06, 0x07, false), BlueGigaSetScanParametersResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x03, false), BlueGigaConnectDirectResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x05, false), BlueGigaConnectSelectiveResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x02, false), BlueGigaDiscoverResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x08, false), BlueGigaSetAdvParametersResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x09, false), BlueGigaSetAdvDataResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x04, false), BlueGigaEndProcedureResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x01, false), BlueGigaSetModeResponse.class);
-        packetMap.put(Objects.hash(0x06, 0x00, true), BlueGigaScanResponseEvent.class);
-        packetMap.put(Objects.hash(0x05, 0x02, false), BlueGigaDeleteBondingResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x00, false), BlueGigaEncryptStartResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x05, false), BlueGigaGetBondsResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x04, false), BlueGigaPassKeyResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x01, false), BlueGigaSetBondableModeResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x03, false), BlueGigaSetParametersResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x07, false), BlueGigaWhitelistBondsResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x0A, false), BlueGigaWhitelistAppendResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x0B, false), BlueGigaWhitelistRemoveResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x0C, false), BlueGigaWhitelistClearResponse.class);
-        packetMap.put(Objects.hash(0x05, 0x01, true), BlueGigaBondingFailEvent.class);
-        packetMap.put(Objects.hash(0x05, 0x04, true), BlueGigaBondStatusEvent.class);
-        packetMap.put(Objects.hash(0x05, 0x02, true), BlueGigaPasskeyDisplayEvent.class);
-        packetMap.put(Objects.hash(0x05, 0x03, true), BlueGigaPasskeyRequestEvent.class);
-        packetMap.put(Objects.hash(0x00, 0x02, false), BlueGigaAddressGetResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x01, false), BlueGigaHelloResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x00, false), BlueGigaResetResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x06, false), BlueGigaGetConnectionsResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x05, false), BlueGigaGetCountersResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x08, false), BlueGigaGetInfoResponse.class);
-        packetMap.put(Objects.hash(0x00, 0x00, true), BlueGigaBootEvent.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x06, true), BlueGigaProtocolErrorEvent.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x02, true), BlueGigaEndpointWatermarkRxEvent.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x03, true), BlueGigaEndpointWatermarkTxEvent.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x05, true), BlueGigaNoLicenseKeyEvent.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x05, false), BlueGigaAttributeWriteResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x0A, false), BlueGigaExecuteWriteResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x00, false), BlueGigaFindByTypeValueResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x03, false), BlueGigaFindInformationResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x07, false), BlueGigaIndicateConfirmResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x09, false), BlueGigaPrepareWriteResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x01, false), BlueGigaReadByGroupTypeResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x04, false), BlueGigaReadByHandleResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x02, false), BlueGigaReadByTypeResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x08, false), BlueGigaReadLongResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x0B, false), BlueGigaReadMultipleResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x06, false), BlueGigaWriteCommandResponse.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x01, true), BlueGigaProcedureCompletedEvent.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x05, true), BlueGigaAttributeValueEvent.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x04, true), BlueGigaFindInformationFoundEvent.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x02, true), BlueGigaGroupFoundEvent.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x00, true), BlueGigaIndicatedEvent.class);
+        PACKETMAP.put(Objects.hash(0x04, 0x00, true), BlueGigaReadMultipleResponseEvent.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x01, false), BlueGigaReadResponse.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x02, false), BlueGigaReadTypeResponse.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x02, false), BlueGigaSendAttributesResponse.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x03, false), BlueGigaUserReadResponseResponse.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x04, false), BlueGigaUserWriteResponseResponse.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x00, false), BlueGigaWriteResponse.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x02, true), BlueGigaAttributeStatusEvent.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x01, true), BlueGigaUserReadRequestEvent.class);
+        PACKETMAP.put(Objects.hash(0x02, 0x00, true), BlueGigaValueEvent.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x04, false), BlueGigaChannelMapGetResponse.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x00, false), BlueGigaDisconnectResponse.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x01, false), BlueGigaGetRssiResponse.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x07, false), BlueGigaGetStatusResponse.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x02, false), BlueGigaUpdateResponse.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x04, true), BlueGigaDisconnectedEvent.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x02, true), BlueGigaFeatureIndEvent.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x00, true), BlueGigaConnectionStatusEvent.class);
+        PACKETMAP.put(Objects.hash(0x03, 0x01, true), BlueGigaVersionIndEvent.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x07, false), BlueGigaSetScanParametersResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x03, false), BlueGigaConnectDirectResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x05, false), BlueGigaConnectSelectiveResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x02, false), BlueGigaDiscoverResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x08, false), BlueGigaSetAdvParametersResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x09, false), BlueGigaSetAdvDataResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x04, false), BlueGigaEndProcedureResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x01, false), BlueGigaSetModeResponse.class);
+        PACKETMAP.put(Objects.hash(0x06, 0x00, true), BlueGigaScanResponseEvent.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x02, false), BlueGigaDeleteBondingResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x00, false), BlueGigaEncryptStartResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x05, false), BlueGigaGetBondsResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x04, false), BlueGigaPassKeyResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x01, false), BlueGigaSetBondableModeResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x03, false), BlueGigaSetParametersResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x07, false), BlueGigaWhitelistBondsResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x0A, false), BlueGigaWhitelistAppendResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x0B, false), BlueGigaWhitelistRemoveResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x0C, false), BlueGigaWhitelistClearResponse.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x01, true), BlueGigaBondingFailEvent.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x04, true), BlueGigaBondStatusEvent.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x02, true), BlueGigaPasskeyDisplayEvent.class);
+        PACKETMAP.put(Objects.hash(0x05, 0x03, true), BlueGigaPasskeyRequestEvent.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x02, false), BlueGigaAddressGetResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x01, false), BlueGigaHelloResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x00, false), BlueGigaResetResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x06, false), BlueGigaGetConnectionsResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x05, false), BlueGigaGetCountersResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x08, false), BlueGigaGetInfoResponse.class);
+        PACKETMAP.put(Objects.hash(0x00, 0x00, true), BlueGigaBootEvent.class);
     }
 
-    @SuppressWarnings({ "null", "unused" })
     @Nullable
     public static BlueGigaResponse getPacket(int[] data) {
         int cmdClass = data[2];
         int cmdMethod = data[3];
         boolean isEvent = (data[0] & 0x80) != 0;
 
-        Class<?> bleClass = packetMap.get(Objects.hash(cmdClass, cmdMethod, isEvent));
+        Class<?> bleClass = PACKETMAP.get(Objects.hash(cmdClass, cmdMethod, isEvent));
 
         if (bleClass == null) {
             return null;
index 60d4404731c3730a6e04cf5db99f605c059e3782..ef4204d0c3e49b6a5dbb9ef4a5237e4f059a9be1 100644 (file)
@@ -105,9 +105,11 @@ public class BlueGigaTransactionManager implements BlueGigaSerialEventListener {
     }
 
     private void cancelTransactionTimer() {
-        if (transactionTimeoutTimer != null) {
-            transactionTimeoutTimer.cancel(true);
-            transactionTimeoutTimer = null;
+        @Nullable
+        Future<?> transTimer = transactionTimeoutTimer;
+        if (transTimer != null) {
+            transTimer.cancel(true);
+            transTimer = null;
         }
     }
 
@@ -121,17 +123,12 @@ public class BlueGigaTransactionManager implements BlueGigaSerialEventListener {
         });
     }
 
-    @SuppressWarnings({ "null", "unused" })
     private Optional<BlueGigaUniqueCommand> getNextFrame() {
         while (!sendQueue.isEmpty()) {
+            @Nullable
             BlueGigaUniqueCommand frame = sendQueue.poll();
             if (frame != null) {
-                if (frame.getMessage() != null) {
-                    return Optional.of(frame);
-                } else {
-                    logger.debug("Null message found from queue, skip it");
-                    continue;
-                }
+                return Optional.of(frame);
             } else {
                 logger.debug("Null frame found from queue, skip it");
                 continue;
index a4e3a8325dd273637be4707c4a6a82c980e5228c..48c5f3ecb05290d8e4706bfc3961906392037890 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.AttributeValu
  */
 @NonNullByDefault
 public class BlueGigaAttributeValueEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * Attribute handle
index 8b64130e68ee7ed429d97b38bdba11cc7edc3c2e..ca28046868c792a51f318891ee1b8d370f700285 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaAttributeWriteCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x05;
 
     private BlueGigaAttributeWriteCommand(CommandBuilder builder) {
         super.setConnection(builder.connection);
index ad5142bfbb78105ae9ba9bc82543a51e268e3c5f..7c5cf181a044476e063b4b56e759e7e0ede860f8 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaAttributeWriteResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * 0 : write was successful. Otherwise error occurred
index ddd00a02c0b8a5410506271017d69f472b1364fb..ee37dfd837ff08f51a47a289bc125c4362da18b3 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaExecuteWriteCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x0A;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x0A;
 
     /**
      * 1: commits queued writes, 0: cancels queued writes
index 11bfad718a04ace40cdb91528c224b1cddbeb5ca..70f1d1a3f4c02c974737b0c3181787dde04bc6f8 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaExecuteWriteResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x0A;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x0A;
 
     /**
      * 0 : write was successful. Otherwise error occurred
index 613b098bf82694463b71b0b7c4446a367d70fc49..51d80da45df4e5c3775c572dc65b39c936d4807b 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaFindByTypeValueCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * First requested handle number
index b16889c6412ef6f2082e61a5b9365b07e3d28f1a..2181e86bb7d6cba15a618d5c02ce5eed84b677cd 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaFindByTypeValueResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * 0 : the operation was successful. Otherwise error occurred
index c8a90b72c82c7970c8da14e6f420c2a6670918b8..c43cf21a2c35f02f3fd559f7ef89adec8245a244 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaFindInformationCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x03;
 
     private BlueGigaFindInformationCommand(CommandBuilder builder) {
         super.setConnection(builder.connection);
index bbe2b5f4494583b07a8e052205001852e305f533..872e885608be8c012f6d65895b367489389a9bf3 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaFindInformationFoundEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Characteristics handle
index 3c46831ca17681dbd3dd4dfd2cb6be975a8ef9ef..c83ad8866c0addf25f6d95d85685182345f1f094 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaFindInformationResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * 0 : the operation was successful. Otherwise error occurred
index 6f4c4d289018aafd0051b997d074b9285d4b4061..7421043ecec957659bf7aae75cc8ca5eea0799e3 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaGroupFoundEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Starting handle
index e2ea46178acf3212cc16218ecc584f8e61a9c2df..36f3328cff537ceaf2f624c68e539b8258b67922 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaIndicateConfirmCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x07;
 
     @Override
     public int[] serialize() {
index 851cf441d61e2b5a532fe2b669616f1de295c186..5fdd3f8ff513828ff376898bc242110d0151b33c 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaIndicateConfirmResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x07;
 
     /**
      * Command result.
index 12d5e8fe8d9d0d901994a5b0980d004d3cdee7f0..1d28ff40d958f4f66fe8db37d96e2aee842d3abd 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaIndicatedEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Attribute handle
index 6d8e2fb3a5733935499325e0f326d66753d7cfed..2637085056c14c92ae2af525c6e050220ec55007 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaPrepareWriteCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x09;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x09;
 
     /**
      * Attribute handle
index 38bf919e5fd033d61db27767af7c51f4c46f3f3a..d5a4957bfaf03be5dfe5a10bd77c9e7a199301be 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaPrepareWriteResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x09;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x09;
 
     /**
      * Command result.
index fe543aa58d76d82587f10b6476dd8a8be74e91cd..e4f3816299f33f5cec3a6c21649f774af457409a 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaProcedureCompletedEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * 0: The operation was successful. Otherwise: attribute protocol error code returned by
index 6d8a3e17e8e90635948fba073aff596616f74704..4274e2e9c1b052231e48d0125a03d83805912909 100644 (file)
@@ -34,8 +34,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadByGroupTypeCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x01;
 
     private BlueGigaReadByGroupTypeCommand(CommandBuilder builder) {
         super.setConnection(builder.connection);
index 33651b03eb1c85c8a96df514aae549d4f47f4831..ba5129b8c2cc766adcb4e206ed47ab163a7defbf 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadByGroupTypeResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Command result.
index 9bdd4a98978002819a01e84f13c60ac4a2ce0852..7076955062d30ddcc34af784743325f29b7e04ce 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadByHandleCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x04;
 
     private BlueGigaReadByHandleCommand(CommandBuilder builder) {
         super.setConnection(builder.connection);
index abf207725fbe60a4f2927bf26f11856e697c26d3..4a69961a6a29ca7a23370b53873dfa2d52f1b6ef 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadByHandleResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * 0 : the command was successful. Otherwise an error occurred
index e2875c9fb4d1d4e7bdf49f888d5c7f8c396c9b60..a77ace5ae413edbe8cf4fe7fa917183cae130206 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadByTypeCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * First attribute handle
index 1dd8da833ca0b675bb5650d4054ce7a1c6834031..593f6541a85d3048293b6be9c96afb9965be6132 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadByTypeResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * 0 : the command was successful. Otherwise an error occurred
index 5e17a7fdb820f269288c39425a8af810d748a293..e919f9857f3828c2f1703c5b34ff63777a9ac839 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadLongCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x08;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x08;
 
     /**
      * Attribute handle
index f37f3715f1cfeb698d510354acad29c8409be96c..c94fbb4371c8af6767a7707eedcdc902ee3d3c9e 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadLongResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x08;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x08;
 
     /**
      * 0 : the command was successful. Otherwise an error occurred
index 7967323086cf8cc560fe10aabbc9fd74f019999b..fc39436cd926274eb1e670d9b770bec2e618b753 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadMultipleCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x0B;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x0B;
 
     /**
      * List of attribute handles to read from the remote device
index 8e23a07846de46d2c3cbf1f18eece2bcd997bb40..fb2d9cea6d09d915dc104108fb6a1f2f1077c77d 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadMultipleResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x0B;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x0B;
 
     /**
      * 0 : the command was successful. Otherwise an error occurred
index 78d782eb41589915d559f45d3bc39a5e78131cca..b8404e8ea8dec892b7bf3d0ef71d586b2c5b29c6 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaReadMultipleResponseEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * This array contains the concatenated data from the multiple attributes that have been read,
index 96f334196ecef6582920ae8dee721557c359cd32..4f545b5f7665b0147ba1d9509c99cf774cd06463 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaWriteCommandCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x06;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x06;
 
     /**
      * Attribute handle to write
index 4375834b60ab83aa3a26562ad112736d1290011d..58e1d65242575ae33555a943f8a21271f2d520ee 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaWriteCommandResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x04;
-    public static int COMMAND_METHOD = 0x06;
+    public static final int COMMAND_CLASS = 0x04;
+    public static final int COMMAND_METHOD = 0x06;
 
     /**
      * 0 : the command was successful. Otherwise an error occurred
index 7aee2dc087293213efd3fc77da773fead017ed74..5b2d1c2cd8ddacd9b811f5ccd284337cbeca2d7b 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaAttributeStatusEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Attribute handle
index 68b7d09a3c9c44e00fd1a6c70c9f220f9672fb37..996f56e0428ff18a8eeec69220f8110ee7718ee3 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Handle of the attribute to read
index 8d019e502b8f4852df44f68c693cbc495d88693c..d54c7713048b6e56af2077d4670e27c574b4d235 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Handle of the attribute which was read
index 8d1d38091671da8d5ce946060e15d8a269c89a08..c60a06167f04d239b471b37e3436690b8ead7522 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaReadTypeCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Handle of the attribute to read
index 35238f5134cfb722e7f55fcbe712603e1369a8e8..abf10bc9af7666f55a68a7e7b7fb7d9350c1b904 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaReadTypeResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Handle of the attribute which was read
index 552d5b9788cdb6a2274445b6a98fca90d10fe19c..72a7ecbc4933772cd30886dacd47b7651d6fd810 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaSendAttributesCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Attribute handle to send.
index df66810052f7fa897a566277ee389e4966a5fd14..f4d0f19b385e2f812d2475f50c9534284f1a783d 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaSendAttributesResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * 0 : the command was successful. Otherwise an error occurred
index 2476960a3e45e51e17ca96f7d7b4ddaf752dda93..0895283da429caafd1591c10f9a68fad1a0f62ed 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaUserReadRequestEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Attribute handle requested
index 88236e75fbaa5e18c1ead08ca59034a6d8dd9cdc..da58a47d8eb0290e019e216ee3639a2a7bbad7ac 100644 (file)
@@ -35,8 +35,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaUserReadResponseCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * 0: User Read Request is responded with data. In case of an error an application specific error
index 917dd407b7391de9ddd8566af67508e6135d581a..34c4c294c86e9a60d5a418c3c3abf83c08409e48 100644 (file)
@@ -35,8 +35,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaUserReadResponseResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * Response constructor
index 45ff9777ca36d17fc5c9f42bafa02a4549fc57bd..5d7f9853063d7e83a09778582615fcbfc14749cb 100644 (file)
@@ -34,8 +34,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaUserWriteResponseCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * 0: User Read Request is responded with data. In case of an error an application specific error
index 1f4831e77420d86846a35eb90fc84a8daa4a18b5..8a2d5b7478a1ef0910355a35a4d7157fb08b6ace 100644 (file)
@@ -34,8 +34,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaUserWriteResponseResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Response constructor
index fd4282ded0afe79e40c8acfc979ace08235339f0..936497d132b343e1146a5811a36cb932fb5a6678 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.AttributeChan
  */
 @NonNullByDefault
 public class BlueGigaValueEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Reason why value has changed see: enum Attribute Change Reason
index 144785da0264624d47b983a4e98b5135e327ef09..62f79c38fb8f86a58d30a5423669d7da57090149 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaWriteCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Handle of the attribute to write.
index 7e4caf6d161a72c921d0ba1dbe80972c13129af3..7ec5bbbe934b78751d1326368dc1c6d0b8e76f64 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaWriteResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x02;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x02;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * 0: the write was successful. Non-zero: An error occurred
index 6ae89f7998cb426e96bfa6df31073a859d2fcfe1..3d45f48ea067ff0694222342c2697df3abe65cf1 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaChannelMapGetCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x04;
 
     @Override
     public int[] serialize() {
index a430d4cacd75e672d36a66102d86ab7274d69ac3..d053ebe5bf6fd750f7dadbff579de4e4bd77fcd1 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaChannelMapGetResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Current Channel Map. Each bit corresponds to one channel. 0-bit corresponds to 0 channel.
index f5d85267f5197ba1b57a0b394088cd9c409c26dd..c4dbeab43e6f614435c87bbce52834da6cc82803 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.ConnectionSta
  */
 @NonNullByDefault
 public class BlueGigaConnectionStatusEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Connection status flags use connstatus-enumerator
index 37e53bd3b9878b1092947c7e954968f07311e804..8a6962803e13cc32ef4d0aff8a6ba7b15a9aa5d7 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaDisconnectCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x00;
 
     private BlueGigaDisconnectCommand(CommandBuilder builder) {
         super.setConnection(builder.connection);
index bea5e3cf499b44848f3c68dd39124d1e5ca1dae6..32df7658d4ebcc8303060d33234f77f82d389e5b 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaDisconnectResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * 0 : the update was successful. Non-zero: An error occurred.
index 76f6043e70559b4ae1a45f3bb4586c69e702842b..3c27cbad90df59566183be9217106b8c2b29373e 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaDisconnectedEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Disconnection reason code. 0 : disconnected by local user
index 077465ea34f82a572d4539587968354b35af9f40..dd64cb03e707215b02c5971aee54f7fa79a5d78e 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaFeatureIndEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * CtrData field from LL_FEATURE_RSP - packet
index 9894e0676c5d9ccd82ee6cdb40570f15eaa90a0b..febac4ca3eaeae410a4916b719d104cdae3ab505 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaGetRssiCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x01;
 
     @Override
     public int[] serialize() {
index 3afe3bd22506482d88a9be7ab5469dfbc5f0bcc7..faacde2bda8a175ad6ef76d9aa335beb36d79150 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaGetRssiResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * RSSI value of the connection in dBm. Range: -103 to -38
index cf7ba1b8e0630b18cca68be6b25d276783737bf8..73c38f9e7a5f0f55eed301bd3d1e22e4fa925739 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaGetStatusCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x07;
 
     @Override
     public int[] serialize() {
index 15124aa77d30970bde033f1cf88381e0c2b84844..0f8b655771e8a189e254e1ac2c7b9d17db4f24b5 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaGetStatusResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x07;
 
     /**
      * Response constructor
index 7402e1ad88d4ca364b2dde27a0e951eb29229c10..94e5531436dc1dd39ad52470a7e30949085bcff4 100644 (file)
@@ -34,8 +34,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceCommand;
  */
 @NonNullByDefault
 public class BlueGigaUpdateCommand extends BlueGigaDeviceCommand {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Minimum connection interval (units of 1.25ms)
index d94c0aea3026e0468dafd678f898537acd206160..1c5f1523a93dc892587bb6c695c7d446c16a23fe 100644 (file)
@@ -35,8 +35,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaUpdateResponse extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * 0 : the update was successful. Non-zero: An error occurred.
index 1753defb070a6c99070bfaa73d32031236ce3686..b001c957146301c958750eeafa2b68442d3d4b94 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaDeviceResponse;
  */
 @NonNullByDefault
 public class BlueGigaVersionIndEvent extends BlueGigaDeviceResponse {
-    public static int COMMAND_CLASS = 0x03;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x03;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Bluetooth controller specification version
index f66e31eb05549c3652f71db89563ba84d7121a13..eb0d2033eb7e2a29b5e49ff1936ceb364d9dcae0 100644 (file)
@@ -40,8 +40,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BluetoothAddr
  */
 @NonNullByDefault
 public class BlueGigaConnectDirectCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x03;
 
     private BlueGigaConnectDirectCommand(CommandBuilder builder) {
         this.address = builder.address;
index 7e7106995fd3eedf8ffde6ae334a502da172d5dc..bea53adb04d3d0e22bfb130fd8736749a21c9536 100644 (file)
@@ -39,8 +39,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaConnectDirectResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * 0 : procedure was successfully started Non-zero: An error occurred
index 700d78ea59c9c81590c350e479715a40b36b2a5c..d6369ca874cc0ca420c4e562039acaba43bad80d 100644 (file)
@@ -35,8 +35,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaConnectSelectiveCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * Minimum Connection Interval (in units of 1.25ms). Range: 6 - 3200 The lowest possible
index 0dc3e8802c97b7cb60569f0c66ecd02d614948cf..ec49b9da0c03c3d2d1172a724f0bc8ab36b46723 100644 (file)
@@ -36,8 +36,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaConnectSelectiveResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * 0 : procedure was successfully started Non-zero: An error occurred
index 0c11ea0a69b24d6c7b6a579de1df0ec248d74c75..884690ba6d4c14560688288229d5ff752201b74a 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.GapDiscoverMo
  */
 @NonNullByDefault
 public class BlueGigaDiscoverCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x02;
 
     private BlueGigaDiscoverCommand(CommandBuilder builder) {
         this.mode = builder.mode;
index afcc3f4e9ea99860360e2e8b7a748043d72d558c..8f67be8b2b2520751f9949e5cf8229782d2bd1b3 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaDiscoverResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * 0: Scan procedure was successfully started Non-zero: An error occurred.
index d96dcdf42912a5491e813f25231b02a0b2d93d36..53e4f200dddd662354f951e5ac096e092a7b19f4 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaEndProcedureCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x04;
 
     @Override
     public int[] serialize() {
index e65b835f12f4283f26c88c1fc6b46608dc15125b..d69d5136c91036813305b384a9eed9bd29a63279 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaEndProcedureResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * 0: the command was successful. Non-zero: An error occurred
index 0d39203a9e73251eaf351e689b3eab6122213cb5..c96ebfbe1abac509c2b488551d43da7ab65f0afc 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.ScanResponseT
  */
 @NonNullByDefault
 public class BlueGigaScanResponseEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * RSSI value (dBm). Range: -103 to -38
index 4ec575341553d9028baf899e4e3a0526e4f06cc5..65b36d75a16e3c4d89111b4146674abe11fe0051 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaSetAdvDataCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x09;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x09;
 
     /**
      * Advertisement data type. 0 : sets advertisement data. 1 : sets scan response data
index 3ce6c1c71d8eab7e80ccfea832f39043233819c4..b710151170bb37fb35fec893ff2b4fa240b2070d 100644 (file)
@@ -34,8 +34,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaSetAdvDataResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x09;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x09;
 
     /**
      * 0: Command was successfully executed. Non-zero: An error occurred
index f8fcf057a0247a13ae49faab617b733bf6145e49..fcb1f2689162dda3511fec4c7485c96e1057bd53 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaSetAdvParametersCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x08;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x08;
 
     /**
      * Minimum advertisement interval in units of 625us. Range: 0x20 to 0x4000. Default: 0x200
index 29c7fa563db52af4fcc9fe05ef666095dac96381..cfa2ed64e1dba356fd8e0c4ff869b12bdc146691 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaSetAdvParametersResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x08;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x08;
 
     /**
      * 0: Command was successfully executed. Non-zero: An error occurred
index 5c2e2a2b98c9be0d6b621e870dcd04de12c0b71c..028792b9c619edb5b3cb5087d0f546715d1dfeca 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.GapDiscoverab
  */
 @NonNullByDefault
 public class BlueGigaSetModeCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x01;
 
     private BlueGigaSetModeCommand(CommandBuilder builder) {
         this.discover = builder.discover;
index ee3a6012e26acf5bac6074ebb45d973eac9a271d..15cf560c0bd4621773fa51d339731d029909c313 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaSetModeResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * 0: the command was successful. Non-zero: An error occurred
index 0c0a5f29470cba23164055b03f4e82759a3e883a..185826d953d3518f1378391ec1543aad7d67f89b 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaSetScanParametersCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x07;
 
     private BlueGigaSetScanParametersCommand(CommandBuilder builder) {
         this.scanInterval = builder.scanInterval;
index b4d3b51dedb9ac0893e7d18b178a73a032693529..f024d8b315adf608e139cb201e26bd42f924aa3d 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaSetScanParametersResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x06;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x06;
+    public static final int COMMAND_METHOD = 0x07;
 
     /**
      * 0: The command was executed successfully. Non-zero: An error occurred
index b8b7e65a880d0c2e0ae70e97d2d49177601cd4fd..af3d1c1385ada8063732a20845f121b13589ae85 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaBondStatusEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Bonding handle
index 976492bb19738f3cdda7b869193b698c1e0e90ea..d98301768fd015fbced263b44af9c747cedf380a 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaBondingFailEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Connection handle
index 37dc947ca7e01740c415b88f68021d2546e754b2..15ddd358ba63c7455acd34bae417cf81cbbb18cf 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaDeleteBondingCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Bonding handle of a device. This handle can be obtained for example from events like: Scan
index cdce545e5e818f189047ff2fafe7854ab9c6298b..a4f410c1b86d4a8d54ecae26cc5a5d6a8e33ae99 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaDeleteBondingResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * 0: the command was successful. Non-zero: An error occurred
index 18b09d60917b579523b1c1b8b595eb3cbad9e9ad..ed60b6a0d54b601894d375913c8bfaee4244cb55 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaEncryptStartCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Bonding handle of a device. This handle can be obtained for example from events like: Scan
index ab91d33a8a04cff43d216b0fda7b799323b900a2..dac701d77ef7953a905028178321befb18ef37b7 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaEncryptStartResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Connection handle
index be36b9440637a7ce15cde0e7c6b867c06ef9e11f..2eaf7a54998d7ece1bc49ec94f349501ba0a86da 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaGetBondsCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x05;
 
     @Override
     public int[] serialize() {
index 6943941e37b7b82ded5ada55e5575e6edddcb141..97b2dcb2cddc47a0691bb1202003a138a71bf261 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaGetBondsResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * Num of currently bonded devices
index f7d7f301bfe8d238a9448ce59b9512278d439630..32c7794c41844e5de397c5e7e6a562c6aac7dd13 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaPassKeyCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Connection handle
index e3a29a5dec377a1d1435fe2c877cc781d54cb93d..f6924a776233ef8565d81772ae7abdaf27f1b905 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaPassKeyResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x04;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x04;
 
     /**
      * Command Result
index a47e9511f971a17e08dcd5fb13990f13494c84fc..ec95a5b0a565806450e921dd37c6e2b5a3d921e9 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaPasskeyDisplayEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Bluetooth connection handle
index c98d3600441b362654df67528cdc06b26416a64b..08864d317f9308bbb438c236e03ddcd5194775e5 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaPasskeyRequestEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * Bluetooth connection handle
index 1f5321dbf3a40adbc289d02db72999212bcf6993..37da5b4045d9aa3602c972a190b03e6c24235997 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaSetBondableModeCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Enables or disables bonding mode. 0 : the device is not bondable. 1 : the device is bondable
index e9d970ab6cae53d17790870ea47a0e04ea6a7afe..399ecded2de2c63808b04fb10c5007f4fba5dffc 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaSetBondableModeResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Response constructor
index 25c06d7c4489344f61b17dc090a0f655e4673dd5..8fa299fdf3b4b382f1cd496e37f194eeb93f4bb1 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.SmpIoCapabili
  */
 @NonNullByDefault
 public class BlueGigaSetParametersCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * 1: Man-in-the-middle protection required. 0: No Man-in-the-middle protection. Default:
index f3712770af01a5c8d8cb6a7dd479fc58618bed26..bf7747b6ebb927b78d98b2df4eca0b545639a07a 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaSetParametersResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * Response constructor
index d86259afe42bf23fdce2d21081ab39ca6634056f..ba3abecb3ffd9b49279c1c1973b5e2f9594fc5f2 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaWhitelistBondsCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x07;
 
     @Override
     public int[] serialize() {
index c1c991d24b913dbeebd98901b93dc0a592ec3164..ee79d20d005f976a5486017b742b1d27eda9737d 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaWhitelistBondsResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x05;
-    public static int COMMAND_METHOD = 0x07;
+    public static final int COMMAND_CLASS = 0x05;
+    public static final int COMMAND_METHOD = 0x07;
 
     /**
      * Command result
index 378019aac156c3aa03c667ab7a781beac2d4373b..db7551db27d21161df9d26e76706840de31b23ce 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaAddressGetCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x02;
 
     @Override
     public int[] serialize() {
index dc58330ff6aa9f1be360171972f48f9061a4b18d..338f4373619c27c48b8b8fc89b7066a59c4e20fe 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaAddressGetResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Bluetooth address of the local device
index 5904da36434ab05df1a2805f9d5c96db558b098f..054befd6783c442ed621cd019e0742b2d9680093 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaBootEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Major software version
index e841ca0aa4c8d0cd720be9b4f80dcb3deebf3db7..bd5e37f1625ee8dc19c6dd2e08192595e15b492a 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaEndpointWatermarkRxEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x02;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x02;
 
     /**
      * Endpoint index where data was received
index e18c46dfd026da6c30dbbc3cd749f64cdd8b5e98..c5d8da7d2a473be917cb5d8230aa5aa970f2e116 100644 (file)
@@ -31,8 +31,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaEndpointWatermarkTxEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x03;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x03;
 
     /**
      * Endpoint index where data was sent
index bd89db954fd0e5ecda46441b62f071bb4b77db3b..17e8e1aeb6b9053327332f16cad1d264e23bab09 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaGetConnectionsCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x06;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x06;
 
     @Override
     public int[] serialize() {
index 9d3b298a27fbe665799659e407718a6db72ff1e9..107d921f61f5e940c387771c98184de152567786 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaGetConnectionsResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x06;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x06;
 
     /**
      * Max supported connections
index 17155c026a8581fe2b4178fe6181bc99e574460e..e6376b91fd0fda9d0d737e191a3b9976e5b1d5a6 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaGetCountersCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x05;
 
     @Override
     public int[] serialize() {
index ba65ba8b84948fa5455d60b424f546b155c1feac..5dd1c812faf568b157958af18da313f554d966a6 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaGetCountersResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * Number of transmitted packets
index 6238c9d3d51bb740f90b4bc99be05fe34f2760c0..ed808a18f7595c30ec5f7a3fd11dc85dbd661db4 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaGetInfoCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x08;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x08;
 
     @Override
     public int[] serialize() {
index 4a33fbbbb2d9fd43d61c2d29e93321e3c4508c6e..8cc4b13a6d6af930b5c0939fadfd390ca996b9fa 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaGetInfoResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x08;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x08;
 
     /**
      * Major software version
index 5a9a17b750e3dcd90098793bc359a1b837b16a5d..4be7070039c397ab6b552112ccfe6443123a4c7f 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaHelloCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x01;
 
     @Override
     public int[] serialize() {
index 5af6edcad2c82cfec18e5dc90ede036b22fe0db4..dd426d6aad0a3c9d87cad507296bd86ba8cbaf6c 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaHelloResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x01;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x01;
 
     /**
      * Response constructor
index f5fd23421da441f8fb1697a23bded3a3328bea1e..7929babecb20a83884ccabd536507ef29de0beb2 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaNoLicenseKeyEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x05;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x05;
 
     /**
      * Event constructor
index 5bd9bfc33516341c95c776d60968ebce43750324..837612ced2697a7b48c5df36431c274dafe9d5b6 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaProtocolErrorEvent extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x06;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x06;
 
     /**
      * Reason for failure
index 0969e642a052a65a839f71e21060284da056079a..086af25061c98d2d84707eed51e342221667aac8 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaResetCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Selects the boot mode. 0 : boot to main program. 1 : boot to DFU
index ba37d5b1319518181ce50216e9eb8ac7afcfe9ff..bacd1456f021f49e20f62ab49b41b50f728c99ac 100644 (file)
@@ -28,8 +28,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaResetResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x00;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x00;
 
     /**
      * Response constructor
index b202da1e3c6eaae91fa765dccd0f7ac4a05e4427..749fae29dbe914d223a4c064cdebc6881eff2ca5 100644 (file)
@@ -32,8 +32,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaWhitelistAppendCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x0A;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x0A;
 
     /**
      * Bluetooth device address to add to the running white list. Maximum of 8 can be stored before
index 39ffea698467296183e74cc98dc76f373e205e9f..6f3182142c4f04eac30fbbcb96e1e805a4de947e 100644 (file)
@@ -33,8 +33,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaWhitelistAppendResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x0A;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x0A;
 
     /**
      * Command result
index 412a0c95941e580bc2d3bf1b0dbe00d3614789be..684053619145076646eebec0f630693270767f70 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaWhitelistClearCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x0C;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x0C;
 
     @Override
     public int[] serialize() {
index c0a042f265359ac834bec3773640034cb5c4c7f0..2b742c03ef392523aba5bdbbe0ebc243717dbbd0 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaResponse;
  */
 @NonNullByDefault
 public class BlueGigaWhitelistClearResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x0C;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x0C;
 
     /**
      * Response constructor
index 9575db516721e16376cb8de4a768668144bfb41f..a518f949c63fac5da77a3cc649a0c605201ad6bb 100644 (file)
@@ -29,8 +29,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.BlueGigaCommand;
  */
 @NonNullByDefault
 public class BlueGigaWhitelistRemoveCommand extends BlueGigaCommand {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x0B;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x0B;
 
     /**
      * Bluetooth device address to remove from the running white list.
index bc60d4b884e4b28eb5ae818260d6943282674571..0f00011b49fea5916176ee5e6d0c184809df688b 100644 (file)
@@ -30,8 +30,8 @@ import org.openhab.binding.bluetooth.bluegiga.internal.enumeration.BgApiResponse
  */
 @NonNullByDefault
 public class BlueGigaWhitelistRemoveResponse extends BlueGigaResponse {
-    public static int COMMAND_CLASS = 0x00;
-    public static int COMMAND_METHOD = 0x0B;
+    public static final int COMMAND_CLASS = 0x00;
+    public static final int COMMAND_METHOD = 0x0B;
 
     /**
      * Command result
index a1186c082a34509e68bac300add0f1ff02b69536..bd48eeb4a0d78f552de4c84d63a071edc4c6d62c 100644 (file)
@@ -16,6 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Assigned numbers are used in GAP for inquiry response, EIR data type values, manufacturer-specific data, advertising
@@ -73,7 +74,7 @@ public enum EirDataType {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, EirDataType> codeMapping = new HashMap<>();
+    private static @Nullable Map<Integer, EirDataType> codeMapping;
 
     private int key;
 
@@ -81,26 +82,24 @@ public enum EirDataType {
         this.key = key;
     }
 
-    private static void initMapping() {
-        for (EirDataType s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param bluetoothAddressType
      *            the code to lookup
      * @return enumeration value.
      */
-    @SuppressWarnings({ "null", "unused" })
     public static EirDataType getEirPacketType(int eirDataType) {
-        if (codeMapping.isEmpty()) {
-            initMapping();
+        Map<Integer, EirDataType> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (EirDataType s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.getOrDefault(eirDataType, UNKNOWN);
+        return localCodeMapping.getOrDefault(eirDataType, UNKNOWN);
     }
 
     /**
index 2041989e9dbe5b2c0013c1f3e836bb52b13f9213..4a7f2ad8ac867a0cd09a5410d119c03e795812dd 100644 (file)
@@ -16,6 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Definition of the EIR Flags field
@@ -47,7 +48,7 @@ public enum EirFlags {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, EirFlags> codeMapping = new HashMap<>();
+    private static @Nullable Map<Integer, EirFlags> codeMapping;
 
     private int key;
 
@@ -55,27 +56,24 @@ public enum EirFlags {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (EirFlags s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param bluetoothAddressType
      *            the code to lookup
      * @return enumeration value.
      */
-    @SuppressWarnings({ "null", "unused" })
     public static EirFlags getEirFlag(int eirFlag) {
-        if (codeMapping.isEmpty()) {
-            initMapping();
+        Map<Integer, EirFlags> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (EirFlags s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.getOrDefault(eirFlag, UNKNOWN);
+        return localCodeMapping.getOrDefault(eirFlag, UNKNOWN);
     }
 
     /**
index ca17d5c08bf1d65601e26cf2abfb9ee62def29d2..855af8d8404089802b9589b54abcb77753be4861 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>AttributeChangeReason</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum AttributeChangeReason {
     /**
      * Default unknown value
@@ -53,7 +57,7 @@ public enum AttributeChangeReason {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, AttributeChangeReason> codeMapping;
+    private static @Nullable Map<Integer, AttributeChangeReason> codeMapping;
 
     private int key;
 
@@ -61,30 +65,24 @@ public enum AttributeChangeReason {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (AttributeChangeReason s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param attributeChangeReason
      *            the code to lookup
      * @return enumeration value.
      */
     public static AttributeChangeReason getAttributeChangeReason(int attributeChangeReason) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(attributeChangeReason) == null) {
-            return UNKNOWN;
+        Map<Integer, AttributeChangeReason> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (AttributeChangeReason s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(attributeChangeReason);
+        return localCodeMapping.getOrDefault(attributeChangeReason, UNKNOWN);
     }
 
     /**
index ff428865fcd0bf082f9b8072004c954021f50207..2bee872d6bd9d5aa7d11c422720acb7c64b67856 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>AttributeValueType</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum AttributeValueType {
     /**
      * Default unknown value
@@ -65,7 +69,7 @@ public enum AttributeValueType {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, AttributeValueType> codeMapping;
+    private static @Nullable Map<Integer, AttributeValueType> codeMapping;
 
     private int key;
 
@@ -73,30 +77,24 @@ public enum AttributeValueType {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (AttributeValueType s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param attributeValueType
      *            the code to lookup
      * @return enumeration value.
      */
     public static AttributeValueType getAttributeValueType(int attributeValueType) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(attributeValueType) == null) {
-            return UNKNOWN;
+        Map<Integer, AttributeValueType> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (AttributeValueType s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(attributeValueType);
+        return localCodeMapping.getOrDefault(attributeValueType, UNKNOWN);
     }
 
     /**
index b1dd4a762355de33cf4300c898f755b47239f658..e354a904dda9a582e99fa05a872d9e83e4f826c6 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>BgApiResponse</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum BgApiResponse {
     /**
      * Default unknown value
@@ -433,7 +437,7 @@ public enum BgApiResponse {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, BgApiResponse> codeMapping;
+    private static @Nullable Map<Integer, BgApiResponse> codeMapping;
 
     private int key;
 
@@ -441,30 +445,24 @@ public enum BgApiResponse {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (BgApiResponse s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param bgApiResponse
      *            the code to lookup
      * @return enumeration value.
      */
     public static BgApiResponse getBgApiResponse(int bgApiResponse) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(bgApiResponse) == null) {
-            return UNKNOWN;
+        Map<Integer, BgApiResponse> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (BgApiResponse s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(bgApiResponse);
+        return localCodeMapping.getOrDefault(bgApiResponse, UNKNOWN);
     }
 
     /**
index 2eb78e17d861e1ba1a10eaae71f3deec0a3b4326..8287fb8b7ead90fc79096a0213690987fcd00914 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>BluetoothAddressType</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum BluetoothAddressType {
     /**
      * Default unknown value
@@ -44,7 +48,7 @@ public enum BluetoothAddressType {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, BluetoothAddressType> codeMapping;
+    private static @Nullable Map<Integer, BluetoothAddressType> codeMapping;
 
     private int key;
 
@@ -52,30 +56,24 @@ public enum BluetoothAddressType {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (BluetoothAddressType s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param bluetoothAddressType
      *            the code to lookup
      * @return enumeration value.
      */
     public static BluetoothAddressType getBluetoothAddressType(int bluetoothAddressType) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(bluetoothAddressType) == null) {
-            return UNKNOWN;
+        Map<Integer, BluetoothAddressType> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (BluetoothAddressType s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(bluetoothAddressType);
+        return localCodeMapping.getOrDefault(bluetoothAddressType, UNKNOWN);
     }
 
     /**
index 200ce93bdfb08ef56a72a57299221c9dc245caf7..c27308b892221752045b607610550379b127d3ba 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>ConnectionStatusFlag</b>.
  * <p>
@@ -26,6 +29,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum ConnectionStatusFlag {
     /**
      * Default unknown value
@@ -57,7 +61,7 @@ public enum ConnectionStatusFlag {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, ConnectionStatusFlag> codeMapping;
+    private static @Nullable Map<Integer, ConnectionStatusFlag> codeMapping;
 
     private int key;
 
@@ -65,30 +69,24 @@ public enum ConnectionStatusFlag {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (ConnectionStatusFlag s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param connectionStatusFlag
      *            the code to lookup
      * @return enumeration value.
      */
     public static ConnectionStatusFlag getConnectionStatusFlag(int connectionStatusFlag) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(connectionStatusFlag) == null) {
-            return UNKNOWN;
+        Map<Integer, ConnectionStatusFlag> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (ConnectionStatusFlag s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(connectionStatusFlag);
+        return localCodeMapping.getOrDefault(connectionStatusFlag, UNKNOWN);
     }
 
     /**
index 4f44b4ba60c7b5e2081083d64170fb17f41c84d5..689f9adcffbcc17735291d4f5a3a297ccafe8d75 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>GapConnectableMode</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum GapConnectableMode {
     /**
      * Default unknown value
@@ -55,7 +59,7 @@ public enum GapConnectableMode {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, GapConnectableMode> codeMapping;
+    private static @Nullable Map<Integer, GapConnectableMode> codeMapping;
 
     private int key;
 
@@ -63,30 +67,24 @@ public enum GapConnectableMode {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (GapConnectableMode s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param gapConnectableMode
      *            the code to lookup
      * @return enumeration value.
      */
     public static GapConnectableMode getGapConnectableMode(int gapConnectableMode) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(gapConnectableMode) == null) {
-            return UNKNOWN;
+        Map<Integer, GapConnectableMode> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (GapConnectableMode s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(gapConnectableMode);
+        return localCodeMapping.getOrDefault(gapConnectableMode, UNKNOWN);
     }
 
     /**
index 116a1f6e501895c2c16a37593e7d84ba756a20cd..7ed1444e28cd76f6f6b07abe526f3594a8b8ff4f 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>GapDiscoverMode</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum GapDiscoverMode {
     /**
      * Default unknown value
@@ -72,7 +76,7 @@ public enum GapDiscoverMode {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, GapDiscoverMode> codeMapping;
+    private static @Nullable Map<Integer, GapDiscoverMode> codeMapping;
 
     private int key;
 
@@ -80,30 +84,24 @@ public enum GapDiscoverMode {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (GapDiscoverMode s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param gapDiscoverMode
      *            the code to lookup
      * @return enumeration value.
      */
     public static GapDiscoverMode getGapDiscoverMode(int gapDiscoverMode) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(gapDiscoverMode) == null) {
-            return UNKNOWN;
+        Map<Integer, GapDiscoverMode> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (GapDiscoverMode s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(gapDiscoverMode);
+        return localCodeMapping.getOrDefault(gapDiscoverMode, UNKNOWN);
     }
 
     /**
index deab96b1c82eca6ebb3eb46c5ae6fe00c0c5fb4b..14a1570177c6f20430b7c9f170f81eedc2729904 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>GapDiscoverableMode</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum GapDiscoverableMode {
     /**
      * Default unknown value
@@ -72,7 +76,7 @@ public enum GapDiscoverableMode {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, GapDiscoverableMode> codeMapping;
+    private static @Nullable Map<Integer, GapDiscoverableMode> codeMapping;
 
     private int key;
 
@@ -80,30 +84,24 @@ public enum GapDiscoverableMode {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (GapDiscoverableMode s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param gapDiscoverableMode
      *            the code to lookup
      * @return enumeration value.
      */
     public static GapDiscoverableMode getGapDiscoverableMode(int gapDiscoverableMode) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(gapDiscoverableMode) == null) {
-            return UNKNOWN;
+        Map<Integer, GapDiscoverableMode> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (GapDiscoverableMode s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(gapDiscoverableMode);
+        return localCodeMapping.getOrDefault(gapDiscoverableMode, UNKNOWN);
     }
 
     /**
index 38895ec009c516aad60e8f012ada947f2161e663..e385faa747d444361276c89944d2db0cfca68f81 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>ScanResponseType</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum ScanResponseType {
     /**
      * Default unknown value
@@ -54,7 +58,7 @@ public enum ScanResponseType {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, ScanResponseType> codeMapping;
+    private static @Nullable Map<Integer, ScanResponseType> codeMapping;
 
     private int key;
 
@@ -62,30 +66,24 @@ public enum ScanResponseType {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (ScanResponseType s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param scanResponseType
      *            the code to lookup
      * @return enumeration value.
      */
     public static ScanResponseType getScanResponseType(int scanResponseType) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(scanResponseType) == null) {
-            return UNKNOWN;
+        Map<Integer, ScanResponseType> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (ScanResponseType s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(scanResponseType);
+        return localCodeMapping.getOrDefault(scanResponseType, UNKNOWN);
     }
 
     /**
index 053cd3a18fe3db35625b2582dee5fba557ca4058..0a7c9cda1b6f1a132da8dfce734a8b240f221242 100644 (file)
@@ -15,6 +15,9 @@ package org.openhab.binding.bluetooth.bluegiga.internal.enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Class to implement the BlueGiga Enumeration <b>SmpIoCapabilities</b>.
  * <p>
@@ -24,6 +27,7 @@ import java.util.Map;
  *
  * @author Chris Jackson - Initial contribution of Java code generator
  */
+@NonNullByDefault
 public enum SmpIoCapabilities {
     /**
      * Default unknown value
@@ -59,7 +63,7 @@ public enum SmpIoCapabilities {
      * A mapping between the integer code and its corresponding type to
      * facilitate lookup by code.
      */
-    private static Map<Integer, SmpIoCapabilities> codeMapping;
+    private static @Nullable Map<Integer, SmpIoCapabilities> codeMapping;
 
     private int key;
 
@@ -67,30 +71,24 @@ public enum SmpIoCapabilities {
         this.key = key;
     }
 
-    private static void initMapping() {
-        codeMapping = new HashMap<>();
-        for (SmpIoCapabilities s : values()) {
-            codeMapping.put(s.key, s);
-        }
-    }
-
     /**
-     * Lookup function based on the type code. Returns null if the code does not exist.
+     * Lookup function based on the type code. Returns {@link UNKNOWN} if the code does not exist.
      *
      * @param smpIoCapabilities
      *            the code to lookup
      * @return enumeration value.
      */
     public static SmpIoCapabilities getSmpIoCapabilities(int smpIoCapabilities) {
-        if (codeMapping == null) {
-            initMapping();
-        }
-
-        if (codeMapping.get(smpIoCapabilities) == null) {
-            return UNKNOWN;
+        Map<Integer, SmpIoCapabilities> localCodeMapping = codeMapping;
+        if (localCodeMapping == null) {
+            localCodeMapping = new HashMap<>();
+            for (SmpIoCapabilities s : values()) {
+                localCodeMapping.put(s.key, s);
+            }
+            codeMapping = localCodeMapping;
         }
 
-        return codeMapping.get(smpIoCapabilities);
+        return localCodeMapping.getOrDefault(smpIoCapabilities, UNKNOWN);
     }
 
     /**
index 935e202f1298b1071371fcd45cae7d7def36bb35..256982b6a81bcbb92655d7b3adeed271da14b219 100644 (file)
@@ -88,7 +88,6 @@ public class BlueGigaHandlerFactory extends BaseThingHandlerFactory {
                 bundleContext.registerService(BluetoothAdapter.class.getName(), adapter, new Hashtable<>()));
     }
 
-    @SuppressWarnings("null")
     @Override
     protected synchronized void removeHandler(ThingHandler thingHandler) {
         if (thingHandler instanceof BluetoothAdapter) {