demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

nul annotations, checkstyle, forbidden packagel (#13981)

Browse Source 
Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2022-12-20 00:04:43 +01:00 committed by GitHub
parent 40b8b77840
commit 1519cb4b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AbstractAirthingsHandler.java
View File

@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - Added Airthings Wave Mini support * @author Kai Kreuzer - Added Airthings Wave Mini support
*/ */
@NonNullByDefault @NonNullByDefault
abstract public class AbstractAirthingsHandler extends BeaconBluetoothHandler { public abstract class AbstractAirthingsHandler extends BeaconBluetoothHandler {
private static final int CHECK_PERIOD_SEC = 10; private static final int CHECK_PERIOD_SEC = 10;
@ -283,5 +283,5 @@ abstract public class AbstractAirthingsHandler extends BeaconBluetoothHandler {
* *
* @param is the content of the bluetooth characteristic * @param is the content of the bluetooth characteristic
*/ */
abstract protected void updateChannels(int[] is); protected abstract void updateChannels(int[] is);
} }

22
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsBindingConstants.java
View File

@ -12,24 +12,12 @@
*/ */
package org.openhab.binding.bluetooth.airthings.internal; package org.openhab.binding.bluetooth.airthings.internal;
import java.math.BigInteger;
import java.util.Set; import java.util.Set;
import javax.measure.Unit;
import javax.measure.quantity.Dimensionless;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.binding.bluetooth.BluetoothBindingConstants; import org.openhab.binding.bluetooth.BluetoothBindingConstants;
import org.openhab.core.library.dimension.Density;
import org.openhab.core.library.unit.SIUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.ThingTypeUID;
import tech.units.indriya.format.SimpleUnitFormat;
import tech.units.indriya.function.MultiplyConverter;
import tech.units.indriya.unit.ProductUnit;
import tech.units.indriya.unit.TransformedUnit;
/** /**
* The {@link AirthingsBindingConstants} class defines common constants, which are * The {@link AirthingsBindingConstants} class defines common constants, which are
* used across the whole binding. * used across the whole binding.
@ -60,14 +48,4 @@ public class AirthingsBindingConstants {
public static final String CHANNEL_ID_TVOC = "tvoc"; public static final String CHANNEL_ID_TVOC = "tvoc";
public static final String CHANNEL_ID_RADON_ST_AVG = "radon_st_avg"; public static final String CHANNEL_ID_RADON_ST_AVG = "radon_st_avg";
public static final String CHANNEL_ID_RADON_LT_AVG = "radon_lt_avg"; public static final String CHANNEL_ID_RADON_LT_AVG = "radon_lt_avg";
public static final Unit<Dimensionless> PARTS_PER_BILLION = new TransformedUnit<>(Units.ONE,
MultiplyConverter.ofRational(BigInteger.ONE, BigInteger.valueOf(1000000000)));
public static final Unit<Density> BECQUEREL_PER_CUBIC_METRE = new ProductUnit<>(
Units.BECQUEREL.divide(SIUnits.CUBIC_METRE));
static {
SimpleUnitFormat.getInstance().label(PARTS_PER_BILLION, "ppb");
SimpleUnitFormat.getInstance().label(BECQUEREL_PER_CUBIC_METRE, "Bq/m³");
}
} }

5
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsDiscoveryParticipant.java
View File

@ -98,10 +98,7 @@ public class AirthingsDiscoveryParticipant implements BluetoothDiscoveryParticip
private boolean isAirthingsDevice(BluetoothDiscoveryDevice device) { private boolean isAirthingsDevice(BluetoothDiscoveryDevice device) {
Integer manufacturerId = device.getManufacturerId(); Integer manufacturerId = device.getManufacturerId();
if (manufacturerId != null && manufacturerId == AIRTHINGS_COMPANY_ID) { return manufacturerId != null && manufacturerId == AIRTHINGS_COMPANY_ID;
return true;
}
return false;
} }
private DiscoveryResult createResult(BluetoothDiscoveryDevice device, ThingUID thingUID, String label) { private DiscoveryResult createResult(BluetoothDiscoveryDevice device, ThingUID thingUID, String label) {

4
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveGen1Handler.java
View File

@ -87,7 +87,7 @@ public class AirthingsWaveGen1Handler extends AbstractAirthingsHandler {
logger.debug("Change next readSensor to: {}", readSensor); logger.debug("Change next readSensor to: {}", readSensor);
logger.debug("Update channel 3"); logger.debug("Update channel 3");
updateState(CHANNEL_ID_RADON_ST_AVG, updateState(CHANNEL_ID_RADON_ST_AVG,
QuantityType.valueOf(Double.valueOf(intResult), BECQUEREL_PER_CUBIC_METRE)); QuantityType.valueOf(Double.valueOf(intResult), Units.BECQUEREL_PER_CUBIC_METRE));
logger.debug("Update channel 3 done"); logger.debug("Update channel 3 done");
break; break;
case RADON_LTA: case RADON_LTA:
@ -97,7 +97,7 @@ public class AirthingsWaveGen1Handler extends AbstractAirthingsHandler {
logger.debug("Change next readSensor to: {}", readSensor); logger.debug("Change next readSensor to: {}", readSensor);
logger.debug("Update channel 4"); logger.debug("Update channel 4");
updateState(CHANNEL_ID_RADON_LT_AVG, updateState(CHANNEL_ID_RADON_LT_AVG,
QuantityType.valueOf(Double.valueOf(intResult), BECQUEREL_PER_CUBIC_METRE)); QuantityType.valueOf(Double.valueOf(intResult), Units.BECQUEREL_PER_CUBIC_METRE));
logger.debug("Update channel 4 done"); logger.debug("Update channel 4 done");
break; break;
} }

2
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveMiniHandler.java
View File

@ -63,7 +63,7 @@ public class AirthingsWaveMiniHandler extends AbstractAirthingsHandler {
} }
Number tvoc = data.get(AirthingsDataParser.TVOC); Number tvoc = data.get(AirthingsDataParser.TVOC);
if (tvoc != null) { if (tvoc != null) {
updateState(CHANNEL_ID_TVOC, new QuantityType<Dimensionless>(tvoc, PARTS_PER_BILLION)); updateState(CHANNEL_ID_TVOC, new QuantityType<Dimensionless>(tvoc, Units.PARTS_PER_BILLION));
} }
} catch (AirthingsParserException e) { } catch (AirthingsParserException e) {
logger.error("Failed to parse data received from Airthings sensor: {}", e.getMessage()); logger.error("Failed to parse data received from Airthings sensor: {}", e.getMessage());

6
bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWavePlusHandler.java
View File

@ -73,17 +73,17 @@ public class AirthingsWavePlusHandler extends AbstractAirthingsHandler {
} }
Number tvoc = data.get(AirthingsDataParser.TVOC); Number tvoc = data.get(AirthingsDataParser.TVOC);
if (tvoc != null) { if (tvoc != null) {
updateState(CHANNEL_ID_TVOC, new QuantityType<Dimensionless>(tvoc, PARTS_PER_BILLION)); updateState(CHANNEL_ID_TVOC, new QuantityType<Dimensionless>(tvoc, Units.PARTS_PER_BILLION));
} }
Number radonShortTermAvg = data.get(AirthingsDataParser.RADON_SHORT_TERM_AVG); Number radonShortTermAvg = data.get(AirthingsDataParser.RADON_SHORT_TERM_AVG);
if (radonShortTermAvg != null) { if (radonShortTermAvg != null) {
updateState(CHANNEL_ID_RADON_ST_AVG, updateState(CHANNEL_ID_RADON_ST_AVG,
new QuantityType<Density>(radonShortTermAvg, BECQUEREL_PER_CUBIC_METRE)); new QuantityType<Density>(radonShortTermAvg, Units.BECQUEREL_PER_CUBIC_METRE));
} }
Number radonLongTermAvg = data.get(AirthingsDataParser.RADON_LONG_TERM_AVG); Number radonLongTermAvg = data.get(AirthingsDataParser.RADON_LONG_TERM_AVG);
if (radonLongTermAvg != null) { if (radonLongTermAvg != null) {
updateState(CHANNEL_ID_RADON_LT_AVG, updateState(CHANNEL_ID_RADON_LT_AVG,
new QuantityType<Density>(radonLongTermAvg, BECQUEREL_PER_CUBIC_METRE)); new QuantityType<Density>(radonLongTermAvg, Units.BECQUEREL_PER_CUBIC_METRE));
} }
} catch (AirthingsParserException e) { } catch (AirthingsParserException e) {
logger.error("Failed to parse data received from Airthings sensor: {}", e.getMessage()); logger.error("Failed to parse data received from Airthings sensor: {}", e.getMessage());