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:
Holger Friedrich
2023-09-05 22:30:16 +02:00
committed by GitHub
parent a0dc5c05f2
commit cf10b3e9c7
486 changed files with 2053 additions and 1955 deletions

View File

@@ -170,9 +170,8 @@ public class DWDPollenflugBridgeHandler extends BaseBridgeHandler {
@Override
public void childHandlerInitialized(ThingHandler childHandler, Thing childThing) {
if (childHandler instanceof DWDPollenflugRegionHandler) {
if (childHandler instanceof DWDPollenflugRegionHandler regionListener) {
logger.debug("Register region listener.");
final DWDPollenflugRegionHandler regionListener = (DWDPollenflugRegionHandler) childHandler;
if (regionListeners.add(regionListener)) {
final DWDPollenflug localPollenflug = pollenflug;
if (localPollenflug != null) {
@@ -187,9 +186,9 @@ public class DWDPollenflugBridgeHandler extends BaseBridgeHandler {
@Override
public void childHandlerDisposed(ThingHandler childHandler, Thing childThing) {
if (childHandler instanceof DWDPollenflugRegionHandler) {
if (childHandler instanceof DWDPollenflugRegionHandler handler) {
logger.debug("Unregister region listener.");
if (!regionListeners.remove((DWDPollenflugRegionHandler) childHandler)) {
if (!regionListeners.remove(handler)) {
logger.warn("Tried to remove listener {} but it was not registered. This is probably an error.",
childHandler);
}

View File

@@ -66,8 +66,7 @@ public class DWDPollenflugRegionHandler extends BaseThingHandler {
Bridge bridge = getBridge();
if (bridge != null) {
ThingHandler handler = bridge.getHandler();
if (handler instanceof DWDPollenflugBridgeHandler) {
DWDPollenflugBridgeHandler bridgeHandler = (DWDPollenflugBridgeHandler) handler;
if (handler instanceof DWDPollenflugBridgeHandler bridgeHandler) {
return bridgeHandler;
}
}