Minor refactoring: now consistently using a pattern-matching instanceof

Author: climategadgets

modules/hcc-bootstrap/src/main/java/net/sf/dz3r/runtime/config/ConfigurationMapper.java

@@ -12,7 +12,7 @@
  * This might mutate into proper usage if/when components get separated into configuration + implementation pairs,
  * otherwise too many irrelevant dependencies will bleed into this module.
  *
- * @author Copyright &copy; <a href="mailto:vt@homeclimatecontrol.com">Vadim Tkachenko</a> 2001-2023
+ * @author Copyright &copy; <a href="mailto:vt@homeclimatecontrol.com">Vadim Tkachenko</a> 2001-2025
  */
 @Mapper
 public interface ConfigurationMapper {
@@ -51,11 +51,11 @@ public String password() {
             @Override
             public boolean equals(Object other) {
 
-                if (!(other instanceof MqttEndpointSpec)) {
+                if (!(other instanceof MqttEndpointSpec spec)) {
                     return false;
                 }
 
-                return signature().equals(((MqttEndpointSpec) other).signature());
+                return signature().equals(spec.signature());
             }
 
             @Override

modules/hcc-owapi/src/main/java/net/sf/dz3r/device/onewire/OneWireDriver.java

@@ -88,7 +88,7 @@ protected void handleDeparture(DriverNetworkEvent event) {
         devicesPresent.remove(departureEvent.address);
         address2path.remove(departureEvent.address);
 
-        logger.error("Departure not handled completely: {}", ((OneWireNetworkDeparture) event).address );
+        logger.error("Departure not handled completely: {}", departureEvent.address );
     }
 
     @Override

modules/hcc-owapi/src/main/java/net/sf/dz3r/device/onewire/command/OneWireCommandReadTemperatureAll.java

@@ -106,13 +106,12 @@ private void readTemperature(DSPortAdapter adapter, String address, FluxSink<Dri
 
             var owc = adapter.getDeviceContainer(address);
 
-            if (!(owc instanceof TemperatureContainer)) {
+            if (!(owc instanceof TemperatureContainer temperatureContainer)) {
                 logger.debug("not a temperature container: {}", address);
                 return;
             }
 
-            var tc = (TemperatureContainer) owc;
-            var sample = tc.getTemperature(tc.readDevice());
+            var sample = temperatureContainer.getTemperature(temperatureContainer.readDevice());
 
             logger.debug("{}: {}°C", address, sample);
 

modules/hcc-owapi/src/main/java/net/sf/dz3r/device/onewire/command/OneWireCommandRescan.java

@@ -4,7 +4,6 @@
 import com.dalsemi.onewire.adapter.DSPortAdapter;
 import com.dalsemi.onewire.container.OneWireContainer;
 import com.dalsemi.onewire.container.OneWireContainer1F;
-import com.dalsemi.onewire.container.SwitchContainer;
 import com.dalsemi.onewire.utils.OWPath;
 import net.sf.dz3r.device.driver.command.DriverCommand;
 import net.sf.dz3r.device.driver.event.DriverNetworkEvent;
@@ -145,12 +144,10 @@ private void checkDepartures(SortedSet<String> known, FluxSink<DriverNetworkEven
 
     private void checkLanCoupler(OneWireContainer owc, OWPath path, List<OWPath> branches) {
 
-        if (!(owc instanceof OneWireContainer1F)) {
+        if (!(owc instanceof OneWireContainer1F coupler)) {
             return;
         }
 
-        var coupler = (SwitchContainer) owc;
-
         branches.add(path.extend(coupler, 0));
         branches.add(path.extend(coupler, 1));
     }