Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bluetooth.govee] null annotations #13978

Merged
merged 5 commits into from
Dec 22, 2022
Merged

[bluetooth.govee] null annotations #13978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d890349
null annotations and checkstyle
lsiepel Dec 16, 2022
4665060
Fix more warnings
lsiepel Dec 16, 2022
4873da3
null annotations - checkstyle
lsiepel Dec 16, 2022
bde5d8e
Revert "null annotations - checkstyle"
lsiepel Dec 16, 2022
6d41e69
review comments
lsiepel Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...uetooth.govee/src/main/java/org/openhab/binding/bluetooth/gattserial/MessageSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
*/
package org.openhab.binding.bluetooth.gattserial;

import org.eclipse.jdt.annotation.NonNullByDefault;

/**
* @author Connor Petty - Initial Contribution
*
*/
@NonNullByDefault
public interface MessageSupplier<M extends GattMessage> {

public M createMessage();
Expand Down
1 change: 0 additions & 1 deletion ...ee/src/main/java/org/openhab/binding/bluetooth/govee/internal/GoveeHygrometerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ public void dispose() {
}

private CompletableFuture<@Nullable ?> createInitSettingsJob() {

logger.debug("Initializing Govee Hygrometer {} settings", address);

QuantityType<Temperature> temCali = config.getTemperatureCalibration();
Expand Down
2 changes: 1 addition & 1 deletion ...luetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/GoveeModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public enum GoveeModel {
private final String label;
private final boolean supportsWarningBroadcast;

private final static Logger logger = LoggerFactory.getLogger(GoveeModel.class);
private static final Logger logger = LoggerFactory.getLogger(GoveeModel.class);

private GoveeModel(ThingTypeUID thingTypeUID, String label, boolean supportsWarningBroadcast) {
this.thingTypeUID = thingTypeUID;
Expand Down
16 changes: 10 additions & 6 deletions ...penhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetHumWarningCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ public byte getCommandCode() {
return 3;
}

private static short convertQuantity(QuantityType<Dimensionless> quantity) {
var percentQuantity = quantity.toUnit(Units.PERCENT);
private static short convertQuantity(@Nullable QuantityType<Dimensionless> quantity) {
if (quantity == null) {
throw new IllegalArgumentException("Unable to convert quantity to percent");
}
QuantityType<Dimensionless> percentQuantity = quantity.toUnit(Units.PERCENT);
if (percentQuantity == null) {
throw new IllegalArgumentException("Unable to convert quantity to percent");
}
Expand All @@ -65,14 +68,15 @@ private static short convertQuantity(QuantityType<Dimensionless> quantity) {

@Override
protected byte @Nullable [] getData() {
if (settings == null) {
WarningSettingsDTO<Dimensionless> localSettins = settings;
if (localSettins == null || localSettins.min == null || localSettins.max == null) {
lsiepel marked this conversation as resolved.
Show resolved Hide resolved
return null;
}

ByteBuffer buffer = ByteBuffer.allocate(5).order(ByteOrder.LITTLE_ENDIAN);
buffer.put(settings.enableAlarm == OnOffType.ON ? (byte) 1 : 0);
buffer.putShort(convertQuantity(settings.min));
buffer.putShort(convertQuantity(settings.max));
buffer.put(localSettins.enableAlarm == OnOffType.ON ? (byte) 1 : 0);
buffer.putShort(convertQuantity(localSettins.min));
buffer.putShort(convertQuantity(localSettins.max));
return buffer.array();
}

Expand Down
7 changes: 5 additions & 2 deletions ...ooth.govee/src/test/java/org/openhab/binding/bluetooth/govee/internal/GoveeModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.openhab.binding.bluetooth.MockBluetoothAdapter;
import org.openhab.binding.bluetooth.MockBluetoothDevice;
Expand All @@ -40,7 +41,8 @@ void noMatchTest() {
}

@Test
void testGovee_H5074_84DD() {
@DisplayName("testGovee_H5074_84DD")
void testGoveeH507484DD() {
MockBluetoothAdapter adapter = new MockBluetoothAdapter();
MockBluetoothDevice mockDevice = adapter.getDevice(TestUtils.randomAddress());
mockDevice.setName("Govee_H5074_84DD");
Expand All @@ -49,7 +51,8 @@ void testGovee_H5074_84DD() {
}

@Test
void testGVH5102_77E9() {
@DisplayName("testGVH5102_77E9")
void testGVH510277E9() {
MockBluetoothAdapter adapter = new MockBluetoothAdapter();
MockBluetoothDevice mockDevice = adapter.getDevice(TestUtils.randomAddress());
mockDevice.setName("GVH5102_77E9");
Expand Down
12 changes: 7 additions & 5 deletions ...est/java/org/openhab/binding/bluetooth/govee/internal/readme/ThingTypeTableGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.bluetooth.govee.internal.GoveeModel;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
Expand All @@ -36,10 +38,10 @@
* @author Connor Petty - Initial contribution
*
*/
@NonNullByDefault
public class ThingTypeTableGenerator {

public static void main(String[] args) throws Exception {

FileInputStream fileIS = new FileInputStream("src/main/resources/OH-INF/thing/thing-types.xml");
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = builderFactory.newDocumentBuilder();
Expand Down Expand Up @@ -111,9 +113,9 @@ private static int maxColumnSize(List<String[]> rows, int column) {
}

private static class ThingTypeData {
private String id;
private String label;
private String description;
private @Nullable String id;
private @Nullable String label;
private @Nullable String description;
}

private static String[] toRow(ThingTypeData data) {
Expand All @@ -122,7 +124,7 @@ private static String[] toRow(ThingTypeData data) {
modelsForType(data.id).stream().map(model -> model.name()).collect(Collectors.joining(",")) };
}

private static List<GoveeModel> modelsForType(String typeUID) {
private static List<GoveeModel> modelsForType(@Nullable String typeUID) {
return Arrays.stream(GoveeModel.values()).filter(model -> model.getThingTypeUID().getId().equals(typeUID))
.collect(Collectors.toList());
}
Expand Down