Java 17 features (A-G) (#15516)
- add missing @override - Java style array syntax - remove redundant modifiers - always move String constants to left side in comparisons - simplify lambda expressions and return statements - use replace instead of replaceAll w/o regex - instanceof matching and multiline strings Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
@@ -56,7 +56,7 @@ public class GeneracMobileLinkDiscoveryService extends AbstractDiscoveryService
|
||||
DiscoveryResult result = DiscoveryResultBuilder
|
||||
.create(new ThingUID(THING_TYPE_GENERATOR, bridgeUID, String.valueOf(apparatus.apparatusId)))
|
||||
.withLabel("MobileLink Generator " + apparatus.name)
|
||||
.withProperty(Thing.PROPERTY_SERIAL_NUMBER, String.valueOf(apparatus.serialNumber))
|
||||
.withProperty(Thing.PROPERTY_SERIAL_NUMBER, apparatus.serialNumber)
|
||||
.withProperty(PROPERTY_GENERATOR_ID, String.valueOf(apparatus.apparatusId))
|
||||
.withRepresentationProperty(PROPERTY_GENERATOR_ID).withBridge(bridgeUID).build();
|
||||
thingDiscovered(result);
|
||||
|
||||
@@ -73,10 +73,10 @@ public class GeneracMobileLinkAccountHandler extends BaseBridgeHandler {
|
||||
private static final String API_BASE = "https://app.mobilelinkgen.com/api";
|
||||
private static final String LOGIN_BASE = "https://generacconnectivity.b2clogin.com/generacconnectivity.onmicrosoft.com/B2C_1A_MobileLink_SignIn";
|
||||
private static final Pattern SETTINGS_PATTERN = Pattern.compile("^var SETTINGS = (.*);$", Pattern.MULTILINE);
|
||||
private static final Gson GSON = new GsonBuilder().registerTypeAdapter(ZonedDateTime.class,
|
||||
(JsonDeserializer<ZonedDateTime>) (json, type, jsonDeserializationContext) -> {
|
||||
return ZonedDateTime.parse(json.getAsJsonPrimitive().getAsString());
|
||||
}).create();
|
||||
private static final Gson GSON = new GsonBuilder()
|
||||
.registerTypeAdapter(ZonedDateTime.class, (JsonDeserializer<ZonedDateTime>) (json, type,
|
||||
jsonDeserializationContext) -> ZonedDateTime.parse(json.getAsJsonPrimitive().getAsString()))
|
||||
.create();
|
||||
private HttpClient httpClient;
|
||||
private GeneracMobileLinkDiscoveryService discoveryService;
|
||||
private Map<String, Apparatus> apparatusesCache = new HashMap<String, Apparatus>();
|
||||
@@ -201,7 +201,7 @@ public class GeneracMobileLinkAccountHandler extends BaseBridgeHandler {
|
||||
Optional<Thing> thing = getThing().getThings().stream().filter(
|
||||
t -> t.getConfiguration().as(GeneracMobileLinkGeneratorConfiguration.class).generatorId.equals(id))
|
||||
.findFirst();
|
||||
if (!thing.isPresent()) {
|
||||
if (thing.isEmpty()) {
|
||||
discoveryService.generatorDiscovered(apparatus, getThing().getUID());
|
||||
} else {
|
||||
ThingHandler handler = thing.get().getHandler();
|
||||
|
||||
@@ -122,7 +122,7 @@ public class GeneracMobileLinkGeneratorHandler extends BaseThingHandler {
|
||||
try {
|
||||
if (p.value.signalStrength != null) {
|
||||
updateState(CHANNEL_SIGNAL_STRENGH, new QuantityType<Dimensionless>(
|
||||
Integer.parseInt(p.value.signalStrength.replaceAll("%", "")), Units.PERCENT));
|
||||
Integer.parseInt(p.value.signalStrength.replace("%", "")), Units.PERCENT));
|
||||
}
|
||||
} catch (NumberFormatException e) {
|
||||
logger.debug("Could not parse signalStrength {}", p.value.signalStrength);
|
||||
|
||||
Reference in New Issue
Block a user