diff --git a/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMRuleTemplate.java b/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMRuleTemplate.java
index 84268492164..bb6f7380451 100644
--- a/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMRuleTemplate.java
+++ b/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMRuleTemplate.java
@@ -46,10 +46,10 @@ public class PWMRuleTemplate extends RuleTemplate {
         final List<Trigger> triggers = List.of(ModuleBuilder.createTrigger().withId(triggerId)
                 .withTypeUID(PWMTriggerType.UID).withLabel("PWM Trigger").build());
 
-        final Map<String, String> actionInputs = new HashMap<String, String>();
+        final Map<String, String> actionInputs = new HashMap<>();
         actionInputs.put(PWMConstants.INPUT, triggerId + "." + PWMConstants.OUTPUT);
 
-        Set<String> tags = new HashSet<String>();
+        Set<String> tags = new HashSet<>();
         tags.add("PWM");
 
         return new PWMRuleTemplate(tags, triggers, Collections.emptyList(), Collections.emptyList(),
diff --git a/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMTemplateProvider.java b/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMTemplateProvider.java
index cdd49202121..d357c31f8f7 100644
--- a/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMTemplateProvider.java
+++ b/bundles/org.openhab.automation.pwm/src/main/java/org/openhab/automation/pwm/internal/template/PWMTemplateProvider.java
@@ -33,7 +33,7 @@ import org.osgi.service.component.annotations.Component;
 @Component
 @NonNullByDefault
 public class PWMTemplateProvider implements RuleTemplateProvider {
-    private final Map<String, RuleTemplate> providedRuleTemplates = new HashMap<String, RuleTemplate>();
+    private final Map<String, RuleTemplate> providedRuleTemplates = new HashMap<>();
 
     public PWMTemplateProvider() {
         providedRuleTemplates.put(PWMRuleTemplate.UID, PWMRuleTemplate.initialize());
diff --git a/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/protocol/ADMessage.java b/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/protocol/ADMessage.java
index b540eb003a4..3ef4727f2ce 100644
--- a/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/protocol/ADMessage.java
+++ b/bundles/org.openhab.binding.alarmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/protocol/ADMessage.java
@@ -44,7 +44,7 @@ public abstract class ADMessage {
 
     /** Utility routine to split an AD message into its component parts */
     protected static List<String> splitMsg(String msg) {
-        List<String> l = new ArrayList<String>();
+        List<String> l = new ArrayList<>();
         Matcher regexMatcher = SPLIT_REGEX.matcher(msg);
         while (regexMatcher.find()) {
             l.add(regexMatcher.group());
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/pcap/PcapNetworkInterfaceWrapper.java b/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/pcap/PcapNetworkInterfaceWrapper.java
index 053666463bd..6bd7a7783c3 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/pcap/PcapNetworkInterfaceWrapper.java
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/java/org/openhab/binding/amazondashbutton/internal/pcap/PcapNetworkInterfaceWrapper.java
@@ -40,7 +40,7 @@ public class PcapNetworkInterfaceWrapper {
     /**
      * Use this Guava function in order to create a {@link PcapNetworkInterfaceWrapper} instance.
      */
-    public static final Function<PcapNetworkInterface, PcapNetworkInterfaceWrapper> TRANSFORMER = new Function<PcapNetworkInterface, PcapNetworkInterfaceWrapper>() {
+    public static final Function<PcapNetworkInterface, PcapNetworkInterfaceWrapper> TRANSFORMER = new Function<>() {
 
         @Override
         public PcapNetworkInterfaceWrapper apply(PcapNetworkInterface pcapNetworkInterface) {
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java
index 6718a47e43c..d1f677ef921 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java
@@ -60,7 +60,7 @@ public class SmartHomeDevicesDiscovery extends AbstractDiscoveryService {
     }
 
     public void activate() {
-        activate(new Hashtable<String, Object>());
+        activate(new Hashtable<>());
     }
 
     @Override
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerTemperatureSensor.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerTemperatureSensor.java
index 6a8064b2860..88ff4c3ed38 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerTemperatureSensor.java
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerTemperatureSensor.java
@@ -83,9 +83,9 @@ public class HandlerTemperatureSensor extends HandlerBase {
                     float temperature = value.get("value").getAsFloat();
                     String scale = value.get("scale").getAsString();
                     if ("CELSIUS".equals(scale)) {
-                        temperatureValue = new QuantityType<Temperature>(temperature, SIUnits.CELSIUS);
+                        temperatureValue = new QuantityType<>(temperature, SIUnits.CELSIUS);
                     } else {
-                        temperatureValue = new QuantityType<Temperature>(temperature, ImperialUnits.FAHRENHEIT);
+                        temperatureValue = new QuantityType<>(temperature, ImperialUnits.FAHRENHEIT);
                     }
                 }
             }
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerThermostatController.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerThermostatController.java
index ca65d50fec2..476b7fdd267 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerThermostatController.java
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerThermostatController.java
@@ -101,9 +101,9 @@ public class HandlerThermostatController extends HandlerBase {
                     float temperature = value.get("value").getAsFloat();
                     String scale = value.get("scale").getAsString().toUpperCase();
                     if ("CELSIUS".equals(scale)) {
-                        temperatureValue = new QuantityType<Temperature>(temperature, SIUnits.CELSIUS);
+                        temperatureValue = new QuantityType<>(temperature, SIUnits.CELSIUS);
                     } else {
-                        temperatureValue = new QuantityType<Temperature>(temperature, ImperialUnits.FAHRENHEIT);
+                        temperatureValue = new QuantityType<>(temperature, ImperialUnits.FAHRENHEIT);
                     }
                 }
                 updateState(TARGET_SETPOINT.channelId, temperatureValue == null ? UnDefType.UNDEF : temperatureValue);
@@ -121,9 +121,9 @@ public class HandlerThermostatController extends HandlerBase {
                     float temperature = value.get("value").getAsFloat();
                     String scale = value.get("scale").getAsString().toUpperCase();
                     if ("CELSIUS".equals(scale)) {
-                        temperatureValue = new QuantityType<Temperature>(temperature, SIUnits.CELSIUS);
+                        temperatureValue = new QuantityType<>(temperature, SIUnits.CELSIUS);
                     } else {
-                        temperatureValue = new QuantityType<Temperature>(temperature, ImperialUnits.FAHRENHEIT);
+                        temperatureValue = new QuantityType<>(temperature, ImperialUnits.FAHRENHEIT);
                     }
                 }
                 updateState(UPPER_SETPOINT.channelId, temperatureValue == null ? UnDefType.UNDEF : temperatureValue);
@@ -135,9 +135,9 @@ public class HandlerThermostatController extends HandlerBase {
                     float temperature = value.get("value").getAsFloat();
                     String scale = value.get("scale").getAsString().toUpperCase();
                     if ("CELSIUS".equals(scale)) {
-                        temperatureValue = new QuantityType<Temperature>(temperature, SIUnits.CELSIUS);
+                        temperatureValue = new QuantityType<>(temperature, SIUnits.CELSIUS);
                     } else {
-                        temperatureValue = new QuantityType<Temperature>(temperature, ImperialUnits.FAHRENHEIT);
+                        temperatureValue = new QuantityType<>(temperature, ImperialUnits.FAHRENHEIT);
                     }
                 }
                 updateState(LOWER_SETPOINT.channelId, temperatureValue == null ? UnDefType.UNDEF : temperatureValue);
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/SmartHomeDeviceStateGroupUpdateCalculator.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/SmartHomeDeviceStateGroupUpdateCalculator.java
index 6a3632ca92a..5674a7c1ad0 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/SmartHomeDeviceStateGroupUpdateCalculator.java
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/SmartHomeDeviceStateGroupUpdateCalculator.java
@@ -106,7 +106,7 @@ public class SmartHomeDeviceStateGroupUpdateCalculator {
             }
         }
         // check which groups needs an update
-        Set<Integer> groupsToUpdate = new HashSet<Integer>();
+        Set<Integer> groupsToUpdate = new HashSet<>();
         for (UpdateGroup group : updateGroups.values()) {
             long millisecondsSinceLastUpdate = updateTimeStamp.getTime() - group.lastUpdated.getTime();
             if (syncAllGroups || millisecondsSinceLastUpdate >= group.intervalInSeconds * 1000) {
diff --git a/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/Group.java b/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/Group.java
index 4be24caf977..605d42a578b 100644
--- a/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/Group.java
+++ b/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/Group.java
@@ -49,7 +49,7 @@ public class Group {
     /**
      * Set of zones belonging to a group
      **/
-    private Set<Integer> zones = new LinkedHashSet<Integer>();
+    private Set<Integer> zones = new LinkedHashSet<>();
 
     @Schema
     /**
diff --git a/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/ValidationError.java b/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/ValidationError.java
index 1d297f0a528..a3cd9f2a447 100644
--- a/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/ValidationError.java
+++ b/bundles/org.openhab.binding.amplipi/src/gen/java/org/openhab/binding/amplipi/internal/model/ValidationError.java
@@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 public class ValidationError {
 
     @Schema(required = true)
-    private List<String> loc = new ArrayList<String>();
+    private List<String> loc = new ArrayList<>();
 
     @Schema(required = true)
     private String msg;
diff --git a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/AndroidTVHandler.java b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/AndroidTVHandler.java
index f060214bfe4..a1d0fe7247b 100644
--- a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/AndroidTVHandler.java
+++ b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/AndroidTVHandler.java
@@ -99,7 +99,7 @@ public class AndroidTVHandler extends BaseThingHandler {
 
     public void updateCDP(String channelName, Map<String, String> cdpMap) {
         logger.trace("{} - Updating CDP for {}", this.thingID, channelName);
-        List<CommandOption> commandOptions = new ArrayList<CommandOption>();
+        List<CommandOption> commandOptions = new ArrayList<>();
         cdpMap.forEach((key, value) -> commandOptions.add(new CommandOption(key, value)));
         logger.trace("{} - CDP List: {}", this.thingID, commandOptions);
         commandDescriptionProvider.setCommandOptions(new ChannelUID(getThing().getUID(), channelName), commandOptions);
diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/calc/SunCalc.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/calc/SunCalc.java
index de3f16e61b9..f00fc4fb1d6 100644
--- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/calc/SunCalc.java
+++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/calc/SunCalc.java
@@ -346,7 +346,7 @@ public class SunCalc {
     public static Map<SunPhaseName, Range> sortByValue(Map<SunPhaseName, Range> map) {
         List<Entry<SunPhaseName, Range>> list = new ArrayList<>(map.entrySet());
 
-        Collections.sort(list, new Comparator<Entry<SunPhaseName, Range>>() {
+        Collections.sort(list, new Comparator<>() {
             @Override
             public int compare(Entry<SunPhaseName, Range> p1, Entry<SunPhaseName, Range> p2) {
                 Range p1Range = p1.getValue();
diff --git a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerBindingConstants.java b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerBindingConstants.java
index e3077131303..aa140b49e42 100644
--- a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerBindingConstants.java
+++ b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerBindingConstants.java
@@ -54,7 +54,7 @@ public class AutomowerBindingConstants {
                                                      // introduce
     // this in a future release
     public static final String LAST_POSITION = GROUP_POSITIONS + "last-position";
-    public static final ArrayList<String> CHANNEL_POSITIONS = new ArrayList<String>(
+    public static final ArrayList<String> CHANNEL_POSITIONS = new ArrayList<>(
             List.of(GROUP_POSITIONS + "position01", GROUP_POSITIONS + "position02", GROUP_POSITIONS + "position03",
                     GROUP_POSITIONS + "position04", GROUP_POSITIONS + "position05", GROUP_POSITIONS + "position06",
                     GROUP_POSITIONS + "position07", GROUP_POSITIONS + "position08", GROUP_POSITIONS + "position09",
diff --git a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/rest/api/automowerconnect/dto/MowerData.java b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/rest/api/automowerconnect/dto/MowerData.java
index f088f8c9fab..3f861c33fee 100644
--- a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/rest/api/automowerconnect/dto/MowerData.java
+++ b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/rest/api/automowerconnect/dto/MowerData.java
@@ -24,7 +24,7 @@ public class MowerData {
     private Calendar calendar;
     private Planner planner;
     private Metadata metadata;
-    private ArrayList<Position> positions = new ArrayList<Position>();
+    private ArrayList<Position> positions = new ArrayList<>();
 
     public System getSystem() {
         return system;
diff --git a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java
index 52797be3f00..b0a87a253cd 100644
--- a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java
+++ b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java
@@ -25,8 +25,6 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.measure.quantity.Dimensionless;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.automower.internal.AutomowerBindingConstants;
@@ -80,7 +78,7 @@ public class AutomowerHandler extends BaseThingHandler {
     private final Logger logger = LoggerFactory.getLogger(AutomowerHandler.class);
     private final TimeZoneProvider timeZoneProvider;
 
-    private AtomicReference<String> automowerId = new AtomicReference<String>(NO_ID);
+    private AtomicReference<String> automowerId = new AtomicReference<>(NO_ID);
     private long lastQueryTimeMs = 0L;
 
     private @Nullable ScheduledFuture<?> automowerPollingJob;
@@ -290,8 +288,8 @@ public class AutomowerHandler extends BaseThingHandler {
 
             updateState(CHANNEL_STATUS_LAST_UPDATE,
                     new DateTimeType(toZonedDateTime(mower.getAttributes().getMetadata().getStatusTimestamp())));
-            updateState(CHANNEL_STATUS_BATTERY, new QuantityType<Dimensionless>(
-                    mower.getAttributes().getBattery().getBatteryPercent(), Units.PERCENT));
+            updateState(CHANNEL_STATUS_BATTERY,
+                    new QuantityType<>(mower.getAttributes().getBattery().getBatteryPercent(), Units.PERCENT));
 
             updateState(CHANNEL_STATUS_ERROR_CODE, new DecimalType(mower.getAttributes().getMower().getErrorCode()));
 
diff --git a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarNonConsecutiveBestPriceResult.java b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarNonConsecutiveBestPriceResult.java
index 7de1b7d0ca4..9b9b768a7b6 100644
--- a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarNonConsecutiveBestPriceResult.java
+++ b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarNonConsecutiveBestPriceResult.java
@@ -37,7 +37,7 @@ public class AwattarNonConsecutiveBestPriceResult extends AwattarBestPriceResult
     public AwattarNonConsecutiveBestPriceResult(int size, ZoneId zoneId) {
         super();
         this.zoneId = zoneId;
-        members = new ArrayList<AwattarPrice>();
+        members = new ArrayList<>();
     }
 
     public void addMember(AwattarPrice member) {
@@ -59,7 +59,7 @@ public class AwattarNonConsecutiveBestPriceResult extends AwattarBestPriceResult
 
     private void sort() {
         if (!sorted) {
-            members.sort(new Comparator<AwattarPrice>() {
+            members.sort(new Comparator<>() {
                 @Override
                 public int compare(AwattarPrice o1, AwattarPrice o2) {
                     return Long.compare(o1.getStartTimestamp(), o2.getStartTimestamp());
diff --git a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestpriceHandler.java b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestpriceHandler.java
index 41b7b8a02e4..091d0c4c7c3 100644
--- a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestpriceHandler.java
+++ b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestpriceHandler.java
@@ -153,7 +153,7 @@ public class AwattarBestpriceHandler extends BaseThingHandler {
 
         AwattarBestPriceResult result;
         if (config.consecutive) {
-            ArrayList<AwattarPrice> range = new ArrayList<AwattarPrice>(config.rangeDuration);
+            ArrayList<AwattarPrice> range = new ArrayList<>(config.rangeDuration);
             range.addAll(getPriceRange(bridgeHandler, timerange,
                     (o1, o2) -> Long.compare(o1.getStartTimestamp(), o2.getStartTimestamp())));
             AwattarConsecutiveBestPriceResult res = new AwattarConsecutiveBestPriceResult(
diff --git a/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveMiniHandler.java b/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveMiniHandler.java
index f9452433581..7731720731d 100644
--- a/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveMiniHandler.java
+++ b/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWaveMiniHandler.java
@@ -17,9 +17,6 @@ import static org.openhab.binding.bluetooth.airthings.internal.AirthingsBindingC
 import java.util.Map;
 import java.util.UUID;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.unit.SIUnits;
@@ -55,15 +52,15 @@ public class AirthingsWaveMiniHandler extends AbstractAirthingsHandler {
             logger.debug("Parsed data: {}", data);
             Number humidity = data.get(AirthingsDataParser.HUMIDITY);
             if (humidity != null) {
-                updateState(CHANNEL_ID_HUMIDITY, new QuantityType<Dimensionless>(humidity, Units.PERCENT));
+                updateState(CHANNEL_ID_HUMIDITY, new QuantityType<>(humidity, Units.PERCENT));
             }
             Number temperature = data.get(AirthingsDataParser.TEMPERATURE);
             if (temperature != null) {
-                updateState(CHANNEL_ID_TEMPERATURE, new QuantityType<Temperature>(temperature, SIUnits.CELSIUS));
+                updateState(CHANNEL_ID_TEMPERATURE, new QuantityType<>(temperature, SIUnits.CELSIUS));
             }
             Number tvoc = data.get(AirthingsDataParser.TVOC);
             if (tvoc != null) {
-                updateState(CHANNEL_ID_TVOC, new QuantityType<Dimensionless>(tvoc, Units.PARTS_PER_BILLION));
+                updateState(CHANNEL_ID_TVOC, new QuantityType<>(tvoc, Units.PARTS_PER_BILLION));
             }
         } catch (AirthingsParserException e) {
             logger.error("Failed to parse data received from Airthings sensor: {}", e.getMessage());
diff --git a/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWavePlusHandler.java b/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWavePlusHandler.java
index 0d02b34c9da..fba99fdc307 100644
--- a/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWavePlusHandler.java
+++ b/bundles/org.openhab.binding.bluetooth.airthings/src/main/java/org/openhab/binding/bluetooth/airthings/internal/AirthingsWavePlusHandler.java
@@ -17,12 +17,7 @@ import static org.openhab.binding.bluetooth.airthings.internal.AirthingsBindingC
 import java.util.Map;
 import java.util.UUID;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Pressure;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.library.dimension.RadiationSpecificActivity;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.unit.SIUnits;
 import org.openhab.core.library.unit.Units;
@@ -57,33 +52,33 @@ public class AirthingsWavePlusHandler extends AbstractAirthingsHandler {
             logger.debug("Parsed data: {}", data);
             Number humidity = data.get(AirthingsDataParser.HUMIDITY);
             if (humidity != null) {
-                updateState(CHANNEL_ID_HUMIDITY, new QuantityType<Dimensionless>(humidity, Units.PERCENT));
+                updateState(CHANNEL_ID_HUMIDITY, new QuantityType<>(humidity, Units.PERCENT));
             }
             Number temperature = data.get(AirthingsDataParser.TEMPERATURE);
             if (temperature != null) {
-                updateState(CHANNEL_ID_TEMPERATURE, new QuantityType<Temperature>(temperature, SIUnits.CELSIUS));
+                updateState(CHANNEL_ID_TEMPERATURE, new QuantityType<>(temperature, SIUnits.CELSIUS));
             }
             Number pressure = data.get(AirthingsDataParser.PRESSURE);
             if (pressure != null) {
-                updateState(CHANNEL_ID_PRESSURE, new QuantityType<Pressure>(pressure, Units.MILLIBAR));
+                updateState(CHANNEL_ID_PRESSURE, new QuantityType<>(pressure, Units.MILLIBAR));
             }
             Number co2 = data.get(AirthingsDataParser.CO2);
             if (co2 != null) {
-                updateState(CHANNEL_ID_CO2, new QuantityType<Dimensionless>(co2, Units.PARTS_PER_MILLION));
+                updateState(CHANNEL_ID_CO2, new QuantityType<>(co2, Units.PARTS_PER_MILLION));
             }
             Number tvoc = data.get(AirthingsDataParser.TVOC);
             if (tvoc != null) {
-                updateState(CHANNEL_ID_TVOC, new QuantityType<Dimensionless>(tvoc, Units.PARTS_PER_BILLION));
+                updateState(CHANNEL_ID_TVOC, new QuantityType<>(tvoc, Units.PARTS_PER_BILLION));
             }
             Number radonShortTermAvg = data.get(AirthingsDataParser.RADON_SHORT_TERM_AVG);
             if (radonShortTermAvg != null) {
-                updateState(CHANNEL_ID_RADON_ST_AVG, new QuantityType<RadiationSpecificActivity>(radonShortTermAvg,
-                        Units.BECQUEREL_PER_CUBIC_METRE));
+                updateState(CHANNEL_ID_RADON_ST_AVG,
+                        new QuantityType<>(radonShortTermAvg, Units.BECQUEREL_PER_CUBIC_METRE));
             }
             Number radonLongTermAvg = data.get(AirthingsDataParser.RADON_LONG_TERM_AVG);
             if (radonLongTermAvg != null) {
                 updateState(CHANNEL_ID_RADON_LT_AVG,
-                        new QuantityType<RadiationSpecificActivity>(radonLongTermAvg, Units.BECQUEREL_PER_CUBIC_METRE));
+                        new QuantityType<>(radonLongTermAvg, Units.BECQUEREL_PER_CUBIC_METRE));
             }
         } catch (AirthingsParserException e) {
             logger.error("Failed to parse data received from Airthings sensor: {}", e.getMessage());
diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java
index 33f14f44620..13dd834ad59 100644
--- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java
+++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetIndoorOutoorTemperatures.java
@@ -74,10 +74,10 @@ public class GetIndoorOutoorTemperatures extends BRC1HCommand {
             }
         }
 
-        indoorTemperature = new QuantityType<Temperature>(iIndoorTemperature, SIUnits.CELSIUS);
+        indoorTemperature = new QuantityType<>(iIndoorTemperature, SIUnits.CELSIUS);
 
         if (iOutdoorTemperature != null) {
-            outdoorTemperature = new QuantityType<Temperature>(iOutdoorTemperature, SIUnits.CELSIUS);
+            outdoorTemperature = new QuantityType<>(iOutdoorTemperature, SIUnits.CELSIUS);
         }
 
         logger.debug("Indoor Temp: {}", indoorTemperature);
diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationHoursCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationHoursCommand.java
index 51e59c77112..def5161ac79 100644
--- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationHoursCommand.java
+++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetOperationHoursCommand.java
@@ -79,9 +79,9 @@ public class GetOperationHoursCommand extends BRC1HCommand {
         Integer iIndoorFanHours = (int) (fanHours.getComputedValue(ByteOrder.LITTLE_ENDIAN));
         Integer iIndoorPowerHours = (int) (powerHours.getComputedValue(ByteOrder.LITTLE_ENDIAN));
 
-        this.indoorOperationHours = new QuantityType<Time>(iIndoorOperationHours, Units.HOUR);
-        this.indoorFanHours = new QuantityType<Time>(iIndoorFanHours, Units.HOUR);
-        this.indoorPowerHours = new QuantityType<Time>(iIndoorPowerHours, Units.HOUR);
+        this.indoorOperationHours = new QuantityType<>(iIndoorOperationHours, Units.HOUR);
+        this.indoorFanHours = new QuantityType<>(iIndoorFanHours, Units.HOUR);
+        this.indoorPowerHours = new QuantityType<>(iIndoorPowerHours, Units.HOUR);
 
         logger.debug("indoorOperationHours: {}", indoorOperationHours);
         logger.debug("indoorFanHours: {}", indoorFanHours);
diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java
index 1dcbcfcbd9a..49edce24694 100644
--- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java
+++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/java/org/openhab/binding/bluetooth/daikinmadoka/internal/model/commands/GetSetpointCommand.java
@@ -59,8 +59,8 @@ public class GetSetpointCommand extends BRC1HCommand {
         Integer iHeatingSetpoint = (int) (heatValue.getComputedValue() / 128.);
         Integer iCoolingSetpoint = (int) (coolValue.getComputedValue() / 128.);
 
-        this.heatingSetpoint = new QuantityType<Temperature>(iHeatingSetpoint, SIUnits.CELSIUS);
-        this.coolingSetpoint = new QuantityType<Temperature>(iCoolingSetpoint, SIUnits.CELSIUS);
+        this.heatingSetpoint = new QuantityType<>(iHeatingSetpoint, SIUnits.CELSIUS);
+        this.coolingSetpoint = new QuantityType<>(iCoolingSetpoint, SIUnits.CELSIUS);
 
         logger.debug("heatingSetpoint: {}", heatingSetpoint);
         logger.debug("coolingSetpoint: {}", coolingSetpoint);
diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java
index a3e1f82cbcb..0dcaa0a0dad 100644
--- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java
+++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/test/java/org/openhab/binding/bluetooth/daikinmadoka/handler/DummyThing.java
@@ -50,12 +50,12 @@ public class DummyThing implements Thing {
 
     @Override
     public List<@NonNull Channel> getChannels() {
-        return new ArrayList<Channel>();
+        return new ArrayList<>();
     }
 
     @Override
     public List<@NonNull Channel> getChannelsOfGroup(String channelGroupId) {
-        return new ArrayList<Channel>();
+        return new ArrayList<>();
     }
 
     @Override
@@ -117,7 +117,7 @@ public class DummyThing implements Thing {
 
     @Override
     public Map<@NonNull String, @NonNull String> getProperties() {
-        return new HashMap<String, String>();
+        return new HashMap<>();
     }
 
     @Override
diff --git a/bundles/org.openhab.binding.bluetooth.generic/src/main/java/org/openhab/binding/bluetooth/generic/internal/BluetoothUnit.java b/bundles/org.openhab.binding.bluetooth.generic/src/main/java/org/openhab/binding/bluetooth/generic/internal/BluetoothUnit.java
index c0a643e9c10..c93a22ccc18 100644
--- a/bundles/org.openhab.binding.bluetooth.generic/src/main/java/org/openhab/binding/bluetooth/generic/internal/BluetoothUnit.java
+++ b/bundles/org.openhab.binding.bluetooth.generic/src/main/java/org/openhab/binding/bluetooth/generic/internal/BluetoothUnit.java
@@ -228,18 +228,18 @@ public enum BluetoothUnit {
     @Deprecated
     public static class BUnits {
         public static final Unit<ArealDensity> KILOGRAM_PER_SQUARE_METER = addUnit(
-                new ProductUnit<ArealDensity>(SIUnits.KILOGRAM.divide(SIUnits.SQUARE_METRE)));
+                new ProductUnit<>(SIUnits.KILOGRAM.divide(SIUnits.SQUARE_METRE)));
 
         public static final Unit<RadiationDoseAbsorptionRate> GRAY_PER_SECOND = addUnit(
-                new ProductUnit<RadiationDoseAbsorptionRate>(Units.GRAY.divide(Units.SECOND)));
+                new ProductUnit<>(Units.GRAY.divide(Units.SECOND)));
 
         public static final Unit<Mass> POUND = addUnit(
-                new TransformedUnit<Mass>(SIUnits.KILOGRAM, MultiplyConverter.of(0.45359237)));
+                new TransformedUnit<>(SIUnits.KILOGRAM, MultiplyConverter.of(0.45359237)));
 
-        public static final Unit<Angle> MINUTE_ANGLE = addUnit(new TransformedUnit<Angle>(Units.RADIAN,
+        public static final Unit<Angle> MINUTE_ANGLE = addUnit(new TransformedUnit<>(Units.RADIAN,
                 MultiplyConverter.ofPiExponent(1).concatenate(MultiplyConverter.ofRational(1, 180 * 60))));
 
-        public static final Unit<Angle> SECOND_ANGLE = addUnit(new TransformedUnit<Angle>(Units.RADIAN,
+        public static final Unit<Angle> SECOND_ANGLE = addUnit(new TransformedUnit<>(Units.RADIAN,
                 MultiplyConverter.ofPiExponent(1).concatenate(MultiplyConverter.ofRational(1, 180 * 60 * 60))));
 
         public static final Unit<Area> HECTARE = addUnit(SIUnits.SQUARE_METRE.multiply(10000.0));
@@ -248,54 +248,51 @@ public enum BluetoothUnit {
         public static final Unit<Length> NAUTICAL_MILE = addUnit(SIUnits.METRE.multiply(1852.0));
 
         public static final Unit<RadiantIntensity> WATT_PER_STERADIAN = addUnit(
-                new ProductUnit<RadiantIntensity>(Units.WATT.divide(Units.STERADIAN)));
+                new ProductUnit<>(Units.WATT.divide(Units.STERADIAN)));
 
         public static final Unit<Radiance> WATT_PER_STERADIAN_PER_SQUARE_METRE = addUnit(
-                new ProductUnit<Radiance>(WATT_PER_STERADIAN.divide(SIUnits.SQUARE_METRE)));
+                new ProductUnit<>(WATT_PER_STERADIAN.divide(SIUnits.SQUARE_METRE)));
 
-        public static final Unit<Frequency> CYCLES_PER_MINUTE = addUnit(new TransformedUnit<Frequency>(Units.HERTZ,
+        public static final Unit<Frequency> CYCLES_PER_MINUTE = addUnit(new TransformedUnit<>(Units.HERTZ,
                 MultiplyConverter.ofRational(BigInteger.valueOf(60), BigInteger.ONE)));
 
-        public static final Unit<Angle> REVOLUTION = addUnit(new TransformedUnit<Angle>(Units.RADIAN,
+        public static final Unit<Angle> REVOLUTION = addUnit(new TransformedUnit<>(Units.RADIAN,
                 MultiplyConverter.ofPiExponent(1).concatenate(MultiplyConverter.ofRational(2, 1))));
         public static final Unit<AngularVelocity> REVOLUTION_PER_MINUTE = addUnit(
-                new ProductUnit<AngularVelocity>(REVOLUTION.divide(Units.MINUTE)));
+                new ProductUnit<>(REVOLUTION.divide(Units.MINUTE)));
 
         public static final Unit<Dimensionless> STEPS = addUnit(Units.ONE.alternate("steps"));
         public static final Unit<Dimensionless> BEATS = addUnit(Units.ONE.alternate("beats"));
         public static final Unit<Dimensionless> STROKE = addUnit(Units.ONE.alternate("stroke"));
 
-        public static final Unit<Frequency> STEP_PER_MINUTE = addUnit(
-                new ProductUnit<Frequency>(STEPS.divide(Units.MINUTE)));
+        public static final Unit<Frequency> STEP_PER_MINUTE = addUnit(new ProductUnit<>(STEPS.divide(Units.MINUTE)));
 
-        public static final Unit<Frequency> BEATS_PER_MINUTE = addUnit(
-                new ProductUnit<Frequency>(BEATS.divide(Units.MINUTE)));
+        public static final Unit<Frequency> BEATS_PER_MINUTE = addUnit(new ProductUnit<>(BEATS.divide(Units.MINUTE)));
 
-        public static final Unit<Frequency> STROKE_PER_MINUTE = addUnit(
-                new ProductUnit<Frequency>(STROKE.divide(Units.MINUTE)));
+        public static final Unit<Frequency> STROKE_PER_MINUTE = addUnit(new ProductUnit<>(STROKE.divide(Units.MINUTE)));
 
         public static final Unit<MassFlowRate> GRAM_PER_SECOND = addUnit(
-                new ProductUnit<MassFlowRate>(SIUnits.GRAM.divide(Units.SECOND)));
+                new ProductUnit<>(SIUnits.GRAM.divide(Units.SECOND)));
 
         public static final Unit<LuminousEfficacy> LUMEN_PER_WATT = addUnit(
-                new ProductUnit<LuminousEfficacy>(Units.LUMEN.divide(Units.WATT)));
+                new ProductUnit<>(Units.LUMEN.divide(Units.WATT)));
 
         public static final Unit<LuminousEnergy> LUMEN_SECOND = addUnit(
-                new ProductUnit<LuminousEnergy>(Units.LUMEN.multiply(Units.SECOND)));
+                new ProductUnit<>(Units.LUMEN.multiply(Units.SECOND)));
 
         public static final Unit<LuminousEnergy> LUMEN_HOUR = addUnit(
-                new ProductUnit<LuminousEnergy>(Units.LUMEN.multiply(Units.HOUR)));
+                new ProductUnit<>(Units.LUMEN.multiply(Units.HOUR)));
 
         public static final Unit<ElectricCharge> AMPERE_HOUR = addUnit(
-                new ProductUnit<ElectricCharge>(Units.AMPERE.multiply(Units.HOUR)));
+                new ProductUnit<>(Units.AMPERE.multiply(Units.HOUR)));
 
         public static final Unit<LuminousExposure> LUX_HOUR = addUnit(
-                new ProductUnit<LuminousExposure>(Units.LUX.multiply(Units.HOUR)));
+                new ProductUnit<>(Units.LUX.multiply(Units.HOUR)));
 
         public static final Unit<Speed> KILOMETRE_PER_MINUTE = addUnit(SIUnits.KILOMETRE_PER_HOUR.multiply(60.0));
 
         public static final Unit<VolumetricFlowRate> LITRE_PER_SECOND = addUnit(
-                new ProductUnit<VolumetricFlowRate>(Units.LITRE.divide(Units.SECOND)));
+                new ProductUnit<>(Units.LITRE.divide(Units.SECOND)));
 
         static {
             SimpleUnitFormat.getInstance().label(GRAY_PER_SECOND, "Gy/s");
diff --git a/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetBatteryCommand.java b/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetBatteryCommand.java
index c3a2fcc423d..ad714176037 100644
--- a/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetBatteryCommand.java
+++ b/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetBatteryCommand.java
@@ -46,7 +46,7 @@ public class GetBatteryCommand extends GetCommand {
         }
         if (data != null) {
             int value = data[0] & 0xFF;
-            resultHandler.complete(new QuantityType<Dimensionless>(value, Units.PERCENT));
+            resultHandler.complete(new QuantityType<>(value, Units.PERCENT));
         } else {
             resultHandler.complete(null);
         }
diff --git a/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetHumWarningCommand.java b/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetHumWarningCommand.java
index 820a015c883..912b3c58925 100644
--- a/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetHumWarningCommand.java
+++ b/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetHumWarningCommand.java
@@ -86,12 +86,12 @@ public class GetOrSetHumWarningCommand extends GoveeCommand {
             resultHandler.completeExceptionally(th);
         }
         if (data != null) {
-            WarningSettingsDTO<Dimensionless> result = new WarningSettingsDTO<Dimensionless>();
+            WarningSettingsDTO<Dimensionless> result = new WarningSettingsDTO<>();
 
             ByteBuffer buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN);
             result.enableAlarm = OnOffType.from(buffer.get() == 1);
-            result.min = new QuantityType<Dimensionless>(buffer.getShort() / 100.0, Units.PERCENT);
-            result.max = new QuantityType<Dimensionless>(buffer.getShort() / 100.0, Units.PERCENT);
+            result.min = new QuantityType<>(buffer.getShort() / 100.0, Units.PERCENT);
+            result.max = new QuantityType<>(buffer.getShort() / 100.0, Units.PERCENT);
 
             resultHandler.complete(result);
         } else {
diff --git a/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetTemWarningCommand.java b/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetTemWarningCommand.java
index 9b69de5def1..8c7802b57a0 100644
--- a/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetTemWarningCommand.java
+++ b/bundles/org.openhab.binding.bluetooth.govee/src/main/java/org/openhab/binding/bluetooth/govee/internal/command/hygrometer/GetOrSetTemWarningCommand.java
@@ -81,12 +81,12 @@ public class GetOrSetTemWarningCommand extends GoveeCommand {
             resultHandler.completeExceptionally(th);
         }
         if (data != null) {
-            WarningSettingsDTO<Temperature> result = new WarningSettingsDTO<Temperature>();
+            WarningSettingsDTO<Temperature> result = new WarningSettingsDTO<>();
 
             ByteBuffer buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN);
             result.enableAlarm = OnOffType.from(buffer.get() == 1);
-            result.min = new QuantityType<Temperature>(buffer.getShort() / 100.0, SIUnits.CELSIUS);
-            result.max = new QuantityType<Temperature>(buffer.getShort() / 100.0, SIUnits.CELSIUS);
+            result.min = new QuantityType<>(buffer.getShort() / 100.0, SIUnits.CELSIUS);
+            result.max = new QuantityType<>(buffer.getShort() / 100.0, SIUnits.CELSIUS);
 
             resultHandler.complete(result);
         } else {
diff --git a/bundles/org.openhab.binding.bluetooth.radoneye/src/main/java/org/openhab/binding/bluetooth/radoneye/internal/RadoneyeHandler.java b/bundles/org.openhab.binding.bluetooth.radoneye/src/main/java/org/openhab/binding/bluetooth/radoneye/internal/RadoneyeHandler.java
index a354e09e8cc..28095c9db03 100644
--- a/bundles/org.openhab.binding.bluetooth.radoneye/src/main/java/org/openhab/binding/bluetooth/radoneye/internal/RadoneyeHandler.java
+++ b/bundles/org.openhab.binding.bluetooth.radoneye/src/main/java/org/openhab/binding/bluetooth/radoneye/internal/RadoneyeHandler.java
@@ -18,7 +18,6 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.library.dimension.Density;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.thing.Thing;
 import org.slf4j.Logger;
@@ -57,7 +56,7 @@ public class RadoneyeHandler extends AbstractRadoneyeHandler {
             Number radon = data.get(RadoneyeDataParser.RADON);
             logger.debug("Parsed data radon number: {}", radon);
             if (radon != null) {
-                updateState(CHANNEL_ID_RADON, new QuantityType<Density>(radon, BECQUEREL_PER_CUBIC_METRE));
+                updateState(CHANNEL_ID_RADON, new QuantityType<>(radon, BECQUEREL_PER_CUBIC_METRE));
             }
         } catch (RadoneyeParserException e) {
             logger.error("Failed to parse data received from Radoneye sensor: {}", e.getMessage());
diff --git a/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/notification/BluetoothScanNotification.java b/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/notification/BluetoothScanNotification.java
index 820a9ffda93..6ede74cd85d 100644
--- a/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/notification/BluetoothScanNotification.java
+++ b/bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/notification/BluetoothScanNotification.java
@@ -45,7 +45,7 @@ public class BluetoothScanNotification extends BluetoothNotification {
      * Key: UUID of the service
      * Value: Data of the characteristic
      */
-    private Map<String, byte[]> serviceData = new HashMap<String, byte[]>();
+    private Map<String, byte[]> serviceData = new HashMap<>();
 
     /**
      * The beacon type
diff --git a/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java b/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java
index 0238641c46d..14484aa3785 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java
+++ b/bundles/org.openhab.binding.bondhome/src/main/java/org/openhab/binding/bondhome/internal/handler/BondDeviceHandler.java
@@ -526,7 +526,7 @@ public class BondDeviceHandler extends BaseThingHandler {
 
     private void updateDevicePropertiesFromBond(BondDevice devInfo, BondDeviceProperties devProperties) {
         // Update all the thing properties based on the result
-        Map<String, String> thingProperties = new HashMap<String, String>();
+        Map<String, String> thingProperties = new HashMap<>();
         updateProperty(thingProperties, CONFIG_DEVICE_ID, config.deviceId);
         logger.trace("Updating device name to {}", devInfo.name);
         updateProperty(thingProperties, PROPERTIES_DEVICE_NAME, devInfo.name);
diff --git a/bundles/org.openhab.binding.boschindego/src/main/java/org/openhab/binding/boschindego/internal/handler/BoschAccountHandler.java b/bundles/org.openhab.binding.boschindego/src/main/java/org/openhab/binding/boschindego/internal/handler/BoschAccountHandler.java
index 2fe8c0e0702..3286e336e75 100644
--- a/bundles/org.openhab.binding.boschindego/src/main/java/org/openhab/binding/boschindego/internal/handler/BoschAccountHandler.java
+++ b/bundles/org.openhab.binding.boschindego/src/main/java/org/openhab/binding/boschindego/internal/handler/BoschAccountHandler.java
@@ -174,7 +174,7 @@ public class BoschAccountHandler extends BaseBridgeHandler implements Authorizat
 
     public Collection<DevicePropertiesResponse> getDevices() throws IndegoException {
         Collection<String> serialNumbers = controller.getSerialNumbers();
-        List<DevicePropertiesResponse> devices = new ArrayList<DevicePropertiesResponse>(serialNumbers.size());
+        List<DevicePropertiesResponse> devices = new ArrayList<>(serialNumbers.size());
 
         for (String serialNumber : serialNumbers) {
             DevicePropertiesResponse properties = controller.getDeviceProperties(serialNumber);
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandler.java
index 951d3eb66fe..d02a8d42fbe 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandler.java
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandler.java
@@ -16,9 +16,6 @@ import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConst
 
 import java.util.List;
 
-import javax.measure.quantity.Energy;
-import javax.measure.quantity.Power;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.boschshc.internal.exceptions.BoschSHCException;
 import org.openhab.binding.boschshc.internal.services.powermeter.PowerMeterService;
@@ -87,9 +84,8 @@ public abstract class AbstractPowerSwitchHandler extends BoschSHCDeviceHandler {
      * @param state Current state of {@link PowerMeterService}.
      */
     private void updateChannels(PowerMeterServiceState state) {
-        super.updateState(CHANNEL_POWER_CONSUMPTION, new QuantityType<Power>(state.powerConsumption, Units.WATT));
-        super.updateState(CHANNEL_ENERGY_CONSUMPTION,
-                new QuantityType<Energy>(state.energyConsumption, Units.WATT_HOUR));
+        super.updateState(CHANNEL_POWER_CONSUMPTION, new QuantityType<>(state.powerConsumption, Units.WATT));
+        super.updateState(CHANNEL_ENERGY_CONSUMPTION, new QuantityType<>(state.energyConsumption, Units.WATT_HOUR));
     }
 
     /**
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java
index 5bc4b6fed08..afc7ebba266 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java
@@ -16,9 +16,6 @@ import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConst
 
 import java.util.List;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.boschshc.internal.devices.AbstractSmokeDetectorHandler;
 import org.openhab.binding.boschshc.internal.exceptions.BoschSHCException;
@@ -55,11 +52,11 @@ public class TwinguardHandler extends AbstractSmokeDetectorHandler {
     }
 
     private void updateChannels(AirQualityLevelServiceState state) {
-        updateState(CHANNEL_TEMPERATURE, new QuantityType<Temperature>(state.temperature, SIUnits.CELSIUS));
+        updateState(CHANNEL_TEMPERATURE, new QuantityType<>(state.temperature, SIUnits.CELSIUS));
         updateState(CHANNEL_TEMPERATURE_RATING, new StringType(state.temperatureRating));
-        updateState(CHANNEL_HUMIDITY, new QuantityType<Dimensionless>(state.humidity, Units.PERCENT));
+        updateState(CHANNEL_HUMIDITY, new QuantityType<>(state.humidity, Units.PERCENT));
         updateState(CHANNEL_HUMIDITY_RATING, new StringType(state.humidityRating));
-        updateState(CHANNEL_PURITY, new QuantityType<Dimensionless>(state.purity, Units.PARTS_PER_MILLION));
+        updateState(CHANNEL_PURITY, new QuantityType<>(state.purity, Units.PARTS_PER_MILLION));
         updateState(CHANNEL_PURITY_RATING, new StringType(state.purityRating));
         updateState(CHANNEL_AIR_DESCRIPTION, new StringType(state.description));
         updateState(CHANNEL_COMBINED_RATING, new StringType(state.combinedRating));
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandlerTest.java
index fb7bd6a55c6..923776f8639 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandlerTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractPowerSwitchHandlerTest.java
@@ -134,7 +134,7 @@ public abstract class AbstractPowerSwitchHandlerTest<T extends AbstractPowerSwit
         getFixture().handleCommand(getChannelUID(BoschSHCBindingConstants.CHANNEL_POWER_CONSUMPTION),
                 RefreshType.REFRESH);
         verify(getCallback()).stateUpdated(getChannelUID(BoschSHCBindingConstants.CHANNEL_POWER_CONSUMPTION),
-                new QuantityType<Power>(12.34d, Units.WATT));
+                new QuantityType<>(12.34d, Units.WATT));
     }
 
     @Test
@@ -142,6 +142,6 @@ public abstract class AbstractPowerSwitchHandlerTest<T extends AbstractPowerSwit
         getFixture().handleCommand(getChannelUID(BoschSHCBindingConstants.CHANNEL_ENERGY_CONSUMPTION),
                 RefreshType.REFRESH);
         verify(getCallback()).stateUpdated(getChannelUID(BoschSHCBindingConstants.CHANNEL_ENERGY_CONSUMPTION),
-                new QuantityType<Energy>(56.78d, Units.WATT_HOUR));
+                new QuantityType<>(56.78d, Units.WATT_HOUR));
     }
 }
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollingTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollingTest.java
index 7b4ea728883..596ea19dad0 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollingTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/LongPollingTest.java
@@ -165,12 +165,12 @@ class LongPollingTest {
         @Override
         public ScheduledFuture<?> schedule(@Nullable Runnable command, long delay, @Nullable TimeUnit unit) {
             // not used in this tests
-            return new NullScheduledFuture<Object>();
+            return new NullScheduledFuture<>();
         }
 
         @Override
         public <V> ScheduledFuture<V> schedule(@Nullable Callable<V> callable, long delay, @Nullable TimeUnit unit) {
-            return new NullScheduledFuture<V>();
+            return new NullScheduledFuture<>();
         }
 
         @Override
@@ -179,7 +179,7 @@ class LongPollingTest {
             if (command != null) {
                 command.run();
             }
-            return new NullScheduledFuture<Object>();
+            return new NullScheduledFuture<>();
         }
 
         @Override
@@ -188,7 +188,7 @@ class LongPollingTest {
             if (command != null) {
                 command.run();
             }
-            return new NullScheduledFuture<Object>();
+            return new NullScheduledFuture<>();
         }
     }
 
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandlerTest.java
index ac15ab79dda..128d28aa036 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandlerTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandlerTest.java
@@ -87,7 +87,7 @@ class ClimateControlHandlerTest extends AbstractBoschSHCDeviceHandlerTest<Climat
         getFixture().processUpdate("TemperatureLevel", jsonObject);
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_TEMPERATURE),
-                new QuantityType<Temperature>(21.5, SIUnits.CELSIUS));
+                new QuantityType<>(21.5, SIUnits.CELSIUS));
     }
 
     @Test
@@ -101,6 +101,6 @@ class ClimateControlHandlerTest extends AbstractBoschSHCDeviceHandlerTest<Climat
         getFixture().processUpdate("RoomClimateControl", jsonObject);
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SETPOINT_TEMPERATURE),
-                new QuantityType<Temperature>(21.5, SIUnits.CELSIUS));
+                new QuantityType<>(21.5, SIUnits.CELSIUS));
     }
 }
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandlerTest.java
index 94c4ea2fc9f..cd4577198b9 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandlerTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/thermostat/ThermostatHandlerTest.java
@@ -19,8 +19,6 @@ import static org.mockito.Mockito.verify;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -130,7 +128,7 @@ class ThermostatHandlerTest extends AbstractBatteryPoweredDeviceHandlerTest<Ther
         getFixture().processUpdate("TemperatureLevel", jsonObject);
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_TEMPERATURE),
-                new QuantityType<Temperature>(21.5, SIUnits.CELSIUS));
+                new QuantityType<>(21.5, SIUnits.CELSIUS));
     }
 
     @Test
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java
index cfd4fbcafde..8ee8c657d90 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java
@@ -14,9 +14,6 @@ package org.openhab.binding.boschshc.internal.devices.twinguard;
 
 import static org.mockito.Mockito.verify;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;
 import org.openhab.binding.boschshc.internal.devices.AbstractSmokeDetectorHandlerTest;
@@ -66,7 +63,7 @@ class TwinguardHandlerTest extends AbstractSmokeDetectorHandlerTest<TwinguardHan
 
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_TEMPERATURE),
-                new QuantityType<Temperature>(23.77, SIUnits.CELSIUS));
+                new QuantityType<>(23.77, SIUnits.CELSIUS));
 
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_TEMPERATURE_RATING),
@@ -74,14 +71,14 @@ class TwinguardHandlerTest extends AbstractSmokeDetectorHandlerTest<TwinguardHan
 
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_HUMIDITY),
-                new QuantityType<Dimensionless>(32.69, Units.PERCENT));
+                new QuantityType<>(32.69, Units.PERCENT));
 
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_HUMIDITY_RATING),
                 new StringType("MEDIUM"));
 
         verify(getCallback()).stateUpdated(new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_PURITY),
-                new QuantityType<Dimensionless>(620, Units.PARTS_PER_MILLION));
+                new QuantityType<>(620, Units.PARTS_PER_MILLION));
 
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_PURITY_RATING),
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/wallthermostat/WallThermostatHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/wallthermostat/WallThermostatHandlerTest.java
index 335de42dd7d..dae015eab21 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/wallthermostat/WallThermostatHandlerTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/wallthermostat/WallThermostatHandlerTest.java
@@ -14,9 +14,6 @@ package org.openhab.binding.boschshc.internal.devices.wallthermostat;
 
 import static org.mockito.Mockito.verify;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;
 import org.openhab.binding.boschshc.internal.devices.AbstractBatteryPoweredDeviceHandlerTest;
@@ -65,7 +62,7 @@ class WallThermostatHandlerTest extends AbstractBatteryPoweredDeviceHandlerTest<
         getFixture().processUpdate("TemperatureLevel", jsonObject);
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_TEMPERATURE),
-                new QuantityType<Temperature>(21.5, SIUnits.CELSIUS));
+                new QuantityType<>(21.5, SIUnits.CELSIUS));
     }
 
     @Test
@@ -75,6 +72,6 @@ class WallThermostatHandlerTest extends AbstractBatteryPoweredDeviceHandlerTest<
         getFixture().processUpdate("HumidityLevel", jsonObject);
         verify(getCallback()).stateUpdated(
                 new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_HUMIDITY),
-                new QuantityType<Dimensionless>(42.5, Units.PERCENT));
+                new QuantityType<>(42.5, Units.PERCENT));
     }
 }
diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java
index 486d949eb65..e37f752f60f 100644
--- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java
+++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/SmartherApi.java
@@ -201,7 +201,7 @@ public class SmartherApi {
         switch (settings.getMode()) {
             case AUTOMATIC:
                 // {"function":"heating","mode":"automatic","programs":[{"number":0}]}
-                Map<String, Integer> programMap = new IdentityHashMap<String, Integer>();
+                Map<String, Integer> programMap = new IdentityHashMap<>();
                 programMap.put(ATTR_NUMBER, Integer.valueOf(settings.getProgram()));
                 List<Map<String, Integer>> programsList = new ArrayList<>();
                 programsList.add(programMap);
@@ -213,7 +213,7 @@ public class SmartherApi {
                 if (newTemperature == null) {
                     throw new SmartherGatewayException("Invalid temperature unit transformation");
                 }
-                Map<String, Object> setPointMap = new IdentityHashMap<String, Object>();
+                Map<String, Object> setPointMap = new IdentityHashMap<>();
                 setPointMap.put(ATTR_VALUE, newTemperature.doubleValue());
                 setPointMap.put(ATTR_UNIT, MeasureUnit.CELSIUS.getValue());
                 rootMap.put(ATTR_SETPOINT, setPointMap);
@@ -305,7 +305,7 @@ public class SmartherApi {
     public String subscribePlant(String plantId, String notificationUrl) throws SmartherGatewayException {
         try {
             // Prepare request payload
-            Map<String, Object> rootMap = new IdentityHashMap<String, Object>();
+            Map<String, Object> rootMap = new IdentityHashMap<>();
             rootMap.put(ATTR_ENDPOINT_URL, notificationUrl);
             final String jsonPayload = ModelUtil.gsonInstance().toJson(rootMap);
             // Send request to server
diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java
index 2990f3e95c1..cd63ca4b9cc 100644
--- a/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java
+++ b/bundles/org.openhab.binding.bticinosmarther/src/main/java/org/openhab/binding/bticinosmarther/internal/api/dto/Measure.java
@@ -14,9 +14,6 @@ package org.openhab.binding.bticinosmarther.internal.api.dto;
 
 import java.util.Optional;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.openhab.binding.bticinosmarther.internal.api.dto.Enums.MeasureUnit;
 import org.openhab.binding.bticinosmarther.internal.api.exception.SmartherIllegalPropertyValueException;
 import org.openhab.binding.bticinosmarther.internal.util.StringUtil;
@@ -91,16 +88,15 @@ public class Measure {
 
         switch (MeasureUnit.fromValue(unit)) {
             case CELSIUS:
-                state = optValue.<State> map(t -> new QuantityType<Temperature>(new DecimalType(t), SIUnits.CELSIUS))
+                state = optValue.<State> map(t -> new QuantityType<>(new DecimalType(t), SIUnits.CELSIUS))
                         .orElse(UnDefType.UNDEF);
                 break;
             case FAHRENHEIT:
-                state = optValue
-                        .<State> map(t -> new QuantityType<Temperature>(new DecimalType(t), ImperialUnits.FAHRENHEIT))
+                state = optValue.<State> map(t -> new QuantityType<>(new DecimalType(t), ImperialUnits.FAHRENHEIT))
                         .orElse(UnDefType.UNDEF);
                 break;
             case PERCENTAGE:
-                state = optValue.<State> map(t -> new QuantityType<Dimensionless>(new DecimalType(t), Units.PERCENT))
+                state = optValue.<State> map(t -> new QuantityType<>(new DecimalType(t), Units.PERCENT))
                         .orElse(UnDefType.UNDEF);
                 break;
             case DIMENSIONLESS:
diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java
index 01c8027764c..050d77656d5 100644
--- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java
+++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ThingHandlerPanel.java
@@ -156,7 +156,7 @@ public class ThingHandlerPanel extends CaddxBaseThingHandler {
         communicatorStackPointer = pointer;
 
         // build map of log message channels to event numbers
-        HashMap<String, String> map = new HashMap<String, String>();
+        HashMap<String, String> map = new HashMap<>();
         map.put(pointer, CaddxBindingConstants.PANEL_LOG_MESSAGE_N_0);
         bridgeHandler.sendCommand(CaddxMessageContext.COMMAND, CaddxBindingConstants.PANEL_LOG_EVENT_REQUEST, pointer);
         panelLogMessagesMap = map;
@@ -194,7 +194,7 @@ public class ThingHandlerPanel extends CaddxBaseThingHandler {
         }
 
         if (communicatorStackPointer != null && eventNumberString.equals(communicatorStackPointer)) {
-            HashMap<String, String> map = new HashMap<String, String>();
+            HashMap<String, String> map = new HashMap<>();
 
             int eventNumber = Integer.parseInt(eventNumberString);
             int eventSize = Integer.parseInt(eventSizeString);
diff --git a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/CBusBindingConstants.java b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/CBusBindingConstants.java
index 78ddecbcb57..4ba37cdee90 100644
--- a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/CBusBindingConstants.java
+++ b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/CBusBindingConstants.java
@@ -55,10 +55,10 @@ public class CBusBindingConstants {
     public static final String CHANNEL_TEMP = "temp";
     public static final String CHANNEL_VALUE = "value";
 
-    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<ThingTypeUID>(
+    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<>(
             Arrays.asList(BRIDGE_TYPE_CGATE, BRIDGE_TYPE_NETWORK, THING_TYPE_GROUP, THING_TYPE_LIGHT,
                     THING_TYPE_TEMPERATURE, THING_TYPE_TRIGGER, THING_TYPE_DALI));
-    public static final Set<ThingTypeUID> NETWORK_DISCOVERY_THING_TYPES_UIDS = new HashSet<ThingTypeUID>(
+    public static final Set<ThingTypeUID> NETWORK_DISCOVERY_THING_TYPES_UIDS = new HashSet<>(
             Arrays.asList(BRIDGE_TYPE_NETWORK));
 
     public static final String CONFIG_NETWORK_ID = "id";
diff --git a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/CBusHandlerFactory.java b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/CBusHandlerFactory.java
index 0d77d14a58d..bb11dd256aa 100644
--- a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/CBusHandlerFactory.java
+++ b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/CBusHandlerFactory.java
@@ -100,12 +100,12 @@ public class CBusHandlerFactory extends BaseThingHandlerFactory {
     private void registerDeviceDiscoveryService(CBusCGateHandler cbusCgateHandler) {
         CBusNetworkDiscovery discoveryService = new CBusNetworkDiscovery(cbusCgateHandler);
         cbusCGateHandlerServiceReg = super.bundleContext.registerService(DiscoveryService.class.getName(),
-                discoveryService, new Hashtable<String, Object>());
+                discoveryService, new Hashtable<>());
     }
 
     private void registerDeviceDiscoveryService(CBusNetworkHandler cbusNetworkHandler) {
         CBusGroupDiscovery discoveryService = new CBusGroupDiscovery(cbusNetworkHandler);
         cbusNetworkHandlerServiceReg = bundleContext.registerService(DiscoveryService.class.getName(), discoveryService,
-                new Hashtable<String, Object>());
+                new Hashtable<>());
     }
 }
diff --git a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/discovery/CBusGroupDiscovery.java b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/discovery/CBusGroupDiscovery.java
index f744f044b5e..b14cee1f543 100644
--- a/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/discovery/CBusGroupDiscovery.java
+++ b/bundles/org.openhab.binding.cbus/src/main/java/org/openhab/binding/cbus/internal/discovery/CBusGroupDiscovery.java
@@ -60,7 +60,7 @@ public class CBusGroupDiscovery extends AbstractDiscoveryService {
                 return;
             }
             try {
-                Map<Integer, ThingTypeUID> applications = new HashMap<Integer, ThingTypeUID>();
+                Map<Integer, ThingTypeUID> applications = new HashMap<>();
                 applications.put(CBusBindingConstants.CBUS_APPLICATION_LIGHTING, CBusBindingConstants.THING_TYPE_LIGHT);
                 applications.put(CBusBindingConstants.CBUS_APPLICATION_DALI, CBusBindingConstants.THING_TYPE_DALI);
                 applications.put(CBusBindingConstants.CBUS_APPLICATION_TEMPERATURE,
diff --git a/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirCommand.java b/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirCommand.java
index 4ee0957f055..ec9565947ab 100644
--- a/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirCommand.java
+++ b/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirCommand.java
@@ -51,7 +51,7 @@ public class ComfoAirCommand {
 
     public ComfoAirCommand(String key, @Nullable Integer requestCmd, @Nullable Integer replyCmd, int[] data,
             @Nullable Integer dataPosition, @Nullable Integer requestValue) {
-        this.keys = new ArrayList<String>();
+        this.keys = new ArrayList<>();
         this.keys.add(key);
         this.requestCmd = requestCmd;
         this.replyCmd = replyCmd;
@@ -64,7 +64,7 @@ public class ComfoAirCommand {
      * Constructor for basic read command
      */
     public ComfoAirCommand(String key) {
-        this.keys = new ArrayList<String>();
+        this.keys = new ArrayList<>();
         this.keys.add(key);
         ComfoAirCommandType commandType = ComfoAirCommandType.getCommandTypeByKey(key);
         if (commandType != null) {
diff --git a/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/dto/CoronaStatsCases.java b/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/dto/CoronaStatsCases.java
index b1f990ec0f7..d8129a9c35e 100644
--- a/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/dto/CoronaStatsCases.java
+++ b/bundles/org.openhab.binding.coronastats/src/main/java/org/openhab/binding/coronastats/internal/dto/CoronaStatsCases.java
@@ -17,8 +17,6 @@ import static org.openhab.binding.coronastats.internal.CoronaStatsBindingConstan
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.measure.quantity.Dimensionless;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.unit.Units;
@@ -58,7 +56,7 @@ public class CoronaStatsCases {
         if (count == -1) {
             return UnDefType.NULL;
         } else {
-            return new QuantityType<Dimensionless>(count, Units.ONE);
+            return new QuantityType<>(count, Units.ONE);
         }
     }
 }
diff --git a/bundles/org.openhab.binding.dali/src/main/java/org/openhab/binding/dali/internal/protocol/DaliFrame.java b/bundles/org.openhab.binding.dali/src/main/java/org/openhab/binding/dali/internal/protocol/DaliFrame.java
index 11e7cde2d1f..6a2c1945be7 100644
--- a/bundles/org.openhab.binding.dali/src/main/java/org/openhab/binding/dali/internal/protocol/DaliFrame.java
+++ b/bundles/org.openhab.binding.dali/src/main/java/org/openhab/binding/dali/internal/protocol/DaliFrame.java
@@ -57,7 +57,7 @@ public class DaliFrame {
 
     public byte[] pack() {
         int remaining = length();
-        List<Byte> bytesList = new ArrayList<Byte>();
+        List<Byte> bytesList = new ArrayList<>();
         int tmp = this.data;
         while (remaining > 0) {
             bytesList.add((byte) (tmp & 0xff));
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java
index c8c8eb947e3..a21e9564062 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java
@@ -428,7 +428,7 @@ public final class EventAttribute<VALUE_TYPE, STATE_TYPE extends State>
      * Used for derived attributes that can't be set.
      */
     private static <VALUE_TYPE> BiConsumer<Event, VALUE_TYPE> voidSetter() {
-        return new BiConsumer<Event, VALUE_TYPE>() {
+        return new BiConsumer<>() {
 
             @Override
             public void accept(Event t, VALUE_TYPE u) {
diff --git a/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableStubHttpCallable.java b/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableStubHttpCallable.java
index 8ff9e64758c..193ad3b0c50 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableStubHttpCallable.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableStubHttpCallable.java
@@ -57,8 +57,8 @@ public class TimetableStubHttpCallable implements HttpCallable {
     public TimetableStubHttpCallable(File testdataDir) {
         this.testdataDir = testdataDir;
         this.requestedPlanUrls = new ArrayList<>();
-        this.requestedFullChangesUrls = new ArrayList<String>();
-        this.requestedRecentChangesUrls = new ArrayList<String>();
+        this.requestedFullChangesUrls = new ArrayList<>();
+        this.requestedRecentChangesUrls = new ArrayList<>();
     }
 
     public void addAvailableUrl(String url) {
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/ZoneTemperatureControlHandler.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/ZoneTemperatureControlHandler.java
index 1988bbe345f..c78078b17c4 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/ZoneTemperatureControlHandler.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/ZoneTemperatureControlHandler.java
@@ -30,7 +30,6 @@ import org.openhab.binding.digitalstrom.internal.lib.listener.TemperatureControl
 import org.openhab.binding.digitalstrom.internal.lib.manager.StructureManager;
 import org.openhab.binding.digitalstrom.internal.lib.manager.impl.TemperatureControlManager;
 import org.openhab.binding.digitalstrom.internal.lib.structure.devices.deviceparameters.constants.ApplicationGroup;
-import org.openhab.binding.digitalstrom.internal.lib.structure.devices.deviceparameters.constants.OutputChannelEnum;
 import org.openhab.binding.digitalstrom.internal.lib.structure.devices.deviceparameters.constants.OutputModeEnum;
 import org.openhab.binding.digitalstrom.internal.providers.DsChannelTypeProvider;
 import org.openhab.core.config.core.Configuration;
@@ -282,13 +281,13 @@ public class ZoneTemperatureControlHandler extends BaseThingHandler implements T
                                 || !currentChannelID.contains(DsChannelTypeProvider.TEMPERATURE_CONTROLLED))
                         && !controlState.equals(ControlStates.EMERGENCY)) {
                     currentChannelID = DsChannelTypeProvider.getOutputChannelTypeID(ApplicationGroup.Color.BLUE,
-                            OutputModeEnum.TEMPRETURE_PWM, new ArrayList<OutputChannelEnum>());
+                            OutputModeEnum.TEMPRETURE_PWM, new ArrayList<>());
                     loadChannel();
                     currentValue = tempControlStatus.getNominalValue();
                     updateState(currentChannelID, new DecimalType(currentValue.doubleValue()));
                 } else if (!controlMode.equals(ControlModes.PID_CONTROL) && !controlMode.equals(ControlModes.OFF)) {
                     currentChannelID = DsChannelTypeProvider.getOutputChannelTypeID(ApplicationGroup.Color.BLUE,
-                            OutputModeEnum.HEATING_PWM, new ArrayList<OutputChannelEnum>());
+                            OutputModeEnum.HEATING_PWM, new ArrayList<>());
                     loadChannel();
                     currentValue = tempControlStatus.getControlValue();
                     updateState(currentChannelID, new PercentType(fixPercent(currentValue.intValue())));
diff --git a/bundles/org.openhab.binding.dominoswiss/src/main/java/org/openhab/binding/dominoswiss/internal/EGateHandler.java b/bundles/org.openhab.binding.dominoswiss/src/main/java/org/openhab/binding/dominoswiss/internal/EGateHandler.java
index 26936cde59f..d6621d7a994 100644
--- a/bundles/org.openhab.binding.dominoswiss/src/main/java/org/openhab/binding/dominoswiss/internal/EGateHandler.java
+++ b/bundles/org.openhab.binding.dominoswiss/src/main/java/org/openhab/binding/dominoswiss/internal/EGateHandler.java
@@ -65,7 +65,7 @@ public class EGateHandler extends BaseBridgeHandler {
 
     public EGateHandler(Bridge thing) {
         super(thing);
-        registeredBlinds = new HashMap<String, ThingUID>();
+        registeredBlinds = new HashMap<>();
     }
 
     @Override
@@ -317,7 +317,7 @@ public class EGateHandler extends BaseBridgeHandler {
 
     protected void onData(String input) {
         // Instruction=2;ID=19;Command=1;Value=0;Priority=0;
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         // split on ;
         String[] parts = input.split(";");
         if (parts.length >= 2) {
diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
index 54332a7a871..ed8a0221e4f 100644
--- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
+++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
@@ -16,8 +16,6 @@ import static org.openhab.binding.draytonwiser.internal.DraytonWiserBindingConst
 
 import java.util.List;
 
-import javax.measure.quantity.Time;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.draytonwiser.internal.api.DraytonWiserApiException;
@@ -132,10 +130,10 @@ public class HotWaterHandler extends DraytonWiserThingHandler<HotWaterData> {
             final Integer overrideTimeout = firstChannel.getOverrideTimeoutUnixTime();
 
             if (overrideTimeout != null && !"NONE".equalsIgnoreCase(firstChannel.getOverrideType())) {
-                return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), Units.SECOND);
+                return new QuantityType<>(overrideTimeout - (System.currentTimeMillis() / 1000L), Units.SECOND);
             }
         }
-        return new QuantityType<Time>(0, Units.SECOND);
+        return new QuantityType<>(0, Units.SECOND);
     }
 
     static class HotWaterData {
diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java
index 3d9ccb762be..ea1154caf9a 100644
--- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java
+++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java
@@ -14,8 +14,6 @@ package org.openhab.binding.draytonwiser.internal.handler;
 
 import static org.openhab.binding.draytonwiser.internal.DraytonWiserBindingConstants.*;
 
-import javax.measure.quantity.Time;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.draytonwiser.internal.api.DraytonWiserApiException;
@@ -167,9 +165,9 @@ public class RoomHandler extends DraytonWiserThingHandler<RoomDTO> {
     private State getBoostRemainingState() {
         final Integer overrideTimeout = getData().getOverrideTimeoutUnixTime();
         if (overrideTimeout != null && !"NONE".equalsIgnoreCase(getData().getOverrideType())) {
-            return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), Units.SECOND);
+            return new QuantityType<>(overrideTimeout - (System.currentTimeMillis() / 1000L), Units.SECOND);
         }
-        return new QuantityType<Time>(0, Units.SECOND);
+        return new QuantityType<>(0, Units.SECOND);
     }
 
     private void setBoostDuration(final int durationMinutes) throws DraytonWiserApiException {
diff --git a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/p1telegram/P1TelegramParser.java b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/p1telegram/P1TelegramParser.java
index 86a42a78a05..a86f7864354 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/p1telegram/P1TelegramParser.java
+++ b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/p1telegram/P1TelegramParser.java
@@ -425,7 +425,7 @@ public class P1TelegramParser implements TelegramParser {
         final String obisIdString = obisId.toString();
 
         if (!obisIdString.isEmpty()) {
-            cosemObjects.add(new SimpleEntry<String, String>(obisIdString, obisValue.toString()));
+            cosemObjects.add(new SimpleEntry<>(obisIdString, obisValue.toString()));
         }
         clearObisData();
     }
diff --git a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/AbstractWriteCommand.java b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/AbstractWriteCommand.java
index a603e4df61a..f6fb94ba977 100644
--- a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/AbstractWriteCommand.java
+++ b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/AbstractWriteCommand.java
@@ -76,7 +76,7 @@ public abstract class AbstractWriteCommand extends AbstractCommand {
      * @throws ValidationException
      */
     protected String getJsonContent() throws ValidationException {
-        Map<String, String> content = new HashMap<String, String>(1);
+        Map<String, String> content = new HashMap<>(1);
         content.put(channel.getUID().getIdWithoutGroup(), getCommandValue());
 
         return gson.toJson(content);
diff --git a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetDynamicCircuitCurrents.java b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetDynamicCircuitCurrents.java
index d327cc9a7d9..cbd8f8000dc 100644
--- a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetDynamicCircuitCurrents.java
+++ b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetDynamicCircuitCurrents.java
@@ -56,7 +56,7 @@ public class SetDynamicCircuitCurrents extends AbstractWriteCommand {
      */
     @Override
     protected String getJsonContent() throws ValidationException {
-        Map<String, String> content = new HashMap<String, String>(3);
+        Map<String, String> content = new HashMap<>(3);
         String rawCommand = getCommandValue();
         String[] tokens = rawCommand.split(";");
         if (tokens.length == 3) {
diff --git a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetMaxCircuitCurrents.java b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetMaxCircuitCurrents.java
index d8c89f68aa8..6cdce590580 100644
--- a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetMaxCircuitCurrents.java
+++ b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetMaxCircuitCurrents.java
@@ -46,7 +46,7 @@ public class SetMaxCircuitCurrents extends SetCircuitSettings {
      */
     @Override
     protected String getJsonContent() throws ValidationException {
-        Map<String, String> content = new HashMap<String, String>(3);
+        Map<String, String> content = new HashMap<>(3);
         String rawCommand = getCommandValue();
         String[] tokens = rawCommand.split(";");
         if (tokens.length == 3) {
diff --git a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetOfflineMaxCircuitCurrents.java b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetOfflineMaxCircuitCurrents.java
index e3942a89f72..43e4dc5491b 100644
--- a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetOfflineMaxCircuitCurrents.java
+++ b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/command/circuit/SetOfflineMaxCircuitCurrents.java
@@ -46,7 +46,7 @@ public class SetOfflineMaxCircuitCurrents extends SetCircuitSettings {
      */
     @Override
     protected String getJsonContent() throws ValidationException {
-        Map<String, String> content = new HashMap<String, String>(3);
+        Map<String, String> content = new HashMap<>(3);
         String rawCommand = getCommandValue();
         String[] tokens = rawCommand.split(";");
         if (tokens.length == 3) {
diff --git a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/EcobeeBindingConstants.java b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/EcobeeBindingConstants.java
index 1f4ded30d62..5439126a8f5 100644
--- a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/EcobeeBindingConstants.java
+++ b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/EcobeeBindingConstants.java
@@ -402,8 +402,8 @@ public class EcobeeBindingConstants {
     public static final HouseDetailsDTO EMPTY_HOUSEDETAILS = new HouseDetailsDTO();
     public static final ManagementDTO EMPTY_MANAGEMENT = new ManagementDTO();
     public static final TechnicianDTO EMPTY_TECHNICIAN = new TechnicianDTO();
-    public static final List<RemoteSensorDTO> EMPTY_SENSORS = Collections.<RemoteSensorDTO> emptyList();
-    public static final List<ThermostatDTO> EMPTY_THERMOSTATS = Collections.<ThermostatDTO> emptyList();
+    public static final List<RemoteSensorDTO> EMPTY_SENSORS = Collections.emptyList();
+    public static final List<ThermostatDTO> EMPTY_THERMOSTATS = Collections.emptyList();
 
     public static final String ECOBEE_BASE_URL = "https://api.ecobee.com/";
     public static final String ECOBEE_AUTHORIZE_URL = ECOBEE_BASE_URL + "authorize";
diff --git a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/action/EcobeeActions.java b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/action/EcobeeActions.java
index 95dd6e24d18..6186fb4519c 100644
--- a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/action/EcobeeActions.java
+++ b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/action/EcobeeActions.java
@@ -281,7 +281,7 @@ public class EcobeeActions implements ThingActions {
         if (coolHoldTemp == null || heatHoldTemp == null) {
             throw new IllegalArgumentException("hold temperatures cannot be null");
         }
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         params.put("coolHoldTemp", coolHoldTemp);
         params.put("heatHoldTemp", heatHoldTemp);
         return setHold(params, null, null, null, null);
@@ -306,7 +306,7 @@ public class EcobeeActions implements ThingActions {
         if (holdHours == null) {
             throw new IllegalArgumentException("number of hold hours is missing");
         }
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         params.put("coolHoldTemp", coolHoldTemp);
         params.put("heatHoldTemp", heatHoldTemp);
         return setHold(params, HoldType.HOLD_HOURS.toString(), holdHours, null, null);
@@ -331,7 +331,7 @@ public class EcobeeActions implements ThingActions {
         if (holdClimateRef == null || !localHandler.isValidClimateRef(holdClimateRef)) {
             throw new IllegalArgumentException("hold climate ref is missing or invalid");
         }
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         params.put("holdClimateRef", holdClimateRef);
         return setHold(params, null, null, null, null);
     }
@@ -358,7 +358,7 @@ public class EcobeeActions implements ThingActions {
         if (holdClimateRef == null || !localHandler.isValidClimateRef(holdClimateRef)) {
             throw new IllegalArgumentException("hold climate ref is missing or invalid");
         }
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         params.put("holdClimateRef", holdClimateRef);
         return setHold(params, HoldType.HOLD_HOURS.toString(), holdHours, null, null);
     }
@@ -379,7 +379,7 @@ public class EcobeeActions implements ThingActions {
             @ActionInput(name = "endDateTime", description = "(opt) The end date in thermostat time.") @Nullable Date endDateTime,
             @ActionInput(name = "holdType", description = "(opt) The hold duration type. Valid values: dateTime, nextTransition, indefinite, holdHours.") @Nullable String holdType,
             @ActionInput(name = "holdHours", description = "(opt) The number of hours to hold for, used and required if holdType='holdHours'.") @Nullable Number holdHours) {
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         if (coolHoldTemp != null) {
             params.put("coolHoldTemp", coolHoldTemp);
         }
diff --git a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeAccountBridgeHandler.java b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeAccountBridgeHandler.java
index c446d57c01a..b055b64982a 100644
--- a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeAccountBridgeHandler.java
+++ b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/handler/EcobeeAccountBridgeHandler.java
@@ -188,8 +188,7 @@ public class EcobeeAccountBridgeHandler extends BaseBridgeHandler {
 
     public SelectionDTO getSelection() {
         SelectionDTO mergedSelection = new SelectionDTO();
-        for (EcobeeThermostatBridgeHandler handler : new ArrayList<EcobeeThermostatBridgeHandler>(
-                thermostatHandlers.values())) {
+        for (EcobeeThermostatBridgeHandler handler : new ArrayList<>(thermostatHandlers.values())) {
             SelectionDTO selection = handler.getSelection();
             logger.trace("AccountBridge: Thermostat {} selection: {}", handler.getThing().getUID(), selection);
             mergedSelection.mergeSelection(selection);
diff --git a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchConnector.java b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchConnector.java
index db4df6f0a4f..4b226b1da00 100644
--- a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchConnector.java
+++ b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchConnector.java
@@ -162,7 +162,7 @@ public class EcoTouchConnector {
     public Map<String, String> getValues(Set<String> tags) throws Exception {
         final Integer maxNum = 100;
 
-        Map<String, String> result = new HashMap<String, String>();
+        Map<String, String> result = new HashMap<>();
         Integer counter = 1;
         StringBuilder query = new StringBuilder();
         Iterator<String> iter = tags.iterator();
@@ -196,7 +196,7 @@ public class EcoTouchConnector {
      */
     private Map<String, String> getValues(String url) throws Exception {
         trylogin(false);
-        Map<String, String> result = new HashMap<String, String>();
+        Map<String, String> result = new HashMap<>();
         int loginAttempt = 0;
         while (loginAttempt < 2) {
             BufferedReader reader = null;
diff --git a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchHandler.java b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchHandler.java
index 0a3d35c41b0..5e8bef59263 100644
--- a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchHandler.java
+++ b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchHandler.java
@@ -72,7 +72,7 @@ public class EcoTouchHandler extends BaseThingHandler {
                     // this type needs special treatment
                     // the following reads: value = value / 2 - 2
                     value = value.divide(new BigDecimal(2), 1, RoundingMode.UNNECESSARY).subtract(new BigDecimal(2));
-                    QuantityType<?> quantity = new QuantityType<javax.measure.quantity.Temperature>(value, CELSIUS);
+                    QuantityType<?> quantity = new QuantityType<>(value, CELSIUS);
                     updateState(channel, quantity);
                 } else {
                     if (ecoTouchTag.getUnit() != ONE) {
@@ -191,7 +191,7 @@ public class EcoTouchHandler extends BaseThingHandler {
         if (localRefreshJob == null || localRefreshJob.isCancelled()) {
             Runnable runnable = () -> {
                 try {
-                    Set<String> tags = new HashSet<String>();
+                    Set<String> tags = new HashSet<>();
                     for (EcoTouchTags ecoTouchTag : EcoTouchTags.values()) {
                         String channel = ecoTouchTag.getCommand();
                         boolean linked = isLinked(channel);
diff --git a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
index d9a7bf9b200..f7aa6b4a431 100644
--- a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
+++ b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
@@ -1287,7 +1287,7 @@ public enum EcoTouchTags {
      * @return first matching EcoTouchTags instance, if available
      */
     public static List<EcoTouchTags> fromTag(String tag) {
-        List<EcoTouchTags> result = new LinkedList<EcoTouchTags>();
+        List<EcoTouchTags> result = new LinkedList<>();
         for (EcoTouchTags c : EcoTouchTags.values()) {
             if (c.getTagName().equals(tag)) {
                 result.add(c);
diff --git a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/EcovacsBindingConstants.java b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/EcovacsBindingConstants.java
index 8a903c04abe..3c85b30728b 100644
--- a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/EcovacsBindingConstants.java
+++ b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/EcovacsBindingConstants.java
@@ -85,36 +85,31 @@ public class EcovacsBindingConstants {
     public static final String CMD_SPOT_AREA = "spotArea";
     public static final String CMD_CUSTOM_AREA = "customArea";
 
-    public static final StateOptionMapping<CleanMode> CLEAN_MODE_MAPPING = StateOptionMapping.<CleanMode> of(
-            new StateOptionEntry<CleanMode>(CleanMode.AUTO, "auto"),
-            new StateOptionEntry<CleanMode>(CleanMode.EDGE, "edge", DeviceCapability.EDGE_CLEANING),
-            new StateOptionEntry<CleanMode>(CleanMode.SPOT, "spot", DeviceCapability.SPOT_CLEANING),
-            new StateOptionEntry<CleanMode>(CleanMode.SPOT_AREA, "spotArea", DeviceCapability.SPOT_AREA_CLEANING),
-            new StateOptionEntry<CleanMode>(CleanMode.CUSTOM_AREA, "customArea", DeviceCapability.CUSTOM_AREA_CLEANING),
-            new StateOptionEntry<CleanMode>(CleanMode.SINGLE_ROOM, "singleRoom", DeviceCapability.SINGLE_ROOM_CLEANING),
-            new StateOptionEntry<CleanMode>(CleanMode.PAUSE, "pause"),
-            new StateOptionEntry<CleanMode>(CleanMode.STOP, "stop"),
-            new StateOptionEntry<CleanMode>(CleanMode.WASHING, "washing"),
-            new StateOptionEntry<CleanMode>(CleanMode.DRYING, "drying"),
-            new StateOptionEntry<CleanMode>(CleanMode.RETURNING, "returning"));
+    public static final StateOptionMapping<CleanMode> CLEAN_MODE_MAPPING = StateOptionMapping.of(
+            new StateOptionEntry<>(CleanMode.AUTO, "auto"),
+            new StateOptionEntry<>(CleanMode.EDGE, "edge", DeviceCapability.EDGE_CLEANING),
+            new StateOptionEntry<>(CleanMode.SPOT, "spot", DeviceCapability.SPOT_CLEANING),
+            new StateOptionEntry<>(CleanMode.SPOT_AREA, "spotArea", DeviceCapability.SPOT_AREA_CLEANING),
+            new StateOptionEntry<>(CleanMode.CUSTOM_AREA, "customArea", DeviceCapability.CUSTOM_AREA_CLEANING),
+            new StateOptionEntry<>(CleanMode.SINGLE_ROOM, "singleRoom", DeviceCapability.SINGLE_ROOM_CLEANING),
+            new StateOptionEntry<>(CleanMode.PAUSE, "pause"), new StateOptionEntry<>(CleanMode.STOP, "stop"),
+            new StateOptionEntry<>(CleanMode.WASHING, "washing"), new StateOptionEntry<>(CleanMode.DRYING, "drying"),
+            new StateOptionEntry<>(CleanMode.RETURNING, "returning"));
 
-    public static final StateOptionMapping<MoppingWaterAmount> WATER_AMOUNT_MAPPING = StateOptionMapping
-            .<MoppingWaterAmount> of(new StateOptionEntry<MoppingWaterAmount>(MoppingWaterAmount.LOW, "low"),
-                    new StateOptionEntry<MoppingWaterAmount>(MoppingWaterAmount.MEDIUM, "medium"),
-                    new StateOptionEntry<MoppingWaterAmount>(MoppingWaterAmount.HIGH, "high"),
-                    new StateOptionEntry<MoppingWaterAmount>(MoppingWaterAmount.VERY_HIGH, "veryhigh"));
+    public static final StateOptionMapping<MoppingWaterAmount> WATER_AMOUNT_MAPPING = StateOptionMapping.of(
+            new StateOptionEntry<>(MoppingWaterAmount.LOW, "low"),
+            new StateOptionEntry<>(MoppingWaterAmount.MEDIUM, "medium"),
+            new StateOptionEntry<>(MoppingWaterAmount.HIGH, "high"),
+            new StateOptionEntry<>(MoppingWaterAmount.VERY_HIGH, "veryhigh"));
 
-    public static final StateOptionMapping<SuctionPower> SUCTION_POWER_MAPPING = StateOptionMapping.<SuctionPower> of(
-            new StateOptionEntry<SuctionPower>(SuctionPower.SILENT, "silent",
-                    DeviceCapability.EXTENDED_CLEAN_SPEED_CONTROL),
-            new StateOptionEntry<SuctionPower>(SuctionPower.NORMAL, "normal"),
-            new StateOptionEntry<SuctionPower>(SuctionPower.HIGH, "high"), new StateOptionEntry<SuctionPower>(
-                    SuctionPower.HIGHER, "higher", DeviceCapability.EXTENDED_CLEAN_SPEED_CONTROL));
+    public static final StateOptionMapping<SuctionPower> SUCTION_POWER_MAPPING = StateOptionMapping.of(
+            new StateOptionEntry<>(SuctionPower.SILENT, "silent", DeviceCapability.EXTENDED_CLEAN_SPEED_CONTROL),
+            new StateOptionEntry<>(SuctionPower.NORMAL, "normal"), new StateOptionEntry<>(SuctionPower.HIGH, "high"),
+            new StateOptionEntry<>(SuctionPower.HIGHER, "higher", DeviceCapability.EXTENDED_CLEAN_SPEED_CONTROL));
 
-    public static final StateOptionMapping<SoundType> SOUND_TYPE_MAPPING = StateOptionMapping.<SoundType> of(
-            new StateOptionEntry<SoundType>(SoundType.BEEP, "beep"),
-            new StateOptionEntry<SoundType>(SoundType.I_AM_HERE, "iAmHere"),
-            new StateOptionEntry<SoundType>(SoundType.STARTUP, "startup"),
-            new StateOptionEntry<SoundType>(SoundType.SUSPENDED, "suspended"),
-            new StateOptionEntry<SoundType>(SoundType.BATTERY_LOW, "batteryLow"));
+    public static final StateOptionMapping<SoundType> SOUND_TYPE_MAPPING = StateOptionMapping.of(
+            new StateOptionEntry<>(SoundType.BEEP, "beep"), new StateOptionEntry<>(SoundType.I_AM_HERE, "iAmHere"),
+            new StateOptionEntry<>(SoundType.STARTUP, "startup"),
+            new StateOptionEntry<>(SoundType.SUSPENDED, "suspended"),
+            new StateOptionEntry<>(SoundType.BATTERY_LOW, "batteryLow"));
 }
diff --git a/bundles/org.openhab.binding.electroluxair/src/main/java/org/openhab/binding/electroluxair/internal/handler/ElectroluxAirHandler.java b/bundles/org.openhab.binding.electroluxair/src/main/java/org/openhab/binding/electroluxair/internal/handler/ElectroluxAirHandler.java
index 8690245cca0..e83164b1dea 100644
--- a/bundles/org.openhab.binding.electroluxair/src/main/java/org/openhab/binding/electroluxair/internal/handler/ElectroluxAirHandler.java
+++ b/bundles/org.openhab.binding.electroluxair/src/main/java/org/openhab/binding/electroluxair/internal/handler/ElectroluxAirHandler.java
@@ -17,16 +17,12 @@ import static org.openhab.binding.electroluxair.internal.ElectroluxAirBindingCon
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.electroluxair.internal.ElectroluxAirBindingConstants;
 import org.openhab.binding.electroluxair.internal.ElectroluxAirConfiguration;
 import org.openhab.binding.electroluxair.internal.api.ElectroluxDeltaAPI;
 import org.openhab.binding.electroluxair.internal.dto.ElectroluxPureA9DTO;
-import org.openhab.core.library.dimension.Density;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.OpenClosedType;
 import org.openhab.core.library.types.QuantityType;
@@ -187,29 +183,23 @@ public class ElectroluxAirHandler extends BaseThingHandler {
     private State getValue(String channelId, ElectroluxPureA9DTO dto) {
         switch (channelId) {
             case CHANNEL_TEMPERATURE:
-                return new QuantityType<Temperature>(dto.getProperties().getReported().getTemp(), SIUnits.CELSIUS);
+                return new QuantityType<>(dto.getProperties().getReported().getTemp(), SIUnits.CELSIUS);
             case CHANNEL_HUMIDITY:
-                return new QuantityType<Dimensionless>(dto.getProperties().getReported().getHumidity(), Units.PERCENT);
+                return new QuantityType<>(dto.getProperties().getReported().getHumidity(), Units.PERCENT);
             case CHANNEL_TVOC:
-                return new QuantityType<Density>(dto.getProperties().getReported().getTVOC(),
-                        Units.MICROGRAM_PER_CUBICMETRE);
+                return new QuantityType<>(dto.getProperties().getReported().getTVOC(), Units.MICROGRAM_PER_CUBICMETRE);
             case CHANNEL_PM1:
-                return new QuantityType<Dimensionless>(dto.getProperties().getReported().getPM1(),
-                        Units.PARTS_PER_BILLION);
+                return new QuantityType<>(dto.getProperties().getReported().getPM1(), Units.PARTS_PER_BILLION);
             case CHANNEL_PM25:
-                return new QuantityType<Dimensionless>(dto.getProperties().getReported().getPM25(),
-                        Units.PARTS_PER_BILLION);
+                return new QuantityType<>(dto.getProperties().getReported().getPM25(), Units.PARTS_PER_BILLION);
             case CHANNEL_PM10:
-                return new QuantityType<Dimensionless>(dto.getProperties().getReported().getPM10(),
-                        Units.PARTS_PER_BILLION);
+                return new QuantityType<>(dto.getProperties().getReported().getPM10(), Units.PARTS_PER_BILLION);
             case CHANNEL_CO2:
-                return new QuantityType<Dimensionless>(dto.getProperties().getReported().getCO2(),
-                        Units.PARTS_PER_MILLION);
+                return new QuantityType<>(dto.getProperties().getReported().getCO2(), Units.PARTS_PER_MILLION);
             case CHANNEL_FAN_SPEED:
                 return new StringType(Integer.toString(dto.getProperties().getReported().getFanspeed()));
             case CHANNEL_FILTER_LIFE:
-                return new QuantityType<Dimensionless>(dto.getProperties().getReported().getFilterLife(),
-                        Units.PERCENT);
+                return new QuantityType<>(dto.getProperties().getReported().getFilterLife(), Units.PERCENT);
             case CHANNEL_IONIZER:
                 return OnOffType.from(dto.getProperties().getReported().isIonizer());
             case CHANNEL_UI_LIGHT:
diff --git a/bundles/org.openhab.binding.elerotransmitterstick/src/main/java/org/openhab/binding/elerotransmitterstick/internal/stick/TransmitterStick.java b/bundles/org.openhab.binding.elerotransmitterstick/src/main/java/org/openhab/binding/elerotransmitterstick/internal/stick/TransmitterStick.java
index 8c7f7bd8984..901ba0edadf 100644
--- a/bundles/org.openhab.binding.elerotransmitterstick/src/main/java/org/openhab/binding/elerotransmitterstick/internal/stick/TransmitterStick.java
+++ b/bundles/org.openhab.binding.elerotransmitterstick/src/main/java/org/openhab/binding/elerotransmitterstick/internal/stick/TransmitterStick.java
@@ -197,7 +197,7 @@ public class TransmitterStick {
         private final int updateInterval;
         private final SerialConnection connection;
 
-        private final BlockingQueue<Command> cmdQueue = new DelayQueue<Command>() {
+        private final BlockingQueue<Command> cmdQueue = new DelayQueue<>() {
             @Override
             public boolean add(Command e) {
                 if (TransmitterStick.prepareAddition(e, this)) {
diff --git a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/CacheManager.java b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/CacheManager.java
index 9c4ea226ed9..aba5973ef25 100644
--- a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/CacheManager.java
+++ b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/CacheManager.java
@@ -163,7 +163,7 @@ public class CacheManager {
      * @return spot prices currently available, {@link #NUMBER_OF_HISTORIC_HOURS} back
      */
     public Map<Instant, BigDecimal> getSpotPrices() {
-        return new HashMap<Instant, BigDecimal>(spotPriceMap);
+        return new HashMap<>(spotPriceMap);
     }
 
     /**
@@ -199,7 +199,7 @@ public class CacheManager {
         if (tariffs == null) {
             throw new IllegalStateException("Tariffs not initialized");
         }
-        return new HashMap<Instant, BigDecimal>(tariffs);
+        return new HashMap<>(tariffs);
     }
 
     /**
diff --git a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/action/EnergiDataServiceActions.java b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/action/EnergiDataServiceActions.java
index 5232fd6fb42..a881dbe733c 100644
--- a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/action/EnergiDataServiceActions.java
+++ b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/action/EnergiDataServiceActions.java
@@ -128,7 +128,7 @@ public class EnergiDataServiceActions implements ThingActions {
 
         Set<PriceComponent> priceComponentsSet;
         try {
-            priceComponentsSet = new HashSet<PriceComponent>(
+            priceComponentsSet = new HashSet<>(
                     Arrays.stream(priceComponents.split(",")).map(PriceComponent::fromString).toList());
         } catch (IllegalArgumentException e) {
             logger.warn("{}", e.getMessage());
diff --git a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/config/DatahubPriceConfiguration.java b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/config/DatahubPriceConfiguration.java
index a9a32b5a1fe..f232ea50f06 100644
--- a/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/config/DatahubPriceConfiguration.java
+++ b/bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/config/DatahubPriceConfiguration.java
@@ -69,8 +69,7 @@ public class DatahubPriceConfiguration {
      */
     public Set<ChargeTypeCode> getChargeTypeCodes() {
         return chargeTypeCodes.isBlank() ? new HashSet<>()
-                : new HashSet<ChargeTypeCode>(
-                        Arrays.stream(chargeTypeCodes.split(",")).map(ChargeTypeCode::new).toList());
+                : new HashSet<>(Arrays.stream(chargeTypeCodes.split(",")).map(ChargeTypeCode::new).toList());
     }
 
     /**
@@ -79,7 +78,7 @@ public class DatahubPriceConfiguration {
      * @return Set of notes.
      */
     public Set<String> getNotes() {
-        return notes.isBlank() ? new HashSet<>() : new HashSet<String>(Arrays.asList(notes.split(",")));
+        return notes.isBlank() ? new HashSet<>() : new HashSet<>(Arrays.asList(notes.split(",")));
     }
 
     /**
diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java
index cc77ee2df97..3a0ed4dd85d 100644
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/EEPType.java
@@ -416,8 +416,9 @@ public enum EEPType {
     // UniversalCommand(RORG._4BS, 0x3f, 0x7f, false, A5_3F_7F_Universal.class, THING_TYPE_UNIVERSALACTUATOR,
     // CHANNEL_GENERIC_ROLLERSHUTTER, CHANNEL_GENERIC_LIGHT_SWITCHING, CHANNEL_GENERIC_DIMMER, CHANNEL_TEACHINCMD),
     EltakoFSB(RORG._4BS, 0x3f, 0x7f, false, false, "EltakoFSB", 0, A5_3F_7F_EltakoFSB.class, THING_TYPE_ROLLERSHUTTER,
-            0, new Hashtable<String, Configuration>() {
+            0, new Hashtable<>() {
                 private static final long serialVersionUID = 1L;
+
                 {
                     put(CHANNEL_ROLLERSHUTTER, new Configuration());
                     put(CHANNEL_TEACHINCMD, new Configuration() {
@@ -429,8 +430,9 @@ public enum EEPType {
             }),
 
     EltakoFRM(RORG._4BS, 0x3f, 0x7f, false, false, "EltakoFRM", 0, A5_3F_7F_EltakoFRM.class, THING_TYPE_ROLLERSHUTTER,
-            0, new Hashtable<String, Configuration>() {
+            0, new Hashtable<>() {
                 private static final long serialVersionUID = 1L;
+
                 {
                     put(CHANNEL_ROLLERSHUTTER, new Configuration());
                     put(CHANNEL_TEACHINCMD, new Configuration() {
diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/generic/GenericEEP.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/generic/GenericEEP.java
index b333fa8fb58..8c43257443b 100644
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/generic/GenericEEP.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/generic/GenericEEP.java
@@ -53,25 +53,24 @@ import org.openhab.core.util.HexUtils;
 @NonNullByDefault
 public class GenericEEP extends EEP {
 
-    final List<Class<? extends State>> supportedStates = Collections
-            .unmodifiableList(new LinkedList<Class<? extends State>>() {
-                private static final long serialVersionUID = 1L;
+    final List<Class<? extends State>> supportedStates = Collections.unmodifiableList(new LinkedList<>() {
+        private static final long serialVersionUID = 1L;
 
-                {
-                    add(DateTimeType.class);
-                    add(DecimalType.class);
-                    add(HSBType.class);
-                    add(OnOffType.class);
-                    add(OpenClosedType.class);
-                    add(PercentType.class);
-                    add(PlayPauseType.class);
-                    add(PointType.class);
-                    add(RewindFastforwardType.class);
-                    add(StringListType.class);
-                    add(StringType.class);
-                    add(UpDownType.class);
-                }
-            });
+        {
+            add(DateTimeType.class);
+            add(DecimalType.class);
+            add(HSBType.class);
+            add(OnOffType.class);
+            add(OpenClosedType.class);
+            add(PercentType.class);
+            add(PlayPauseType.class);
+            add(PointType.class);
+            add(RewindFastforwardType.class);
+            add(StringListType.class);
+            add(StringType.class);
+            add(UpDownType.class);
+        }
+    });
 
     public GenericEEP() {
         super();
diff --git a/bundles/org.openhab.binding.evohome/src/main/java/org/openhab/binding/evohome/internal/handler/EvohomeHeatingZoneHandler.java b/bundles/org.openhab.binding.evohome/src/main/java/org/openhab/binding/evohome/internal/handler/EvohomeHeatingZoneHandler.java
index a3ddb78e273..68adf6ac040 100644
--- a/bundles/org.openhab.binding.evohome/src/main/java/org/openhab/binding/evohome/internal/handler/EvohomeHeatingZoneHandler.java
+++ b/bundles/org.openhab.binding.evohome/src/main/java/org/openhab/binding/evohome/internal/handler/EvohomeHeatingZoneHandler.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.binding.evohome.internal.handler;
 
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.evohome.internal.EvohomeBindingConstants;
@@ -69,11 +67,11 @@ public class EvohomeHeatingZoneHandler extends BaseEvohomeHandler {
             updateEvohomeThingStatus(ThingStatus.ONLINE);
 
             updateState(EvohomeBindingConstants.ZONE_TEMPERATURE_CHANNEL,
-                    new QuantityType<Temperature>(zoneStatus.getTemperature().getTemperature(), SIUnits.CELSIUS));
+                    new QuantityType<>(zoneStatus.getTemperature().getTemperature(), SIUnits.CELSIUS));
             updateState(EvohomeBindingConstants.ZONE_SET_POINT_STATUS_CHANNEL,
                     new StringType(zoneStatus.getHeatSetpoint().getSetpointMode()));
-            updateState(EvohomeBindingConstants.ZONE_SET_POINT_CHANNEL, new QuantityType<Temperature>(
-                    zoneStatus.getHeatSetpoint().getTargetTemperature(), SIUnits.CELSIUS));
+            updateState(EvohomeBindingConstants.ZONE_SET_POINT_CHANNEL,
+                    new QuantityType<>(zoneStatus.getHeatSetpoint().getTargetTemperature(), SIUnits.CELSIUS));
         }
     }
 
diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonBindingConstants.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonBindingConstants.java
index f104a94e9f7..e84d9744d0d 100644
--- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonBindingConstants.java
+++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonBindingConstants.java
@@ -53,7 +53,7 @@ public class FlicButtonBindingConstants {
     public static final int BUTTON_OFFLINE_GRACE_PERIOD_SECONDS = 60;
 
     public static final Map<String, String> FLIC_OPENHAB_TRIGGER_EVENT_MAP = Collections
-            .unmodifiableMap(new HashMap<String, String>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
                     put("ButtonSingleClick", CommonTriggerEvents.SHORT_PRESSED);
                     put("ButtonDoubleClick", CommonTriggerEvents.DOUBLE_PRESSED);
diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonHandlerFactory.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonHandlerFactory.java
index 68b0f9484a7..457452cf7f0 100644
--- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonHandlerFactory.java
+++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/FlicButtonHandlerFactory.java
@@ -86,7 +86,7 @@ public class FlicButtonHandlerFactory extends BaseThingHandlerFactory {
     private synchronized void registerDiscoveryService(FlicButtonDiscoveryService discoveryService,
             ThingUID bridgeUID) {
         this.discoveryServiceRegs.put(bridgeUID, getBundleContext().registerService(DiscoveryService.class.getName(),
-                discoveryService, new Hashtable<String, Object>()));
+                discoveryService, new Hashtable<>()));
     }
 
     private synchronized void unregisterDiscoveryService(ThingUID bridgeUID) {
diff --git a/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/client/FMIResponse.java b/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/client/FMIResponse.java
index 170531ef707..cb2b422a531 100644
--- a/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/client/FMIResponse.java
+++ b/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/client/FMIResponse.java
@@ -75,7 +75,7 @@ public class FMIResponse {
                 Entry<Location, Map<String, List<Long>>> locationEntry) {
             Location location = locationEntry.getKey();
             Map<String, List<Long>> timestampsByParameter = locationEntry.getValue();
-            out.put(location, new HashMap<String, Data>(timestampsByParameter.size()));
+            out.put(location, new HashMap<>(timestampsByParameter.size()));
             timestampsByParameter.entrySet().stream().forEach(parameterEntry -> {
                 collectValuesForParameter(out, location, parameterEntry);
             });
diff --git a/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractFMIResponseParsingTest.java b/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractFMIResponseParsingTest.java
index 76002438892..396a7118e7c 100644
--- a/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractFMIResponseParsingTest.java
+++ b/bundles/org.openhab.binding.fmiweather/src/test/java/org/openhab/binding/fmiweather/AbstractFMIResponseParsingTest.java
@@ -90,7 +90,7 @@ public class AbstractFMIResponseParsingTest {
     }
 
     protected static Matcher<Data> deeplyEqualTo(long start, int intervalMinutes, String... values) {
-        return new TypeSafeMatcher<Data>() {
+        return new TypeSafeMatcher<>() {
 
             private TimestampMatcher timestampMatcher = new TimestampMatcher(start, intervalMinutes, values.length);
             private ValuesMatcher valuesMatcher = new ValuesMatcher(values);
diff --git a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
index 93097f624ef..eafebd7a781 100644
--- a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
+++ b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
@@ -80,8 +80,8 @@ public class S3Actions {
     }
 
     public List<String> listBucket(String prefix) throws APIException, AuthException {
-        Map<String, String> headers = new HashMap<String, String>();
-        Map<String, String> params = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
+        Map<String, String> params = new HashMap<>();
         return listObjectsV2(prefix, headers, params);
     }
 
diff --git a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/auth/AWS4SignerBase.java b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/auth/AWS4SignerBase.java
index 575cc6d3b9b..3dccb7752ab 100644
--- a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/auth/AWS4SignerBase.java
+++ b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/auth/AWS4SignerBase.java
@@ -70,7 +70,7 @@ public abstract class AWS4SignerBase {
     }
 
     protected static String getCanonicalizeHeaderNames(Map<String, String> headers) {
-        List<String> sortedHeaders = new ArrayList<String>();
+        List<String> sortedHeaders = new ArrayList<>();
         sortedHeaders.addAll(headers.keySet());
         Collections.sort(sortedHeaders, String.CASE_INSENSITIVE_ORDER);
 
@@ -89,7 +89,7 @@ public abstract class AWS4SignerBase {
             return "";
         }
 
-        List<String> sortedHeaders = new ArrayList<String>();
+        List<String> sortedHeaders = new ArrayList<>();
         sortedHeaders.addAll(headers.keySet());
         Collections.sort(sortedHeaders, String.CASE_INSENSITIVE_ORDER);
 
@@ -129,7 +129,7 @@ public abstract class AWS4SignerBase {
             return "";
         }
 
-        SortedMap<String, String> sorted = new TreeMap<String, String>();
+        SortedMap<String, String> sorted = new TreeMap<>();
         Iterator<Map.Entry<String, String>> pairs = parameters.entrySet().iterator();
 
         while (pairs.hasNext()) {
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/deserialization/StrictEnumTypeAdapterFactory.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/deserialization/StrictEnumTypeAdapterFactory.java
index 1f9b278aa1a..217bc196916 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/deserialization/StrictEnumTypeAdapterFactory.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/deserialization/StrictEnumTypeAdapterFactory.java
@@ -46,7 +46,7 @@ public class StrictEnumTypeAdapterFactory implements TypeAdapterFactory {
     }
 
     private <T> TypeAdapter<T> newStrictEnumAdapter(TypeAdapter<T> delegateAdapter) {
-        return new TypeAdapter<T>() {
+        return new TypeAdapter<>() {
             @Override
             public void write(JsonWriter out, @Nullable T value) throws IOException {
                 delegateAdapter.write(out, value);
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
index fc98d44d8d0..4c5d226b1a7 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
@@ -167,7 +167,7 @@ public class HomeManager extends RestManager {
     }
 
     public <T> boolean putCommand(int nodeId, int stateSignalId, T value) throws FreeboxException {
-        put(new EndpointValue<T>(value), ENDPOINTS_PATH, String.valueOf(nodeId), String.valueOf(stateSignalId));
+        put(new EndpointValue<>(value), ENDPOINTS_PATH, String.valueOf(nodeId), String.valueOf(stateSignalId));
         return true;
     }
 }
diff --git a/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/FroniusHandlerFactory.java b/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/FroniusHandlerFactory.java
index 20cc426777a..5c621d60439 100644
--- a/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/FroniusHandlerFactory.java
+++ b/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/FroniusHandlerFactory.java
@@ -42,9 +42,10 @@ import org.osgi.service.component.annotations.Component;
 @NonNullByDefault
 public class FroniusHandlerFactory extends BaseThingHandlerFactory {
 
-    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<ThingTypeUID>() {
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<>() {
 
         private static final long serialVersionUID = 1L;
+
         {
             add(THING_TYPE_INVERTER);
             add(THING_TYPE_BRIDGE);
diff --git a/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkAccountHandler.java b/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkAccountHandler.java
index 5e93e7f3e1f..13c33c69a0b 100644
--- a/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkAccountHandler.java
+++ b/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkAccountHandler.java
@@ -80,7 +80,7 @@ public class GeneracMobileLinkAccountHandler extends BaseBridgeHandler {
             .create();
     private HttpClient httpClient;
     private GeneracMobileLinkDiscoveryService discoveryService;
-    private Map<String, Apparatus> apparatusesCache = new HashMap<String, Apparatus>();
+    private Map<String, Apparatus> apparatusesCache = new HashMap<>();
     private int refreshIntervalSeconds = 60;
     private boolean loggedIn;
 
diff --git a/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkGeneratorHandler.java b/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkGeneratorHandler.java
index 143d4295910..a5ad7c91d7b 100644
--- a/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkGeneratorHandler.java
+++ b/bundles/org.openhab.binding.generacmobilelink/src/main/java/org/openhab/binding/generacmobilelink/internal/handler/GeneracMobileLinkGeneratorHandler.java
@@ -16,10 +16,6 @@ import static org.openhab.binding.generacmobilelink.internal.GeneracMobileLinkBi
 
 import java.util.Arrays;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.ElectricPotential;
-import javax.measure.quantity.Time;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.generacmobilelink.internal.dto.Apparatus;
@@ -95,7 +91,7 @@ public class GeneracMobileLinkGeneratorHandler extends BaseThingHandler {
         updateState(CHANNEL_CONNECTION_TIME, new DateTimeType(apparatusDetail.connectionTimestamp));
         Arrays.stream(apparatusDetail.properties).filter(p -> p.type == 70).findFirst().ifPresent(p -> {
             try {
-                updateState(CHANNEL_RUN_HOURS, new QuantityType<Time>(Integer.parseInt(p.value), Units.HOUR));
+                updateState(CHANNEL_RUN_HOURS, new QuantityType<>(Integer.parseInt(p.value), Units.HOUR));
             } catch (NumberFormatException e) {
                 logger.debug("Could not parse runHours {}", p.value);
                 updateState(CHANNEL_RUN_HOURS, UnDefType.UNDEF);
@@ -103,8 +99,7 @@ public class GeneracMobileLinkGeneratorHandler extends BaseThingHandler {
         });
         Arrays.stream(apparatusDetail.properties).filter(p -> p.type == 69).findFirst().ifPresent(p -> {
             try {
-                updateState(CHANNEL_BATTERY_VOLTAGE,
-                        new QuantityType<ElectricPotential>(Float.parseFloat(p.value), Units.VOLT));
+                updateState(CHANNEL_BATTERY_VOLTAGE, new QuantityType<>(Float.parseFloat(p.value), Units.VOLT));
             } catch (NumberFormatException e) {
                 logger.debug("Could not parse batteryVoltage {}", p.value);
                 updateState(CHANNEL_BATTERY_VOLTAGE, UnDefType.UNDEF);
@@ -112,7 +107,7 @@ public class GeneracMobileLinkGeneratorHandler extends BaseThingHandler {
         });
         Arrays.stream(apparatusDetail.properties).filter(p -> p.type == 31).findFirst().ifPresent(p -> {
             try {
-                updateState(CHANNEL_HOURS_OF_PROTECTION, new QuantityType<Time>(Float.parseFloat(p.value), Units.HOUR));
+                updateState(CHANNEL_HOURS_OF_PROTECTION, new QuantityType<>(Float.parseFloat(p.value), Units.HOUR));
             } catch (NumberFormatException e) {
                 logger.debug("Could not parse hoursOfProtection {}", p.value);
                 updateState(CHANNEL_HOURS_OF_PROTECTION, UnDefType.UNDEF);
@@ -121,7 +116,7 @@ public class GeneracMobileLinkGeneratorHandler extends BaseThingHandler {
         apparatus.properties.stream().filter(p -> p.type == 3).findFirst().ifPresent(p -> {
             try {
                 if (p.value.signalStrength != null) {
-                    updateState(CHANNEL_SIGNAL_STRENGH, new QuantityType<Dimensionless>(
+                    updateState(CHANNEL_SIGNAL_STRENGH, new QuantityType<>(
                             Integer.parseInt(p.value.signalStrength.replace("%", "")), Units.PERCENT));
                 }
             } catch (NumberFormatException e) {
diff --git a/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java b/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java
index 3cebdc84db4..af9db1abab3 100644
--- a/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java
+++ b/bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java
@@ -131,7 +131,7 @@ public class GroheOndusSenseGuardHandler<T, M> extends GroheOndusBaseHandler<App
     private QuantityType<Volume> sumWaterConsumption(Data dataPoint) {
         Double waterConsumption = dataPoint.getWithdrawals().stream()
                 .mapToDouble(withdrawal -> withdrawal.getWaterconsumption()).sum();
-        return new QuantityType<Volume>(waterConsumption, Units.LITRE);
+        return new QuantityType<>(waterConsumption, Units.LITRE);
     }
 
     private Measurement getLastMeasurement(Data dataPoint) {
diff --git a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
index 4db989700de..54faf94b02a 100644
--- a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
+++ b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
@@ -398,7 +398,7 @@ public class GroupePSAHandler extends BaseThingHandler {
 
     protected <T extends Quantity<T>> void updateState(String channelID, @Nullable BigDecimal number, Unit<T> unit) {
         if (number != null) {
-            updateState(channelID, new QuantityType<T>(number, unit));
+            updateState(channelID, new QuantityType<>(number, unit));
         } else {
             updateState(channelID, UnDefType.UNDEF);
         }
diff --git a/bundles/org.openhab.binding.haassohnpelletstove/src/main/java/org/openhab/binding/haassohnpelletstove/internal/HaasSohnpelletstoveHandler.java b/bundles/org.openhab.binding.haassohnpelletstove/src/main/java/org/openhab/binding/haassohnpelletstove/internal/HaasSohnpelletstoveHandler.java
index ece74acfa99..9060f82f1f4 100644
--- a/bundles/org.openhab.binding.haassohnpelletstove/src/main/java/org/openhab/binding/haassohnpelletstove/internal/HaasSohnpelletstoveHandler.java
+++ b/bundles/org.openhab.binding.haassohnpelletstove/src/main/java/org/openhab/binding/haassohnpelletstove/internal/HaasSohnpelletstoveHandler.java
@@ -61,7 +61,7 @@ public class HaasSohnpelletstoveHandler extends BaseThingHandler {
 
     private boolean automaticRefreshing = false;
 
-    private Map<String, Boolean> linkedChannels = new HashMap<String, Boolean>();
+    private Map<String, Boolean> linkedChannels = new HashMap<>();
 
     public HaasSohnpelletstoveHandler(Thing thing) {
         super(thing);
@@ -251,7 +251,7 @@ public class HaasSohnpelletstoveHandler extends BaseThingHandler {
             if (data != null) {
                 switch (channelId) {
                     case CHANNELISTEMP:
-                        state = new QuantityType<Temperature>(Double.valueOf(data.getisTemp()), SIUnits.CELSIUS);
+                        state = new QuantityType<>(Double.valueOf(data.getisTemp()), SIUnits.CELSIUS);
                         update(state, channelId);
                         break;
                     case CHANNELMODE:
@@ -265,7 +265,7 @@ public class HaasSohnpelletstoveHandler extends BaseThingHandler {
                         update(OnOffType.from(data.getEcoMode()), channelId);
                         break;
                     case CHANNELSPTEMP:
-                        state = new QuantityType<Temperature>(Double.valueOf(data.getspTemp()), SIUnits.CELSIUS);
+                        state = new QuantityType<>(Double.valueOf(data.getspTemp()), SIUnits.CELSIUS);
                         update(state, channelId);
                         break;
                     case CHANNELCLEANINGIN:
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java
index 956f0fbf8aa..19acf5691ca 100644
--- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java
@@ -174,7 +174,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
 
     private void initializeChannels() {
         // Rebuild dynamic channels and synchronize with cache.
-        updateThing(editThing().withChannels(new ArrayList<Channel>()).build());
+        updateThing(editThing().withChannels(new ArrayList<>()).build());
         sceneCache.clear();
         sceneCollectionCache.clear();
         scheduledEventCache.clear();
@@ -465,7 +465,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
         }
 
         logger.debug("Updating all scene channels, changes detected");
-        sceneCache = new CopyOnWriteArrayList<Scene>(scenes);
+        sceneCache = new CopyOnWriteArrayList<>(scenes);
 
         List<Channel> allChannels = new ArrayList<>(getThing().getChannels());
         allChannels.removeIf(c -> HDPowerViewBindingConstants.CHANNEL_GROUP_SCENES.equals(c.getUID().getGroupId()));
@@ -504,7 +504,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
         }
 
         logger.debug("Updating all scene group channels, changes detected");
-        sceneCollectionCache = new CopyOnWriteArrayList<SceneCollection>(sceneCollections);
+        sceneCollectionCache = new CopyOnWriteArrayList<>(sceneCollections);
 
         List<Channel> allChannels = new ArrayList<>(getThing().getChannels());
         allChannels
@@ -543,7 +543,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
         }
 
         logger.debug("Updating all automation channels, changes detected");
-        scheduledEventCache = new CopyOnWriteArrayList<ScheduledEvent>(scheduledEvents);
+        scheduledEventCache = new CopyOnWriteArrayList<>(scheduledEvents);
 
         List<Channel> allChannels = new ArrayList<>(getThing().getChannels());
         allChannels
diff --git a/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/internal/gen3/Generation3DtoTest.java b/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/internal/gen3/Generation3DtoTest.java
index 04cd52f0880..8067ce69bc5 100644
--- a/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/internal/gen3/Generation3DtoTest.java
+++ b/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/internal/gen3/Generation3DtoTest.java
@@ -190,7 +190,7 @@ public class Generation3DtoTest {
         ThingTypeUID thingTypeUID = new ThingTypeUID("hdpowerview:shade");
         ThingUID thingUID = new ThingUID(thingTypeUID, "test");
 
-        List<Channel> channels = new ArrayList<Channel>();
+        List<Channel> channels = new ArrayList<>();
         for (String channelId : Set.of(CHANNEL_SHADE_POSITION, CHANNEL_SHADE_SECONDARY_POSITION, CHANNEL_SHADE_VANE,
                 CHANNEL_SHADE_BATTERY_LEVEL, CHANNEL_SHADE_LOW_BATTERY, CHANNEL_SHADE_SIGNAL_STRENGTH)) {
             ChannelUID channelUID = new ChannelUID(thingUID, channelId);
@@ -247,7 +247,7 @@ public class Generation3DtoTest {
         ThingTypeUID thingTypeUID = new ThingTypeUID("hdpowerview:shade");
         ThingUID thingUID = new ThingUID(thingTypeUID, "test");
 
-        List<Channel> channels = new ArrayList<Channel>();
+        List<Channel> channels = new ArrayList<>();
         for (String channelId : Set.of(CHANNEL_SHADE_POSITION, CHANNEL_SHADE_SECONDARY_POSITION, CHANNEL_SHADE_VANE,
                 CHANNEL_SHADE_BATTERY_LEVEL, CHANNEL_SHADE_LOW_BATTERY, CHANNEL_SHADE_SIGNAL_STRENGTH)) {
             ChannelUID channelUID = new ChannelUID(thingUID, channelId);
diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java
index af7edb077cc..ecda2ef4cc3 100644
--- a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java
+++ b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationBindingConstants.java
@@ -56,7 +56,7 @@ public class HeliosVentilationBindingConstants {
      *
      */
     private static Map<Byte, HeliosVentilationDataPoint> readChannelProperties() {
-        HashMap<Byte, HeliosVentilationDataPoint> result = new HashMap<Byte, HeliosVentilationDataPoint>();
+        HashMap<Byte, HeliosVentilationDataPoint> result = new HashMap<>();
 
         URL resource = Thread.currentThread().getContextClassLoader().getResource(DATAPOINT_FILE);
         Properties properties = new Properties();
diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java
index bb2cc9ca85f..d009152c31b 100644
--- a/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java
+++ b/bundles/org.openhab.binding.heliosventilation/src/main/java/org/openhab/binding/heliosventilation/internal/HeliosVentilationHandler.java
@@ -66,7 +66,7 @@ public class HeliosVentilationHandler extends BaseThingHandler implements Serial
     /**
      * store received data for read-modify-write operations on bitlevel
      */
-    private final Map<Byte, Byte> memory = new HashMap<Byte, Byte>();
+    private final Map<Byte, Byte> memory = new HashMap<>();
 
     private final SerialPortManager serialPortManager;
 
diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/BinRpcNetworkService.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/BinRpcNetworkService.java
index 7a8056818c2..81bae1070df 100644
--- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/BinRpcNetworkService.java
+++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/BinRpcNetworkService.java
@@ -49,7 +49,7 @@ public class BinRpcNetworkService implements Runnable {
         serverSocket.setReuseAddress(true);
         serverSocket.bind(new InetSocketAddress(config.getBinCallbackPort()));
 
-        this.rpcResponseHandler = new RpcResponseHandler<byte[]>(listener) {
+        this.rpcResponseHandler = new RpcResponseHandler<>(listener) {
 
             @Override
             protected byte[] getEmptyStringResult() {
diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/XmlRpcServer.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/XmlRpcServer.java
index f3c011c1109..55bea0f6017 100644
--- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/XmlRpcServer.java
+++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/server/XmlRpcServer.java
@@ -51,7 +51,7 @@ public class XmlRpcServer implements RpcServer {
 
     public XmlRpcServer(RpcEventListener listener, HomematicConfig config) {
         this.config = config;
-        this.rpcResponseHander = new RpcResponseHandler<String>(listener) {
+        this.rpcResponseHander = new RpcResponseHandler<>(listener) {
 
             @Override
             protected String getEmptyStringResult() {
diff --git a/bundles/org.openhab.binding.homematic/src/test/java/org/openhab/binding/homematic/test/util/RpcClientMockImpl.java b/bundles/org.openhab.binding.homematic/src/test/java/org/openhab/binding/homematic/test/util/RpcClientMockImpl.java
index ecffad656a2..9eff0cae94c 100644
--- a/bundles/org.openhab.binding.homematic/src/test/java/org/openhab/binding/homematic/test/util/RpcClientMockImpl.java
+++ b/bundles/org.openhab.binding.homematic/src/test/java/org/openhab/binding/homematic/test/util/RpcClientMockImpl.java
@@ -67,7 +67,7 @@ public class RpcClientMockImpl extends RpcClient<String> {
 
     @Override
     protected RpcRequest<String> createRpcRequest(String methodName) {
-        return new RpcRequest<String>() {
+        return new RpcRequest<>() {
 
             @Override
             public void addArg(Object arg) {
diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java
index a9231752dfb..6b7c1f26f2d 100644
--- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java
+++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip1/Scene.java
@@ -86,7 +86,7 @@ public class Scene {
      */
     public List<String> getLightIds() {
         List<String> lightIds = this.lightIds;
-        return lightIds != null ? lightIds : new ArrayList<String>();
+        return lightIds != null ? lightIds : new ArrayList<>();
     }
 
     /**
diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java
index 7375442ef65..2baf35ded7f 100644
--- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java
+++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java
@@ -122,7 +122,7 @@ public class Clip2Bridge implements Closeable {
      * <li>onHeaders() HTTP unauthorized codes</li>
      */
     private abstract class BaseStreamListenerAdapter<T> extends Stream.Listener.Adapter {
-        protected final CompletableFuture<T> completable = new CompletableFuture<T>();
+        protected final CompletableFuture<T> completable = new CompletableFuture<>();
         private String contentType = "UNDEFINED";
         private int status;
 
diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/LocalScheduleResponse.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/LocalScheduleResponse.java
index 4b51792c947..28c2bd68eaa 100644
--- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/LocalScheduleResponse.java
+++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/LocalScheduleResponse.java
@@ -22,9 +22,9 @@ import java.util.List;
  */
 public class LocalScheduleResponse extends Response {
 
-    public List<Running> running = new LinkedList<Running>();
+    public List<Running> running = new LinkedList<>();
 
-    public List<Relay> relays = new LinkedList<Relay>();
+    public List<Relay> relays = new LinkedList<>();
 
     public String name;
 
diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/StatusScheduleResponse.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/StatusScheduleResponse.java
index 34a5da1e706..37e6384d87a 100644
--- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/StatusScheduleResponse.java
+++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/api/local/dto/StatusScheduleResponse.java
@@ -30,7 +30,7 @@ public class StatusScheduleResponse extends LocalScheduleResponse {
 
     public Integer nextpoll;
 
-    public List<Sensor> sensors = new LinkedList<Sensor>();
+    public List<Sensor> sensors = new LinkedList<>();
 
     public String message;
 
@@ -52,7 +52,7 @@ public class StatusScheduleResponse extends LocalScheduleResponse {
 
     public String lastContact;
 
-    public List<Forecast> forecast = new LinkedList<Forecast>();
+    public List<Forecast> forecast = new LinkedList<>();
 
     public String status;
 
diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseAccountHandler.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseAccountHandler.java
index 548efe5d026..32120bf86d5 100644
--- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseAccountHandler.java
+++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseAccountHandler.java
@@ -69,7 +69,7 @@ public class HydrawiseAccountHandler extends BaseBridgeHandler implements Access
     private static final String CLIENT_ID = "hydrawise_app";
     private static final String SCOPE = "all";
     private final List<HydrawiseControllerListener> controllerListeners = Collections
-            .synchronizedList(new ArrayList<HydrawiseControllerListener>());
+            .synchronizedList(new ArrayList<>());
     private final HttpClient httpClient;
     private final OAuthFactory oAuthFactory;
     private @Nullable OAuthClientService oAuthService;
diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
index 3a4c7a53193..60c90f82ef1 100644
--- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
+++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
@@ -27,8 +27,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.measure.quantity.Speed;
-import javax.measure.quantity.Temperature;
 import javax.measure.quantity.Volume;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -281,8 +279,8 @@ public class HydrawiseControllerHandler extends BaseThingHandler implements Hydr
     }
 
     private void updateZones(List<Zone> zones) {
-        AtomicReference<Boolean> anyRunning = new AtomicReference<Boolean>(false);
-        AtomicReference<Boolean> anySuspended = new AtomicReference<Boolean>(false);
+        AtomicReference<Boolean> anyRunning = new AtomicReference<>(false);
+        AtomicReference<Boolean> anySuspended = new AtomicReference<>(false);
         for (Zone zone : zones) {
             // there are 12 relays per expander, expanders will have a zoneNumber like:
             // 10 for expander 0, relay 10 = zone10
@@ -385,12 +383,12 @@ public class HydrawiseControllerHandler extends BaseThingHandler implements Hydr
 
     private void updateTemperature(UnitValue temperature, String group, String channel) {
         logger.debug("TEMP {} {} {} {}", group, channel, temperature.unit, temperature.value);
-        updateGroupState(group, channel, new QuantityType<Temperature>(temperature.value,
+        updateGroupState(group, channel, new QuantityType<>(temperature.value,
                 "\\u00b0F".equals(temperature.unit) ? ImperialUnits.FAHRENHEIT : SIUnits.CELSIUS));
     }
 
     private void updateWindspeed(UnitValue wind, String group, String channel) {
-        updateGroupState(group, channel, new QuantityType<Speed>(wind.value,
+        updateGroupState(group, channel, new QuantityType<>(wind.value,
                 "mph".equals(wind.unit) ? ImperialUnits.MILES_PER_HOUR : SIUnits.KILOMETRE_PER_HOUR));
     }
 
diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java
index 3102ccc577f..d491d3fc986 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java
+++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java
@@ -101,9 +101,9 @@ class BiweeklyPresentableCalendar extends AbstractPresentableCalendar {
 
     @Override
     public @Nullable Event getNextEvent(Instant instant) {
-        final Collection<VEventWPeriod> candidates = new ArrayList<VEventWPeriod>();
-        final Collection<VEvent> negativeEvents = new ArrayList<VEvent>();
-        final Collection<VEvent> positiveEvents = new ArrayList<VEvent>();
+        final Collection<VEventWPeriod> candidates = new ArrayList<>();
+        final Collection<VEvent> negativeEvents = new ArrayList<>();
+        final Collection<VEvent> positiveEvents = new ArrayList<>();
         classifyEvents(positiveEvents, negativeEvents);
         for (final VEvent currentEvent : positiveEvents) {
             final DateIterator startDates = this.getRecurredEventDateIterator(currentEvent);
@@ -298,8 +298,8 @@ class BiweeklyPresentableCalendar extends AbstractPresentableCalendar {
      * @return A VEventWPeriod describing the event or null if there is none.
      */
     private @Nullable VEventWPeriod getCurrentComponentWPeriod(Instant instant) {
-        final List<VEvent> negativeEvents = new ArrayList<VEvent>();
-        final List<VEvent> positiveEvents = new ArrayList<VEvent>();
+        final List<VEvent> negativeEvents = new ArrayList<>();
+        final List<VEvent> positiveEvents = new ArrayList<>();
         classifyEvents(positiveEvents, negativeEvents);
 
         VEventWPeriod earliestEndingEvent = null;
diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/Event.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/Event.java
index e4b27fa1193..35a30524412 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/Event.java
+++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/Event.java
@@ -27,7 +27,7 @@ import org.eclipse.jdt.annotation.Nullable;
  */
 @NonNullByDefault
 public class Event implements Comparable<Event> {
-    public final List<CommandTag> commandTags = new ArrayList<CommandTag>();
+    public final List<CommandTag> commandTags = new ArrayList<>();
     public final Instant end;
     public final Instant start;
     public final String title;
diff --git a/bundles/org.openhab.binding.icloud/src/test/java/org/openhab/binding/icloud/TestICloud.java b/bundles/org.openhab.binding.icloud/src/test/java/org/openhab/binding/icloud/TestICloud.java
index 82dafe3f6d5..a7fe1030838 100644
--- a/bundles/org.openhab.binding.icloud/src/test/java/org/openhab/binding/icloud/TestICloud.java
+++ b/bundles/org.openhab.binding.icloud/src/test/java/org/openhab/binding/icloud/TestICloud.java
@@ -93,8 +93,8 @@ public class TestICloud {
         File jsonStorageFile = new File(System.getProperty("user.home"), "openhab.json");
         logger.info(jsonStorageFile.toString());
 
-        JsonStorage<String> stateStorage = new JsonStorage<String>(jsonStorageFile, TestICloud.class.getClassLoader(),
-                0, 1000, 1000, List.of());
+        JsonStorage<String> stateStorage = new JsonStorage<>(jsonStorageFile, TestICloud.class.getClassLoader(), 0,
+                1000, 1000, List.of());
 
         ICloudService service = new ICloudService(iCloudTestEmail, iCloudTestPassword, stateStorage);
         service.authenticate(false);
@@ -502,7 +502,7 @@ public class TestICloud {
             @Override
             public List<ChannelBuilder> createChannelBuilders(ChannelGroupUID channelGroupUID,
                     ChannelGroupTypeUID channelGroupTypeUID) {
-                return new ArrayList<ChannelBuilder>(); // dummy implementation, probably won't work.
+                return new ArrayList<>(); // dummy implementation, probably won't work.
             }
 
             @Override
diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBinding.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBinding.java
index eb18bf31a25..59b43d54138 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBinding.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBinding.java
@@ -421,7 +421,7 @@ public class InsteonBinding {
 
     private String toGroupString(List<Byte> group) {
         List<Byte> sorted = new ArrayList<>(group);
-        Collections.sort(sorted, new Comparator<Byte>() {
+        Collections.sort(sorted, new Comparator<>() {
             @Override
             public int compare(Byte b1, Byte b2) {
                 int i1 = b1 & 0xFF;
diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/InsteonDevice.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/InsteonDevice.java
index 9cf753db91c..db4430f3f84 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/InsteonDevice.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/InsteonDevice.java
@@ -73,7 +73,7 @@ public class InsteonDevice {
     private boolean hasModemDBEntry = false;
     private DeviceStatus status = DeviceStatus.INITIALIZED;
     private Map<Integer, GroupMessageStateMachine> groupState = new HashMap<>();
-    private Map<String, Object> deviceConfigMap = new HashMap<String, Object>();
+    private Map<String, Object> deviceConfigMap = new HashMap<>();
 
     /**
      * Constructor
diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java
index 72fabf18950..cbadcc944e1 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/Msg.java
@@ -457,7 +457,7 @@ public class Msg {
     public String toString() {
         String s = (direction == Direction.TO_MODEM) ? "OUT:" : "IN:";
         // need to first sort the fields by offset
-        Comparator<Field> cmp = new Comparator<Field>() {
+        Comparator<Field> cmp = new Comparator<>() {
             @Override
             public int compare(Field f1, Field f2) {
                 return f1.getOffset() - f2.getOffset();
diff --git a/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisBoxHandler.java b/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisBoxHandler.java
index 538a96fc88d..5a82a2e2318 100644
--- a/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisBoxHandler.java
+++ b/bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisBoxHandler.java
@@ -25,8 +25,6 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.intesis.internal.IntesisDynamicStateDescriptionProvider;
@@ -238,14 +236,14 @@ public class IntesisBoxHandler extends BaseThingHandler implements IntesisBoxCha
                     value = "0";
                 }
                 updateState(CHANNEL_TYPE_TARGETTEMP,
-                        new QuantityType<Temperature>(Double.valueOf(value) / 10.0d, SIUnits.CELSIUS));
+                        new QuantityType<>(Double.valueOf(value) / 10.0d, SIUnits.CELSIUS));
                 break;
             case "AMBTEMP":
                 if (Double.valueOf(value).isNaN()) {
                     value = "0";
                 }
                 updateState(CHANNEL_TYPE_AMBIENTTEMP,
-                        new QuantityType<Temperature>(Double.valueOf(value) / 10.0d, SIUnits.CELSIUS));
+                        new QuantityType<>(Double.valueOf(value) / 10.0d, SIUnits.CELSIUS));
                 break;
             case "MODE":
                 updateState(CHANNEL_TYPE_MODE, new StringType(value));
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/AmcrestHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/AmcrestHandler.java
index 57e3e0970ae..2fa8936b891 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/AmcrestHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/AmcrestHandler.java
@@ -226,6 +226,6 @@ public class AmcrestHandler extends ChannelDuplexHandler {
     // If a camera does not need to poll a request as often as snapshots, it can be
     // added here. Binding steps through the list.
     public ArrayList<String> getLowPriorityRequests() {
-        return new ArrayList<String>(1);
+        return new ArrayList<>(1);
     }
 }
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DoorBirdHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DoorBirdHandler.java
index dbe87c819db..d7c0fc563e2 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DoorBirdHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DoorBirdHandler.java
@@ -95,6 +95,6 @@ public class DoorBirdHandler extends ChannelDuplexHandler {
     // If a camera does not need to poll a request as often as snapshots, it can be
     // added here. Binding steps through the list.
     public ArrayList<String> getLowPriorityRequests() {
-        return new ArrayList<String>(1);
+        return new ArrayList<>(1);
     }
 }
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java
index 67a39b8c45a..0ea900151e2 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java
@@ -49,7 +49,7 @@ public class Ffmpeg {
     private @Nullable Process process = null;
     private String ffmpegCommand = "";
     private FFmpegFormat format;
-    private List<String> commandArrayList = new ArrayList<String>();
+    private List<String> commandArrayList = new ArrayList<>();
     private IpCameraFfmpegThread ipCameraFfmpegThread = new IpCameraFfmpegThread();
     private int keepAlive = 8;
     private String password;
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/HttpOnlyHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/HttpOnlyHandler.java
index c600c881478..289d3cb8006 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/HttpOnlyHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/HttpOnlyHandler.java
@@ -81,6 +81,6 @@ public class HttpOnlyHandler extends ChannelDuplexHandler {
     // If a camera does not need to poll a request as often as snapshots, it can be
     // added here. Binding steps through the list and sends 1 every 8 seconds.
     public ArrayList<String> getLowPriorityRequests() {
-        return new ArrayList<String>(0);
+        return new ArrayList<>(0);
     }
 }
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java
index 60575258e9f..8d614fa2b32 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java
@@ -381,7 +381,7 @@ public class InstarHandler extends ChannelDuplexHandler {
     // If a camera does not need to poll a request as often as snapshots, it can be
     // added here. Binding steps through the list.
     public ArrayList<String> getLowPriorityRequests() {
-        ArrayList<String> lowPriorityRequests = new ArrayList<String>(7);
+        ArrayList<String> lowPriorityRequests = new ArrayList<>(7);
         lowPriorityRequests.add("/param.cgi?cmd=getaudioalarmattr");
         lowPriorityRequests.add("/cgi-bin/hi3510/param.cgi?cmd=getmdattr");
         if (ipCameraHandler.newInstarApi) {// old API cameras get a error 404 response to this
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraBindingConstants.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraBindingConstants.java
index 2e3249373bf..b4b3a7b5d24 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraBindingConstants.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraBindingConstants.java
@@ -71,12 +71,11 @@ public class IpCameraBindingConstants {
     public static final String REOLINK_THING = "reolink";
     public static final ThingTypeUID THING_TYPE_REOLINK = new ThingTypeUID(BINDING_ID, REOLINK_THING);
 
-    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<ThingTypeUID>(
+    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<>(
             Arrays.asList(THING_TYPE_ONVIF, THING_TYPE_GENERIC, THING_TYPE_AMCREST, THING_TYPE_DAHUA, THING_TYPE_INSTAR,
                     THING_TYPE_FOSCAM, THING_TYPE_DOORBIRD, THING_TYPE_HIKVISION, THING_TYPE_REOLINK));
 
-    public static final Set<ThingTypeUID> GROUP_SUPPORTED_THING_TYPES = new HashSet<ThingTypeUID>(
-            Arrays.asList(THING_TYPE_GROUP));
+    public static final Set<ThingTypeUID> GROUP_SUPPORTED_THING_TYPES = new HashSet<>(Arrays.asList(THING_TYPE_GROUP));
 
     // List of all Thing Config items
     public static final String CONFIG_IPADDRESS = "ipAddress";
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java
index 02eedf594f4..6f2fc063f52 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java
@@ -56,7 +56,7 @@ public class IpCameraGroupHandler extends BaseThingHandler {
     private final HttpService httpService;
     public GroupConfig groupConfig;
     private BigDecimal pollTimeInSeconds = new BigDecimal(2);
-    public ArrayList<IpCameraHandler> cameraOrder = new ArrayList<IpCameraHandler>(2);
+    public ArrayList<IpCameraHandler> cameraOrder = new ArrayList<>(2);
     private final ScheduledExecutorService pollCameraGroup = Executors.newSingleThreadScheduledExecutor();
     private @Nullable ScheduledFuture<?> pollCameraGroupJob = null;
     private @Nullable GroupServlet servlet;
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
index 28523600d88..5ab4d2745a3 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
@@ -162,7 +162,7 @@ public class IpCameraHandler extends BaseThingHandler {
     private String mp4Filename = "ipcamera";
     private int mp4RecordTime;
     private int gifRecordTime = 5;
-    private LinkedList<byte[]> fifoSnapshotBuffer = new LinkedList<byte[]>();
+    private LinkedList<byte[]> fifoSnapshotBuffer = new LinkedList<>();
     private int snapCount;
     private boolean updateImageChannel = false;
     private byte lowPriorityCounter = 0;
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifDiscovery.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifDiscovery.java
index 6bd02568b0d..2e47c25179c 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifDiscovery.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifDiscovery.java
@@ -67,7 +67,7 @@ public class OnvifDiscovery {
     private IpCameraDiscoveryService ipCameraDiscoveryService;
     private final Logger logger = LoggerFactory.getLogger(OnvifDiscovery.class);
     private final NetworkAddressService networkAddressService;
-    public ArrayList<DatagramPacket> listOfReplys = new ArrayList<DatagramPacket>(10);
+    public ArrayList<DatagramPacket> listOfReplys = new ArrayList<>(10);
 
     public OnvifDiscovery(NetworkAddressService networkAddressService,
             IpCameraDiscoveryService ipCameraDiscoveryService) {
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/OpenStreams.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/OpenStreams.java
index 5045cb36e95..94b0e2c6cfe 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/OpenStreams.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/OpenStreams.java
@@ -26,7 +26,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
  */
 @NonNullByDefault
 public class OpenStreams {
-    private List<StreamOutput> openStreams = Collections.synchronizedList(new ArrayList<StreamOutput>());
+    private List<StreamOutput> openStreams = Collections.synchronizedList(new ArrayList<>());
     public String boundary = "thisMjpegStream";
 
     public synchronized void addStream(StreamOutput stream) {
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/StreamOutput.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/StreamOutput.java
index bd0c85de137..14b4a8c0ce4 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/StreamOutput.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/StreamOutput.java
@@ -35,7 +35,7 @@ public class StreamOutput {
     private final String boundary;
     private String contentType;
     private final ServletOutputStream output;
-    private BlockingQueue<byte[]> fifo = new ArrayBlockingQueue<byte[]>(50);
+    private BlockingQueue<byte[]> fifo = new ArrayBlockingQueue<>(50);
     private boolean connected = false;
     public boolean isSnapshotBased = false;
 
diff --git a/bundles/org.openhab.binding.ipobserver/src/main/java/org/openhab/binding/ipobserver/internal/IpObserverHandler.java b/bundles/org.openhab.binding.ipobserver/src/main/java/org/openhab/binding/ipobserver/internal/IpObserverHandler.java
index 7d4aa3cf49b..e87a9fcfc1c 100644
--- a/bundles/org.openhab.binding.ipobserver/src/main/java/org/openhab/binding/ipobserver/internal/IpObserverHandler.java
+++ b/bundles/org.openhab.binding.ipobserver/src/main/java/org/openhab/binding/ipobserver/internal/IpObserverHandler.java
@@ -73,7 +73,7 @@ public class IpObserverHandler extends BaseThingHandler {
     private final HttpClient httpClient;
     private final IpObserverUpdateReceiver ipObserverUpdateReceiver;
     private final Logger logger = LoggerFactory.getLogger(IpObserverHandler.class);
-    private Map<String, ChannelHandler> channelHandlers = new HashMap<String, ChannelHandler>();
+    private Map<String, ChannelHandler> channelHandlers = new HashMap<>();
     private @Nullable ScheduledFuture<?> pollingFuture = null;
     private IpObserverConfiguration config = new IpObserverConfiguration();
     private String idPass = "";
@@ -92,7 +92,7 @@ public class IpObserverHandler extends BaseThingHandler {
         private Channel channel;
         private String previousValue = "";
         private Unit<?> unit;
-        private final ArrayList<Class<? extends State>> acceptedDataTypes = new ArrayList<Class<? extends State>>();
+        private final ArrayList<Class<? extends State>> acceptedDataTypes = new ArrayList<>();
 
         ChannelHandler(IpObserverHandler handler, Channel channel, Class<? extends State> acceptable, Unit<?> unit) {
             super();
diff --git a/bundles/org.openhab.binding.irobot/src/main/java/org/openhab/binding/irobot/internal/dto/MQTTProtocol.java b/bundles/org.openhab.binding.irobot/src/main/java/org/openhab/binding/irobot/internal/dto/MQTTProtocol.java
index 7f9fad85e22..3f61ee39ab0 100644
--- a/bundles/org.openhab.binding.irobot/src/main/java/org/openhab/binding/irobot/internal/dto/MQTTProtocol.java
+++ b/bundles/org.openhab.binding.irobot/src/main/java/org/openhab/binding/irobot/internal/dto/MQTTProtocol.java
@@ -44,7 +44,7 @@ public class MQTTProtocol {
             pmapId = mapId;
             this.userPmapvId = userPmapvId;
 
-            regions = new ArrayList<Region>();
+            regions = new ArrayList<>();
             for (int i = 0; (i < pregions.length) && (i < types.length); i++) {
                 regions.add(new Region(pregions[i], types[i]));
             }
diff --git a/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/KnxNetFrame.java b/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/KnxNetFrame.java
index a6c86435cdf..578a06ccdcd 100644
--- a/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/KnxNetFrame.java
+++ b/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/KnxNetFrame.java
@@ -31,7 +31,7 @@ public class KnxNetFrame {
     public static final byte[] CONNECTION_HEADER = new byte[4];
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KnxNetFrame.class);
-    private ArrayList<SetDatapointValueMessage> valueMessages = new ArrayList<SetDatapointValueMessage>();
+    private ArrayList<SetDatapointValueMessage> valueMessages = new ArrayList<>();
     private byte mainService;
     private byte subService = SubServiceType.SET_DATAPOINT_VALUE_REQUEST;
     private int startDataPoint;
@@ -51,7 +51,7 @@ public class KnxNetFrame {
     }
 
     public KnxNetFrame() {
-        this.valueMessages = new ArrayList<SetDatapointValueMessage>();
+        this.valueMessages = new ArrayList<>();
     }
 
     /**
diff --git a/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java b/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java
index 6bf220d7a31..0ef9c9dc3b8 100644
--- a/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java
+++ b/bundles/org.openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/server/Server.java
@@ -238,7 +238,7 @@ public class Server extends Thread {
     }
 
     private ArrayList<byte[]> getPackages(byte[] data) {
-        ArrayList<byte[]> result = new ArrayList<byte[]>();
+        ArrayList<byte[]> result = new ArrayList<>();
         if (data.length >= 0) {
             ByteBuffer list = ByteBuffer.allocate(data.length);
             list.put(data);
diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/ec3k/Ec3kSensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/ec3k/Ec3kSensorHandler.java
index ccf01d07a8e..8fe868cd242 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/ec3k/Ec3kSensorHandler.java
+++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/ec3k/Ec3kSensorHandler.java
@@ -49,7 +49,7 @@ public class Ec3kSensorHandler extends JeeLinkSensorHandler<Ec3kReading> {
 
     @Override
     public ReadingPublisher<Ec3kReading> createPublisher() {
-        ReadingPublisher<Ec3kReading> publisher = new ReadingPublisher<Ec3kReading>() {
+        ReadingPublisher<Ec3kReading> publisher = new ReadingPublisher<>() {
             @Override
             public void publish(Ec3kReading reading) {
                 if (reading != null && getThing().getStatus() == ThingStatus.ONLINE) {
@@ -78,8 +78,7 @@ public class Ec3kSensorHandler extends JeeLinkSensorHandler<Ec3kReading> {
 
         BufferedSensorConfig cfg = getConfigAs(BufferedSensorConfig.class);
         if (cfg.bufferSize > 1 && cfg.updateInterval > 0) {
-            publisher = new RollingAveragePublisher<Ec3kReading>(cfg.bufferSize, cfg.updateInterval, publisher,
-                    scheduler) {
+            publisher = new RollingAveragePublisher<>(cfg.bufferSize, cfg.updateInterval, publisher, scheduler) {
                 @Override
                 public RollingReadingAverage<Ec3kReading> createRollingReadingAverage(int bufferSize) {
                     return new Ec3kRollingReadingAverage(bufferSize);
diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java
index 127bee61af8..36189874926 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java
+++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LaCrosseTemperatureSensorHandler.java
@@ -61,7 +61,7 @@ public class LaCrosseTemperatureSensorHandler extends JeeLinkSensorHandler<LaCro
 
     @Override
     public ReadingPublisher<LaCrosseTemperatureReading> createPublisher() {
-        return new ReadingPublisher<LaCrosseTemperatureReading>() {
+        return new ReadingPublisher<>() {
             private final Map<Integer, ReadingPublisher<LaCrosseTemperatureReading>> channelPublishers = new HashMap<>();
 
             @Override
@@ -120,7 +120,7 @@ public class LaCrosseTemperatureSensorHandler extends JeeLinkSensorHandler<LaCro
     }
 
     public ReadingPublisher<LaCrosseTemperatureReading> createPublisherForChannel(int channelNo) {
-        ReadingPublisher<LaCrosseTemperatureReading> publisher = new ReadingPublisher<LaCrosseTemperatureReading>() {
+        ReadingPublisher<LaCrosseTemperatureReading> publisher = new ReadingPublisher<>() {
             @Override
             public void publish(LaCrosseTemperatureReading reading) {
                 if (reading != null && getThing().getStatus() == ThingStatus.ONLINE) {
@@ -154,8 +154,7 @@ public class LaCrosseTemperatureSensorHandler extends JeeLinkSensorHandler<LaCro
 
         LaCrosseTemperatureSensorConfig cfg = getConfigAs(LaCrosseTemperatureSensorConfig.class);
         if (cfg.bufferSize > 1 && cfg.updateInterval > 0) {
-            publisher = new RollingAveragePublisher<LaCrosseTemperatureReading>(cfg.bufferSize, cfg.updateInterval,
-                    publisher, scheduler) {
+            publisher = new RollingAveragePublisher<>(cfg.bufferSize, cfg.updateInterval, publisher, scheduler) {
                 @Override
                 public RollingReadingAverage<LaCrosseTemperatureReading> createRollingReadingAverage(int bufferSize) {
                     return new LaCrosseRollingReadingAverage(bufferSize);
diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LgwSensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LgwSensorHandler.java
index a3885304ee9..876c9f938c0 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LgwSensorHandler.java
+++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/LgwSensorHandler.java
@@ -60,7 +60,7 @@ public class LgwSensorHandler extends JeeLinkSensorHandler<LgwReading> {
 
     @Override
     public ReadingPublisher<LgwReading> createPublisher() {
-        return new ReadingPublisher<LgwReading>() {
+        return new ReadingPublisher<>() {
             @Override
             public void publish(LgwReading reading) {
                 if (reading != null && getThing().getStatus() == ThingStatus.ONLINE) {
diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java
index 8ec1aa411de..447f4648d0b 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java
+++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/lacrosse/Tx22SensorHandler.java
@@ -48,7 +48,7 @@ public class Tx22SensorHandler extends JeeLinkSensorHandler<Tx22Reading> {
 
     @Override
     public ReadingPublisher<Tx22Reading> createPublisher() {
-        return new ReadingPublisher<Tx22Reading>() {
+        return new ReadingPublisher<>() {
             @Override
             public void publish(Tx22Reading reading) {
                 if (reading != null && getThing().getStatus() == ThingStatus.ONLINE) {
diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java
index 835b8159ba7..a03c8e9039b 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java
+++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/pca301/Pca301SensorHandler.java
@@ -96,7 +96,7 @@ public class Pca301SensorHandler extends JeeLinkSensorHandler<Pca301Reading> {
 
     @Override
     public ReadingPublisher<Pca301Reading> createPublisher() {
-        return new ReadingPublisher<Pca301Reading>() {
+        return new ReadingPublisher<>() {
             @Override
             public void publish(Pca301Reading reading) {
                 if (reading != null) {
diff --git a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/revolt/RevoltSensorHandler.java b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/revolt/RevoltSensorHandler.java
index 095f0c7024e..bd08a979c66 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/revolt/RevoltSensorHandler.java
+++ b/bundles/org.openhab.binding.jeelink/src/main/java/org/openhab/binding/jeelink/internal/revolt/RevoltSensorHandler.java
@@ -46,7 +46,7 @@ public class RevoltSensorHandler extends JeeLinkSensorHandler<RevoltReading> {
 
     @Override
     public ReadingPublisher<RevoltReading> createPublisher() {
-        return new ReadingPublisher<RevoltReading>() {
+        return new ReadingPublisher<>() {
             @Override
             public void publish(RevoltReading reading) {
                 if (reading != null && getThing().getStatus() == ThingStatus.ONLINE) {
diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/KaleidescapeBindingConstants.java b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/KaleidescapeBindingConstants.java
index 8f92a0b3ba2..908765c535e 100644
--- a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/KaleidescapeBindingConstants.java
+++ b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/KaleidescapeBindingConstants.java
@@ -126,11 +126,10 @@ public class KaleidescapeBindingConstants {
 
     // make a list of all allowed metatdata channels,
     // used to filter out what we don't want from the component
-    public static final Set<String> METADATA_CHANNELS = new HashSet<String>(
-            Arrays.asList(DETAIL_TITLE, DETAIL_ALBUM_TITLE, DETAIL_COVER_URL, DETAIL_HIRES_COVER_URL, DETAIL_RATING,
-                    DETAIL_YEAR, DETAIL_RUNNING_TIME, DETAIL_ACTORS, DETAIL_ARTIST, DETAIL_DIRECTORS, DETAIL_GENRES,
-                    DETAIL_RATING_REASON, DETAIL_SYNOPSIS, DETAIL_REVIEW, DETAIL_COLOR_DESCRIPTION, DETAIL_COUNTRY,
-                    DETAIL_ASPECT_RATIO, DETAIL_DISC_LOCATION));
+    public static final Set<String> METADATA_CHANNELS = new HashSet<>(Arrays.asList(DETAIL_TITLE, DETAIL_ALBUM_TITLE,
+            DETAIL_COVER_URL, DETAIL_HIRES_COVER_URL, DETAIL_RATING, DETAIL_YEAR, DETAIL_RUNNING_TIME, DETAIL_ACTORS,
+            DETAIL_ARTIST, DETAIL_DIRECTORS, DETAIL_GENRES, DETAIL_RATING_REASON, DETAIL_SYNOPSIS, DETAIL_REVIEW,
+            DETAIL_COLOR_DESCRIPTION, DETAIL_COUNTRY, DETAIL_ASPECT_RATIO, DETAIL_DISC_LOCATION));
 
     public static final String STANDBY_MSG = "Device is in standby";
     public static final String PROPERTY_COMPONENT_TYPE = "Component Type";
diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/discovery/KaleidescapeDiscoveryService.java b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/discovery/KaleidescapeDiscoveryService.java
index a24443e83dd..7c9994dda42 100644
--- a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/discovery/KaleidescapeDiscoveryService.java
+++ b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/discovery/KaleidescapeDiscoveryService.java
@@ -74,7 +74,7 @@ public class KaleidescapeDiscoveryService extends AbstractDiscoveryService {
     private static final String STRATO_S = "Strato S";
     private static final String DISC_VAULT = "Disc Vault";
 
-    private static final Set<String> ALLOWED_DEVICES = new HashSet<String>(
+    private static final Set<String> ALLOWED_DEVICES = new HashSet<>(
             Arrays.asList(PLAYER, CINEMA_ONE, ALTO, STRATO, STRATO_S, DISC_VAULT));
 
     @Nullable
@@ -85,7 +85,7 @@ public class KaleidescapeDiscoveryService extends AbstractDiscoveryService {
      */
     private boolean scanning;
 
-    private Set<String> foundIPs = new HashSet<String>();
+    private Set<String> foundIPs = new HashSet<>();
 
     @Activate
     public KaleidescapeDiscoveryService() {
diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java
index 2efa35bb2bf..51b3e02baf2 100644
--- a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java
+++ b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeHandler.java
@@ -74,7 +74,7 @@ public class KaleidescapeHandler extends BaseThingHandler implements Kaleidescap
 
     private final Logger logger = LoggerFactory.getLogger(KaleidescapeHandler.class);
     private final SerialPortManager serialPortManager;
-    private final Map<String, String> cache = new HashMap<String, String>();
+    private final Map<String, String> cache = new HashMap<>();
 
     protected final HttpClient httpClient;
     protected final Unit<Time> apiSecondUnit = Units.SECOND;
diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java
index af8748fce34..2d1a0a2e358 100644
--- a/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java
+++ b/bundles/org.openhab.binding.kaleidescape/src/main/java/org/openhab/binding/kaleidescape/internal/handler/KaleidescapeMessageHandler.java
@@ -23,8 +23,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.measure.quantity.Time;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.openhab.binding.kaleidescape.internal.KaleidescapeBindingConstants;
@@ -119,18 +117,18 @@ public enum KaleidescapeMessageHandler {
                 handler.updateChannel(TITLE_NUM, new DecimalType(Integer.parseInt(matcher.group(3))));
 
                 handler.updateChannel(TITLE_LENGTH,
-                        new QuantityType<Time>(Integer.parseInt(matcher.group(4)), handler.apiSecondUnit));
+                        new QuantityType<>(Integer.parseInt(matcher.group(4)), handler.apiSecondUnit));
 
                 handler.updateChannel(TITLE_LOC,
-                        new QuantityType<Time>(Integer.parseInt(matcher.group(5)), handler.apiSecondUnit));
+                        new QuantityType<>(Integer.parseInt(matcher.group(5)), handler.apiSecondUnit));
 
                 handler.updateChannel(CHAPTER_NUM, new DecimalType(Integer.parseInt(matcher.group(6))));
 
                 handler.updateChannel(CHAPTER_LENGTH,
-                        new QuantityType<Time>(Integer.parseInt(matcher.group(7)), handler.apiSecondUnit));
+                        new QuantityType<>(Integer.parseInt(matcher.group(7)), handler.apiSecondUnit));
 
                 handler.updateChannel(CHAPTER_LOC,
-                        new QuantityType<Time>(Integer.parseInt(matcher.group(8)), handler.apiSecondUnit));
+                        new QuantityType<>(Integer.parseInt(matcher.group(8)), handler.apiSecondUnit));
             } else {
                 logger.debug("PLAY_STATUS - no match on message: {}", message);
             }
@@ -321,10 +319,10 @@ public enum KaleidescapeMessageHandler {
                 handler.updateChannel(MUSIC_PLAY_SPEED, new StringType(matcher.group(2)));
 
                 handler.updateChannel(MUSIC_TRACK_LENGTH,
-                        new QuantityType<Time>(Integer.parseInt(matcher.group(3)), handler.apiSecondUnit));
+                        new QuantityType<>(Integer.parseInt(matcher.group(3)), handler.apiSecondUnit));
 
                 handler.updateChannel(MUSIC_TRACK_POSITION,
-                        new QuantityType<Time>(Integer.parseInt(matcher.group(4)), handler.apiSecondUnit));
+                        new QuantityType<>(Integer.parseInt(matcher.group(4)), handler.apiSecondUnit));
 
                 handler.updateChannel(MUSIC_TRACK_PROGRESS,
                         new DecimalType(BigDecimal.valueOf(Math.round(Double.parseDouble(matcher.group(5))))));
@@ -432,7 +430,7 @@ public enum KaleidescapeMessageHandler {
                         }
                         // special case for running time to create a QuantityType<Time>
                     } else if (DETAIL_RUNNING_TIME.equals(metaType)) {
-                        handler.updateDetailChannel(DETAIL_RUNNING_TIME, new QuantityType<Time>(
+                        handler.updateDetailChannel(DETAIL_RUNNING_TIME, new QuantityType<>(
                                 Integer.parseInt(value) * handler.metaRuntimeMultiple, handler.apiSecondUnit));
                         // everything else just send it as a string
                     } else {
diff --git a/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java b/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
index e4acd4b898e..80017a4ba14 100644
--- a/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
+++ b/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
@@ -26,13 +26,6 @@ import java.util.Objects;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.ElectricCurrent;
-import javax.measure.quantity.ElectricPotential;
-import javax.measure.quantity.Energy;
-import javax.measure.quantity.Power;
-import javax.measure.quantity.Time;
-
 import org.openhab.binding.keba.internal.KebaBindingConstants.KebaSeries;
 import org.openhab.binding.keba.internal.KebaBindingConstants.KebaType;
 import org.openhab.core.cache.ExpiringCacheMap;
@@ -333,14 +326,14 @@ public class KeContactHandler extends BaseThingHandler {
                     case "Curr HW": {
                         int state = entry.getValue().getAsInt();
                         maxSystemCurrent = state;
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_MAX_SYSTEM_CURRENT, newState);
                         if (maxSystemCurrent != 0) {
                             if (maxSystemCurrent < maxPresetCurrent) {
                                 transceiver.send("curr " + maxSystemCurrent, this);
                                 updateState(CHANNEL_MAX_PRESET_CURRENT,
-                                        new QuantityType<ElectricCurrent>(maxSystemCurrent / 1000.0, Units.AMPERE));
-                                updateState(CHANNEL_MAX_PRESET_CURRENT_RANGE, new QuantityType<Dimensionless>(
+                                        new QuantityType<>(maxSystemCurrent / 1000.0, Units.AMPERE));
+                                updateState(CHANNEL_MAX_PRESET_CURRENT_RANGE, new QuantityType<>(
                                         (maxSystemCurrent - 6000) * 100 / (maxSystemCurrent - 6000), Units.PERCENT));
                             }
                         } else {
@@ -351,30 +344,30 @@ public class KeContactHandler extends BaseThingHandler {
                     case "Curr user": {
                         int state = entry.getValue().getAsInt();
                         maxPresetCurrent = state;
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_MAX_PRESET_CURRENT, newState);
                         if (maxSystemCurrent != 0) {
-                            updateState(CHANNEL_MAX_PRESET_CURRENT_RANGE, new QuantityType<Dimensionless>(
+                            updateState(CHANNEL_MAX_PRESET_CURRENT_RANGE, new QuantityType<>(
                                     Math.min(100, (state - 6000) * 100 / (maxSystemCurrent - 6000)), Units.PERCENT));
                         }
                         break;
                     }
                     case "Curr FS": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_FAILSAFE_CURRENT, newState);
                         break;
                     }
                     case "Max curr": {
                         int state = entry.getValue().getAsInt();
                         maxPresetCurrent = state;
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_PILOT_CURRENT, newState);
                         break;
                     }
                     case "Max curr %": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<Dimensionless>(state / 10.0, Units.PERCENT);
+                        State newState = new QuantityType<>(state / 10.0, Units.PERCENT);
                         updateState(CHANNEL_PILOT_PWM, newState);
                         break;
                     }
@@ -408,67 +401,67 @@ public class KeContactHandler extends BaseThingHandler {
                     }
                     case "Sec": {
                         long state = entry.getValue().getAsLong();
-                        State newState = new QuantityType<Time>(state, Units.SECOND);
+                        State newState = new QuantityType<>(state, Units.SECOND);
                         updateState(CHANNEL_UPTIME, newState);
                         break;
                     }
                     case "U1": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricPotential>(state, Units.VOLT);
+                        State newState = new QuantityType<>(state, Units.VOLT);
                         updateState(CHANNEL_U1, newState);
                         break;
                     }
                     case "U2": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricPotential>(state, Units.VOLT);
+                        State newState = new QuantityType<>(state, Units.VOLT);
                         updateState(CHANNEL_U2, newState);
                         break;
                     }
                     case "U3": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricPotential>(state, Units.VOLT);
+                        State newState = new QuantityType<>(state, Units.VOLT);
                         updateState(CHANNEL_U3, newState);
                         break;
                     }
                     case "I1": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_I1, newState);
                         break;
                     }
                     case "I2": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_I2, newState);
                         break;
                     }
                     case "I3": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<ElectricCurrent>(state / 1000.0, Units.AMPERE);
+                        State newState = new QuantityType<>(state / 1000.0, Units.AMPERE);
                         updateState(CHANNEL_I3, newState);
                         break;
                     }
                     case "P": {
                         long state = entry.getValue().getAsLong();
-                        State newState = new QuantityType<Power>(state / 1000.0, Units.WATT);
+                        State newState = new QuantityType<>(state / 1000.0, Units.WATT);
                         updateState(CHANNEL_POWER, newState);
                         break;
                     }
                     case "PF": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<Dimensionless>(state / 10.0, Units.PERCENT);
+                        State newState = new QuantityType<>(state / 10.0, Units.PERCENT);
                         updateState(CHANNEL_POWER_FACTOR, newState);
                         break;
                     }
                     case "E pres": {
                         long state = entry.getValue().getAsLong();
-                        State newState = new QuantityType<Energy>(state / 10.0, Units.WATT_HOUR);
+                        State newState = new QuantityType<>(state / 10.0, Units.WATT_HOUR);
                         updateState(CHANNEL_SESSION_CONSUMPTION, newState);
                         break;
                     }
                     case "E total": {
                         long state = entry.getValue().getAsLong();
-                        State newState = new QuantityType<Energy>(state / 10.0, Units.WATT_HOUR);
+                        State newState = new QuantityType<>(state / 10.0, Units.WATT_HOUR);
                         updateState(CHANNEL_TOTAL_CONSUMPTION, newState);
                         break;
                     }
@@ -504,7 +497,7 @@ public class KeContactHandler extends BaseThingHandler {
                     }
                     case "Setenergy": {
                         int state = entry.getValue().getAsInt();
-                        State newState = new QuantityType<Energy>(state / 10.0, Units.WATT_HOUR);
+                        State newState = new QuantityType<>(state / 10.0, Units.WATT_HOUR);
                         updateState(CHANNEL_SETENERGY, newState);
                         break;
                     }
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java
index 4288c8b21cc..7d0af16f9b3 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java
@@ -75,7 +75,7 @@ public class SerialClient extends AbstractKNXClient {
         logger.trace("Checking for cEMI support");
 
         try (FT12Connection serialConnection = new FT12Connection(serialPort)) {
-            final CompletableFuture<byte[]> frameListener = new CompletableFuture<byte[]>();
+            final CompletableFuture<byte[]> frameListener = new CompletableFuture<>();
             serialConnection.addConnectionListener(frameReceived -> {
                 final byte[] content = frameReceived.getFrameBytes();
                 if ((content.length > 0) && (content[0] == peiIdentifyCon)) {
diff --git a/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/DepartureResult.java b/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/DepartureResult.java
index 905ec9c1c4c..d14b7e33c58 100644
--- a/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/DepartureResult.java
+++ b/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/DepartureResult.java
@@ -29,7 +29,7 @@ import com.google.gson.annotations.SerializedName;
 public class DepartureResult {
 
     @SerializedName(value = "departureList")
-    public List<Departure> departures = new ArrayList<Departure>();
+    public List<Departure> departures = new ArrayList<>();
 
     @Override
     public String toString() {
diff --git a/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVBridgeHandler.java b/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVBridgeHandler.java
index 639c69a9932..67dca6b93d1 100644
--- a/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVBridgeHandler.java
+++ b/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVBridgeHandler.java
@@ -130,7 +130,7 @@ public class KVVBridgeHandler extends BaseBridgeHandler {
          */
         public Cache() {
             this.updateInterval = KVVBindingConstants.CACHE_DEFAULT_UPDATEINTERVAL;
-            this.cache = new HashMap<String, CacheLine>();
+            this.cache = new HashMap<>();
         }
 
         /*
diff --git a/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVStopHandler.java b/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVStopHandler.java
index e73937880d0..0713f436bb0 100644
--- a/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVStopHandler.java
+++ b/bundles/org.openhab.binding.kvv/src/main/java/org/openhab/binding/kvv/internal/KVVStopHandler.java
@@ -99,7 +99,7 @@ public class KVVStopHandler extends BaseThingHandler {
                 logger.warn("maxTrains is '0', not creating any channels");
             }
 
-            final List<Channel> channels = new ArrayList<Channel>();
+            final List<Channel> channels = new ArrayList<>();
             for (int i = 0; i < bridgeHandler.getBridgeConfig().maxTrains; i++) {
                 ChannelUID c = new ChannelUID(this.thing.getUID(), "train" + i + "-name");
                 channels.add(ChannelBuilder.create(c, "String").withType(nameType).build());
diff --git a/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/authentication/HttpAuthenticationFilter.java b/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/authentication/HttpAuthenticationFilter.java
index 68cb7884c84..30e1b472082 100644
--- a/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/authentication/HttpAuthenticationFilter.java
+++ b/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/authentication/HttpAuthenticationFilter.java
@@ -211,7 +211,7 @@ class HttpAuthenticationFilter implements ClientRequestFilter, ClientResponseFil
 
         Invocation.Builder builder = resourceTarget.request(mediaType);
 
-        MultivaluedMap<String, Object> newHeaders = new MultivaluedHashMap<String, Object>();
+        MultivaluedMap<String, Object> newHeaders = new MultivaluedHashMap<>();
 
         for (Map.Entry<String, List<Object>> entry : request.getHeaders().entrySet()) {
             if (HttpHeaders.AUTHORIZATION.equals(entry.getKey())) {
diff --git a/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/filter/LoggingFilter.java b/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/filter/LoggingFilter.java
index f57ea20772a..212738e89a2 100644
--- a/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/filter/LoggingFilter.java
+++ b/bundles/org.openhab.binding.lametrictime/src/3rdparty/java/org/openhab/binding/lametrictime/internal/api/filter/LoggingFilter.java
@@ -93,7 +93,7 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
     private static final String LOGGING_ID_PROPERTY = LoggingFilter.class.getName() + ".id";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<>() {
 
         @Override
         public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
@@ -194,7 +194,7 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<>(
                 COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
@@ -352,4 +352,4 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
         return (name == null) ? UTF8 : Charset.forName(name);
     }
 
-}
\ No newline at end of file
+}
diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/cloud/dto/Icons.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/cloud/dto/Icons.java
index 711196fd187..8fe27d519aa 100644
--- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/cloud/dto/Icons.java
+++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/cloud/dto/Icons.java
@@ -22,7 +22,7 @@ import java.util.List;
  */
 public class Icons {
     private IconsMetadata meta;
-    private List<Icon> data = new ArrayList<Icon>();
+    private List<Icon> data = new ArrayList<>();
 
     public IconsMetadata getMeta() {
         return meta;
diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/CustomizedTypeAdapterFactory.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/CustomizedTypeAdapterFactory.java
index 160eea35e76..9f65f2d75b7 100644
--- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/CustomizedTypeAdapterFactory.java
+++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/CustomizedTypeAdapterFactory.java
@@ -54,7 +54,7 @@ public abstract class CustomizedTypeAdapterFactory<C> implements TypeAdapterFact
     private TypeAdapter<C> customizeMyClassAdapter(@Nullable Gson gson, TypeToken<C> type) {
         final TypeAdapter<C> delegate = gson.getDelegateAdapter(this, type);
         final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
-        return new TypeAdapter<C>() {
+        return new TypeAdapter<>() {
             @Override
             public void write(JsonWriter out, @Nullable C value) throws IOException {
                 JsonElement tree = delegate.toJsonTree(value);
diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/RuntimeTypeAdapterFactory.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/RuntimeTypeAdapterFactory.java
index 2ebaa310760..f8bbe7060de 100644
--- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/RuntimeTypeAdapterFactory.java
+++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/common/impl/typeadapters/imported/RuntimeTypeAdapterFactory.java
@@ -170,8 +170,8 @@ import com.google.gson.stream.MalformedJsonException;
 public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
     private final Class<?> baseType;
     private final String typeFieldName;
-    private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<String, Class<?>>();
-    private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<Class<?>, String>();
+    private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<>();
+    private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<>();
 
     private RuntimeTypeAdapterFactory(Class<?> baseType, String typeFieldName) {
         if (typeFieldName == null || baseType == null) {
@@ -186,7 +186,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
      * typeFieldName} as the type field name. Type field names are case sensitive.
      */
     public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName) {
-        return new RuntimeTypeAdapterFactory<T>(baseType, typeFieldName);
+        return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName);
     }
 
     /**
@@ -194,7 +194,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
      * the type field name.
      */
     public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType) {
-        return new RuntimeTypeAdapterFactory<T>(baseType, "type");
+        return new RuntimeTypeAdapterFactory<>(baseType, "type");
     }
 
     /**
@@ -233,8 +233,8 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
             return null;
         }
 
-        final Map<String, TypeAdapter<?>> labelToDelegate = new LinkedHashMap<String, TypeAdapter<?>>();
-        final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate = new LinkedHashMap<Class<?>, TypeAdapter<?>>();
+        final Map<String, TypeAdapter<?>> labelToDelegate = new LinkedHashMap<>();
+        final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate = new LinkedHashMap<>();
         for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
             TypeAdapter<?> delegate = gson.getDelegateAdapter(this, TypeToken.get(entry.getValue()));
             labelToDelegate.put(entry.getKey(), delegate);
@@ -320,7 +320,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
         RuntimeTypeAdapterFactory.JSON_ELEMENT.write(writer, element);
     }
 
-    private static final TypeAdapter<JsonElement> JSON_ELEMENT = new TypeAdapter<JsonElement>() {
+    private static final TypeAdapter<JsonElement> JSON_ELEMENT = new TypeAdapter<>() {
         @Override
         public @Nullable JsonElement read(@Nullable JsonReader in) throws IOException {
             switch (in.peek()) {
diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/local/dto/Failure.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/local/dto/Failure.java
index 7868c749e37..156d29b255c 100644
--- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/local/dto/Failure.java
+++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/api/local/dto/Failure.java
@@ -21,7 +21,7 @@ import java.util.List;
  * @author Gregory Moyer - Initial contribution
  */
 public class Failure {
-    private List<Error> errors = new ArrayList<Error>();
+    private List<Error> errors = new ArrayList<>();
 
     public List<Error> getErrors() {
         return errors;
diff --git a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ActionTest.java b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ActionTest.java
index 902b8c09a36..eea849083f1 100644
--- a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ActionTest.java
+++ b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ActionTest.java
@@ -43,7 +43,7 @@ public class ActionTest extends AbstractTest {
     @SuppressWarnings("serial")
     public void testSerialize() throws Exception {
         // @formatter:off
-        Action action = new Action().withParameters(new TreeMap<String, Parameter>(){{put("enabled", new BooleanParameter());
+        Action action = new Action().withParameters(new TreeMap<>(){{put("enabled", new BooleanParameter());
                                                                                       put("time", new StringParameter());}});
         // @formatter:on
         assertEquals(readJson("action.json"), gson.toJson(action));
diff --git a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ApplicationTest.java b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ApplicationTest.java
index fd40a77e9c8..38a0770eb68 100644
--- a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ApplicationTest.java
+++ b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/ApplicationTest.java
@@ -45,8 +45,8 @@ public class ApplicationTest extends AbstractTest {
         Application app = new Application().withPackageName("com.lametric.radio").withVendor("LaMetric")
                 .withVersion("1.0.10").withVersionCode("22")
                 // @formatter:off
-                                           .withWidgets(new TreeMap<String, Widget>(){{put("589ed1b3fcdaa5180bf4848e55ba8061", new Widget());}})
-                                           .withActions(new TreeMap<String, Action>(){{put("radio.next", new Action());
+                                           .withWidgets(new TreeMap<>(){{put("589ed1b3fcdaa5180bf4848e55ba8061", new Widget());}})
+                                           .withActions(new TreeMap<>(){{put("radio.next", new Action());
                                                                                        put("radio.play", new Action());
                                                                                        put("radio.prev", new Action());
                                                                                        put("radio.stop", new Action());}});
diff --git a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/UpdateActionTest.java b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/UpdateActionTest.java
index fe148be14bb..6af6de958e0 100644
--- a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/UpdateActionTest.java
+++ b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/UpdateActionTest.java
@@ -42,7 +42,7 @@ public class UpdateActionTest extends AbstractTest {
     public void testSerialize() throws Exception {
         UpdateAction action = new UpdateAction().withId("countdown.configure")
         // @formatter:off
-                                                .withParameters(new TreeMap<String, Parameter>(){{put("duration", new IntegerParameter().withValue(30));}});
+                                                .withParameters(new TreeMap<>(){{put("duration", new IntegerParameter().withValue(30));}});
                                                 // @formatter:on
         assertEquals(readJson("update-action.json"), gson.toJson(action));
     }
diff --git a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/WidgetTest.java b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/WidgetTest.java
index 922c4b83cc8..895811ef1d0 100644
--- a/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/WidgetTest.java
+++ b/bundles/org.openhab.binding.lametrictime/src/test/java/org/openhab/binding/lametrictime/internal/api/local/dto/WidgetTest.java
@@ -42,7 +42,7 @@ public class WidgetTest extends AbstractTest {
     @SuppressWarnings("serial")
     public void testSerialize() throws Exception {
         Widget widget = new Widget().withPackageName("com.lametric.radio").withIndex(Integer.valueOf(-1))
-                .withSettings(new HashMap<String, JsonPrimitive>() {
+                .withSettings(new HashMap<>() {
                     {
                         put("_title", new JsonPrimitive("Radio"));
                     }
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/BaseChannelHandler.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/BaseChannelHandler.java
index d7c33bf0ad2..d46c613c3af 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/BaseChannelHandler.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/BaseChannelHandler.java
@@ -36,7 +36,7 @@ abstract class BaseChannelHandler<T> implements ChannelHandler {
     private final ResponseListener<T> defaultResponseListener = createResponseListener();
 
     protected <Y> ResponseListener<Y> createResponseListener() {
-        return new ResponseListener<Y>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(String error) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/LauncherApplication.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/LauncherApplication.java
index 1f58669be70..680bf2b965c 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/LauncherApplication.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/LauncherApplication.java
@@ -49,7 +49,7 @@ public class LauncherApplication extends BaseChannelHandler<AppInfo> {
     public void onDeviceReady(String channelId, LGWebOSHandler handler) {
         super.onDeviceReady(channelId, handler);
 
-        handler.getSocket().getAppList(new ResponseListener<List<AppInfo>>() {
+        handler.getSocket().getAppList(new ResponseListener<>() {
 
             @Override
             public void onError(String error) {
@@ -109,7 +109,7 @@ public class LauncherApplication extends BaseChannelHandler<AppInfo> {
     }
 
     private ResponseListener<AppInfo> createResponseListener(String channelId, LGWebOSHandler handler) {
-        return new ResponseListener<AppInfo>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(@Nullable String error) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/TVControlChannel.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/TVControlChannel.java
index 3ebd4c38259..9dfad37d054 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/TVControlChannel.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/TVControlChannel.java
@@ -48,7 +48,7 @@ public class TVControlChannel extends BaseChannelHandler<ChannelInfo> {
     @Override
     public void onDeviceReady(String channelId, LGWebOSHandler handler) {
         super.onDeviceReady(channelId, handler);
-        handler.getSocket().getChannelList(new ResponseListener<List<ChannelInfo>>() {
+        handler.getSocket().getChannelList(new ResponseListener<>() {
             @Override
             public void onError(@Nullable String error) {
                 logger.warn("error requesting channel list: {}.", error);
@@ -107,7 +107,7 @@ public class TVControlChannel extends BaseChannelHandler<ChannelInfo> {
     }
 
     private ResponseListener<ChannelInfo> createResponseListener(String channelId, LGWebOSHandler handler) {
-        return new ResponseListener<ChannelInfo>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(@Nullable String error) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlMute.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlMute.java
index d0a8d0ea1fb..e7ee36a5a34 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlMute.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlMute.java
@@ -54,7 +54,7 @@ public class VolumeControlMute extends BaseChannelHandler<Boolean> {
     }
 
     private ResponseListener<Boolean> createResponseListener(String channelId, LGWebOSHandler handler) {
-        return new ResponseListener<Boolean>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(@Nullable String error) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlVolume.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlVolume.java
index 54f4c11bb44..1838f967dd2 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlVolume.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/VolumeControlVolume.java
@@ -79,7 +79,7 @@ public class VolumeControlVolume extends BaseChannelHandler<Float> {
     }
 
     private ResponseListener<Float> createResponseListener(String channelUID, LGWebOSHandler handler) {
-        return new ResponseListener<Float>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(@Nullable String error) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/action/LGWebOSActions.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/action/LGWebOSActions.java
index 7f651237c44..eea3c4cef08 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/action/LGWebOSActions.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/action/LGWebOSActions.java
@@ -226,7 +226,7 @@ public class LGWebOSActions implements ThingActions {
     }
 
     private ResponseListener<TextInputStatusInfo> createTextInputStatusListener() {
-        return new ResponseListener<TextInputStatusInfo>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(@Nullable String error) {
@@ -241,7 +241,7 @@ public class LGWebOSActions implements ThingActions {
     }
 
     private <O> ResponseListener<O> createResponseListener() {
-        return new ResponseListener<O>() {
+        return new ResponseListener<>() {
 
             @Override
             public void onError(@Nullable String error) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSHandler.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSHandler.java
index 97f9cd8790e..65ae982f1ef 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSHandler.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSHandler.java
@@ -191,19 +191,18 @@ public class LGWebOSHandler extends BaseThingHandler
 
             // it is irrelevant which service is queried. Only need to send some packets over the wire
 
-            keepAliveJob = scheduler
-                    .scheduleWithFixedDelay(() -> getSocket().getRunningApp(new ResponseListener<AppInfo>() {
+            keepAliveJob = scheduler.scheduleWithFixedDelay(() -> getSocket().getRunningApp(new ResponseListener<>() {
 
-                        @Override
-                        public void onSuccess(AppInfo responseObject) {
-                            // ignore - actual response is not relevant here
-                        }
+                @Override
+                public void onSuccess(AppInfo responseObject) {
+                    // ignore - actual response is not relevant here
+                }
 
-                        @Override
-                        public void onError(String message) {
-                            // ignore
-                        }
-                    }), keepAliveInterval, keepAliveInterval, TimeUnit.MILLISECONDS);
+                @Override
+                public void onError(String message) {
+                    // ignore
+                }
+            }), keepAliveInterval, keepAliveInterval, TimeUnit.MILLISECONDS);
 
         }
     }
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVKeyboardInput.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVKeyboardInput.java
index 339c8b29b13..caa5cbefc3f 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVKeyboardInput.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVKeyboardInput.java
@@ -121,7 +121,7 @@ public class LGWebOSTVKeyboardInput {
             payload.addProperty("replace", 0);
         }
 
-        ResponseListener<JsonObject> responseListener = new ResponseListener<JsonObject>() {
+        ResponseListener<JsonObject> responseListener = new ResponseListener<>() {
 
             @Override
             public void onSuccess(JsonObject response) {
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVSocket.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVSocket.java
index 15265b6193f..00b829aeff2 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVSocket.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVSocket.java
@@ -316,7 +316,7 @@ public class LGWebOSTVSocket {
         payload.addProperty("pairingType", "PROMPT"); // PIN, COMBINED
         payload.add("manifest", manifest);
         packet.add("payload", payload);
-        ResponseListener<JsonObject> dummyListener = new ResponseListener<JsonObject>() {
+        ResponseListener<JsonObject> dummyListener = new ResponseListener<>() {
 
             @Override
             public void onSuccess(@Nullable JsonObject payload) {
@@ -672,7 +672,7 @@ public class LGWebOSTVSocket {
     public void powerOff(ResponseListener<CommandConfirmation> listener) {
         String uri = "ssap://system/turnOff";
 
-        ResponseListener<CommandConfirmation> interceptor = new ResponseListener<CommandConfirmation>() {
+        ResponseListener<CommandConfirmation> interceptor = new ResponseListener<>() {
 
             @Override
             public void onSuccess(CommandConfirmation confirmation) {
@@ -848,7 +848,7 @@ public class LGWebOSTVSocket {
     }
 
     public ServiceSubscription<AppInfo> subscribeRunningApp(ResponseListener<AppInfo> listener) {
-        ResponseListener<AppInfo> interceptor = new ResponseListener<AppInfo>() {
+        ResponseListener<AppInfo> interceptor = new ResponseListener<>() {
 
             @Override
             public void onSuccess(AppInfo appInfo) {
@@ -926,7 +926,7 @@ public class LGWebOSTVSocket {
 
         String uri = "ssap://com.webos.service.networkinput/getPointerInputSocket";
 
-        ResponseListener<JsonObject> listener = new ResponseListener<JsonObject>() {
+        ResponseListener<JsonObject> listener = new ResponseListener<>() {
 
             @Override
             public void onSuccess(@Nullable JsonObject jsonObj) {
diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControl.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControl.java
index 8f9f8befa8e..e6038f915c0 100644
--- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControl.java
+++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControl.java
@@ -206,7 +206,7 @@ public class LxControl {
     /*
      * JSON deserialization routine, called during parsing configuration by the GSON library
      */
-    public static final JsonDeserializer<LxControl> DESERIALIZER = new JsonDeserializer<LxControl>() {
+    public static final JsonDeserializer<LxControl> DESERIALIZER = new JsonDeserializer<>() {
         @Override
         public LxControl deserialize(JsonElement json, Type type, JsonDeserializationContext context)
                 throws JsonParseException {
diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/types/LxUuid.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/types/LxUuid.java
index 8defca7c2bc..2d4cca3542a 100644
--- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/types/LxUuid.java
+++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/types/LxUuid.java
@@ -34,7 +34,7 @@ public class LxUuid {
     private final String uuid;
     private final String uuidOriginal;
 
-    public static final JsonDeserializer<LxUuid> DESERIALIZER = new JsonDeserializer<LxUuid>() {
+    public static final JsonDeserializer<LxUuid> DESERIALIZER = new JsonDeserializer<>() {
         @Override
         public LxUuid deserialize(JsonElement json, Type type, JsonDeserializationContext context)
                 throws JsonParseException {
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Area.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Area.java
index 36539ff469e..1b72155b3c9 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Area.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Area.java
@@ -38,14 +38,14 @@ public class Area {
     }
 
     public List<DeviceNode> getDeviceNodes() {
-        return deviceNodes != null ? deviceNodes : Collections.<DeviceNode> emptyList();
+        return deviceNodes != null ? deviceNodes : Collections.emptyList();
     }
 
     public List<Output> getOutputs() {
-        return outputs != null ? outputs : Collections.<Output> emptyList();
+        return outputs != null ? outputs : Collections.emptyList();
     }
 
     public List<Area> getAreas() {
-        return areas != null ? areas : Collections.<Area> emptyList();
+        return areas != null ? areas : Collections.emptyList();
     }
 }
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Device.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Device.java
index 8d4692c89cf..be0c4ae368a 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Device.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Device.java
@@ -47,6 +47,6 @@ public class Device implements DeviceNode {
     }
 
     public List<Component> getComponents() {
-        return components != null ? components : Collections.<Component> emptyList();
+        return components != null ? components : Collections.emptyList();
     }
 }
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/DeviceGroup.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/DeviceGroup.java
index 41af3923812..48b2215c272 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/DeviceGroup.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/DeviceGroup.java
@@ -29,6 +29,6 @@ public class DeviceGroup implements DeviceNode {
     }
 
     public List<Device> getDevices() {
-        return devices != null ? devices : Collections.<Device> emptyList();
+        return devices != null ? devices : Collections.emptyList();
     }
 }
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Project.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Project.java
index 90369c25b49..e37c3ec5c5f 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Project.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/project/Project.java
@@ -38,14 +38,14 @@ public class Project {
     }
 
     public List<Area> getAreas() {
-        return areas != null ? areas : Collections.<Area> emptyList();
+        return areas != null ? areas : Collections.emptyList();
     }
 
     public List<Timeclock> getTimeclocks() {
-        return timeclocks != null ? timeclocks : Collections.<Timeclock> emptyList();
+        return timeclocks != null ? timeclocks : Collections.emptyList();
     }
 
     public List<GreenMode> getGreenModes() {
-        return greenmodes != null ? greenmodes : Collections.<GreenMode> emptyList();
+        return greenmodes != null ? greenmodes : Collections.emptyList();
     }
 }
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/net/TelnetSession.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/net/TelnetSession.java
index c8678f20499..eb8ca74d11c 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/net/TelnetSession.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/net/TelnetSession.java
@@ -252,7 +252,7 @@ public class TelnetSession implements Closeable {
             this.charBuffer.clear();
             this.charBuffer.put(leftover);
 
-            return lines == null ? Collections.<String> emptyList() : Arrays.asList(lines);
+            return lines == null ? Collections.emptyList() : Arrays.asList(lines);
         }
     }
 
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/protocol/leap/LeapMessageParser.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/protocol/leap/LeapMessageParser.java
index 4429b4b7b29..b0d6e96fa89 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/protocol/leap/LeapMessageParser.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/protocol/leap/LeapMessageParser.java
@@ -238,7 +238,7 @@ public class LeapMessageParser {
 
     private <T extends AbstractMessageBody> List<T> parseBodyMultiple(JsonObject messageBody, String memberName,
             Class<T> type) {
-        List<T> objList = new LinkedList<T>();
+        List<T> objList = new LinkedList<>();
         try {
             if (messageBody.has(memberName)) {
                 JsonArray jsonArray = messageBody.get(memberName).getAsJsonArray();
diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java
index 9cb3f15e371..bb6be2b1977 100644
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java
@@ -228,7 +228,7 @@ public class ChannelUpdaterJob implements SchedulerRunnable, Runnable {
     }
 
     public static Map<String, Object> getProperties(Integer[] heatpumpValues) {
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
 
         String heatpumpType = HeatpumpType.fromCode(heatpumpValues[78]).getName();
 
diff --git a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVDeviceManager.java b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVDeviceManager.java
index 8f8f5aeedb3..c507771a6e6 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVDeviceManager.java
+++ b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVDeviceManager.java
@@ -48,7 +48,7 @@ public class MagentaTVDeviceManager {
 
     public void registerDevice(String udn, String deviceId, String ipAddress, MagentaTVHandler handler) {
         logger.trace("Register new device, UDN={}, deviceId={}, ipAddress={}", udn, deviceId, ipAddress);
-        addNewDevice(udn, deviceId, ipAddress, "", new TreeMap<String, String>(), handler);
+        addNewDevice(udn, deviceId, ipAddress, "", new TreeMap<>(), handler);
     }
 
     private void addNewDevice(String udn, String deviceId, String ipAddress, String macAddress,
diff --git a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVGsonDTO.java b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVGsonDTO.java
index 52d55a99a68..adcc1c763b3 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVGsonDTO.java
+++ b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/MagentaTVGsonDTO.java
@@ -148,7 +148,7 @@ public class MagentaTVGsonDTO {
      */
     public static class OauthCredentials {
         public String epghttpsurl = "";
-        public ArrayList<OauthKeyValue> sam3Para = new ArrayList<OauthKeyValue>();
+        public ArrayList<OauthKeyValue> sam3Para = new ArrayList<>();
     }
 
     public static class OauthCredentialsInstanceCreator implements InstanceCreator<OauthCredentials> {
diff --git a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVHandler.java b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVHandler.java
index 32366b121ed..938de840765 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVHandler.java
+++ b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVHandler.java
@@ -636,7 +636,7 @@ public class MagentaTVHandler extends BaseThingHandler implements MagentaTVListe
     }
 
     public void updateThingProperties() {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put(PROPERTY_FRIENDLYNAME, config.getFriendlyName());
         properties.put(PROPERTY_MODEL_NUMBER, config.getModel());
         properties.put(PROPERTY_DESC_URL, config.getDescriptionUrl());
diff --git a/bundles/org.openhab.binding.mcd/src/main/java/org/openhab/binding/mcd/internal/util/SensorEventDef.java b/bundles/org.openhab.binding.mcd/src/main/java/org/openhab/binding/mcd/internal/util/SensorEventDef.java
index 5095095b4c9..d0cb3dda348 100644
--- a/bundles/org.openhab.binding.mcd/src/main/java/org/openhab/binding/mcd/internal/util/SensorEventDef.java
+++ b/bundles/org.openhab.binding.mcd/src/main/java/org/openhab/binding/mcd/internal/util/SensorEventDef.java
@@ -35,8 +35,7 @@ public class SensorEventDef {
             "TURNAROUND", "HOMEEMERGENCY", "TOILETFLUSH", "DORSALPOSITION", "ABDOMINALPOSITION", "LYINGLEFT",
             "LYINGRIGHT", "LYINGHALFLEFT", "LYINGHALFRIGHT", "MOVEMENT", "PRESENCE", "NUMBERPERSONS",
             "BRIGHTNESSZONE" };
-    private static ArrayList<String> sensorEventDefinition = new ArrayList<String>(
-            Arrays.asList(EVENT_DEFINITION_ARRAY));
+    private static ArrayList<String> sensorEventDefinition = new ArrayList<>(Arrays.asList(EVENT_DEFINITION_ARRAY));
 
     public static ArrayList<String> getSensorEventDefinition() {
         return sensorEventDefinition;
diff --git a/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java b/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java
index 37c5c4034e4..251de619e8b 100644
--- a/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java
+++ b/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java
@@ -17,8 +17,6 @@ import static org.openhab.binding.meater.internal.MeaterBindingConstants.*;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.meater.internal.MeaterConfiguration;
@@ -107,17 +105,17 @@ public class MeaterHandler extends BaseThingHandler {
         Cook cook = meaterProbe.cook;
         switch (channelId) {
             case CHANNEL_INTERNAL_TEMPERATURE:
-                return new QuantityType<Temperature>(meaterProbe.temperature.internal, SIUnits.CELSIUS);
+                return new QuantityType<>(meaterProbe.temperature.internal, SIUnits.CELSIUS);
             case CHANNEL_AMBIENT_TEMPERATURE:
-                return new QuantityType<Temperature>(meaterProbe.temperature.ambient, SIUnits.CELSIUS);
+                return new QuantityType<>(meaterProbe.temperature.ambient, SIUnits.CELSIUS);
             case CHANNEL_COOK_TARGET_TEMPERATURE:
                 if (cook != null) {
-                    return new QuantityType<Temperature>(cook.temperature.target, SIUnits.CELSIUS);
+                    return new QuantityType<>(cook.temperature.target, SIUnits.CELSIUS);
                 }
                 break;
             case CHANNEL_COOK_PEAK_TEMPERATURE:
                 if (cook != null) {
-                    return new QuantityType<Temperature>(cook.temperature.peak, SIUnits.CELSIUS);
+                    return new QuantityType<>(cook.temperature.peak, SIUnits.CELSIUS);
                 }
                 break;
             case CHANNEL_COOK_ELAPSED_TIME:
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
index 269aee15b01..a689fe1ec4e 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
@@ -88,7 +88,7 @@ public class VehicleHandler extends BaseThingHandler {
     private static final String INITIALIZE_COMMAND = "Initialze";
 
     private final Logger logger = LoggerFactory.getLogger(VehicleHandler.class);
-    private final Map<String, Long> timeHash = new HashMap<String, Long>();
+    private final Map<String, Long> timeHash = new HashMap<>();
     private final MercedesMeCommandOptionProvider mmcop;
     private final MercedesMeStateOptionProvider mmsop;
     private final TimeZoneProvider timeZoneProvider;
@@ -157,7 +157,7 @@ public class VehicleHandler extends BaseThingHandler {
                 }
             }
         } else if ("clear-cache".equals(channelUID.getIdWithoutGroup()) && command.equals(OnOffType.ON)) {
-            List<String> removals = new ArrayList<String>();
+            List<String> removals = new ArrayList<>();
             imageStorage.get().getKeys().forEach(entry -> {
                 if (entry.contains("_" + config.get().vin)) {
                     removals.add(entry);
@@ -309,7 +309,7 @@ public class VehicleHandler extends BaseThingHandler {
             return;
         }
         // add config parameters
-        MultiMap<String> parameterMap = new MultiMap<String>();
+        MultiMap<String> parameterMap = new MultiMap<>();
         parameterMap.add("background", Boolean.toString(config.get().background));
         parameterMap.add("night", Boolean.toString(config.get().night));
         parameterMap.add("cropped", Boolean.toString(config.get().cropped));
@@ -335,7 +335,7 @@ public class VehicleHandler extends BaseThingHandler {
     }
 
     private void setImageOtions() {
-        List<String> entries = new ArrayList<String>();
+        List<String> entries = new ArrayList<>();
         if (imageStorage.get().containsKey(EXT_IMG_RES + config.get().vin)) {
             String resources = imageStorage.get().get(EXT_IMG_RES + config.get().vin);
             JSONObject jo = new JSONObject(resources);
@@ -344,8 +344,8 @@ public class VehicleHandler extends BaseThingHandler {
             });
         }
         Collections.sort(entries);
-        List<CommandOption> commandOptions = new ArrayList<CommandOption>();
-        List<StateOption> stateOptions = new ArrayList<StateOption>();
+        List<CommandOption> commandOptions = new ArrayList<>();
+        List<StateOption> stateOptions = new ArrayList<>();
         entries.forEach(entry -> {
             CommandOption co = new CommandOption(entry, null);
             commandOptions.add(co);
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/CallbackServer.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/CallbackServer.java
index 1bfabe66a14..90268f48650 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/CallbackServer.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/CallbackServer.java
@@ -42,8 +42,8 @@ import org.slf4j.LoggerFactory;
 @NonNullByDefault
 public class CallbackServer {
     private static final Logger LOGGER = LoggerFactory.getLogger(CallbackServer.class);
-    private static final Map<Integer, OAuthClientService> AUTH_MAP = new HashMap<Integer, OAuthClientService>();
-    private static final Map<Integer, CallbackServer> SERVER_MAP = new HashMap<Integer, CallbackServer>();
+    private static final Map<Integer, OAuthClientService> AUTH_MAP = new HashMap<>();
+    private static final Map<Integer, CallbackServer> SERVER_MAP = new HashMap<>();
     private static final AccessTokenResponse INVALID_ACCESS_TOKEN = new AccessTokenResponse();
 
     private final OAuthFactory oAuthFactory;
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java
index 4ad9b63b3d0..21a0f91246c 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/server/Utils.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 @NonNullByDefault
 public class Utils {
     private static final Logger LOGGER = LoggerFactory.getLogger(Utils.class);
-    private static final List<Integer> PORTS = new ArrayList<Integer>();
+    private static final List<Integer> PORTS = new ArrayList<>();
     private static int port = 8090;
 
     /**
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Mapper.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Mapper.java
index be2f83e7bfe..9e03c925898 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Mapper.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Mapper.java
@@ -40,7 +40,7 @@ public class Mapper {
     private static final Logger LOGGER = LoggerFactory.getLogger(Mapper.class);
 
     public static final ChannelStateMap INVALID_MAP = new ChannelStateMap(EMPTY, EMPTY, UnDefType.UNDEF, -1);
-    public static final Map<String, String[]> CHANNELS = new HashMap<String, String[]>();
+    public static final Map<String, String[]> CHANNELS = new HashMap<>();
     public static final String TIMESTAMP = "timestamp";
     public static final String VALUE = "value";
 
diff --git a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ImageTest.java b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ImageTest.java
index 917691209e6..f2cc4c62025 100644
--- a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ImageTest.java
+++ b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/ImageTest.java
@@ -33,7 +33,7 @@ class ImageTest {
     @Test
     public void testConfig() {
         Optional<VehicleConfiguration> config = Optional.of(new VehicleConfiguration());
-        MultiMap<String> parameterMap = new MultiMap<String>();
+        MultiMap<String> parameterMap = new MultiMap<>();
         parameterMap.add("background", Boolean.toString(config.get().background));
         parameterMap.add("night", Boolean.toString(config.get().night));
         parameterMap.add("cropped", Boolean.toString(config.get().cropped));
@@ -45,7 +45,7 @@ class ImageTest {
         config.get().background = true;
         config.get().format = "png";
         config.get().cropped = true;
-        parameterMap = new MultiMap<String>();
+        parameterMap = new MultiMap<>();
         parameterMap.add("background", Boolean.toString(config.get().background));
         parameterMap.add("night", Boolean.toString(config.get().night));
         parameterMap.add("cropped", Boolean.toString(config.get().cropped));
diff --git a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/JsonTest.java b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/JsonTest.java
index 3160ceff865..a5907b8a5d0 100644
--- a/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/JsonTest.java
+++ b/bundles/org.openhab.binding.mercedesme/src/test/java/org/openhab/binding/mercedesme/JsonTest.java
@@ -45,7 +45,7 @@ class JsonTest {
 
     @Test
     void testOdoMapper() throws Exception {
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("range:mileage 4131 km");
         String content = Files.readString(Path.of("src/test/resources/odo.json"));
         JSONArray ja = new JSONArray(content);
@@ -65,7 +65,7 @@ class JsonTest {
 
     @Test
     void testEVMapper() throws IOException {
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("range:range-electric 325 km");
         expectedResults.add("range:soc 78 %");
         String content = Files.readString(Path.of("src/test/resources/evstatus.json"));
@@ -86,7 +86,7 @@ class JsonTest {
 
     @Test
     void testFuelMapper() throws IOException {
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("range:range-fuel 1292 km");
         expectedResults.add("range:fuel-level 90 %");
         String content = Files.readString(Path.of("src/test/resources/fuel.json"));
@@ -106,7 +106,7 @@ class JsonTest {
 
     @Test
     void testLockMapper() throws IOException {
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("lock:doors 0");
         expectedResults.add("lock:deck-lid ON");
         expectedResults.add("lock:flap ON");
@@ -128,7 +128,7 @@ class JsonTest {
 
     @Test
     void testStatusMapper() throws IOException {
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("doors:deck-lid CLOSED");
         expectedResults.add("doors:driver-front CLOSED");
         expectedResults.add("doors:passenger-front CLOSED");
@@ -165,7 +165,7 @@ class JsonTest {
     @Test
     void testEQALightsMapper() throws IOException {
         // real life example
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("doors:passenger-front OPEN");
         expectedResults.add("windows:driver-front 1");
         expectedResults.add("windows:driver-rear 1");
@@ -229,7 +229,7 @@ class JsonTest {
 
     @Test
     void testMissingTimestamp() throws IOException {
-        List<String> expectedResults = new ArrayList<String>();
+        List<String> expectedResults = new ArrayList<>();
         expectedResults.add("range:mileage 4131 km");
         String content = Files.readString(Path.of("src/test/resources/invalid-timestamp.json"));
         JSONArray ja = new JSONArray(content);
diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/TimeStabilizer.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/TimeStabilizer.java
index f989fa8489a..f5dc9cb7206 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/TimeStabilizer.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/TimeStabilizer.java
@@ -33,7 +33,7 @@ public class TimeStabilizer {
     private static final int SLIDING_SECONDS = 300;
     private static final int MAX_FLUCTUATION_SECONDS = 180;
 
-    private final Deque<Item> cache = new ConcurrentLinkedDeque<Item>();
+    private final Deque<Item> cache = new ConcurrentLinkedDeque<>();
 
     private class Item {
         public Instant start;
diff --git a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/DeviceStateDispatcherTest.java b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/DeviceStateDispatcherTest.java
index 630d75826bd..10f6f44cbbf 100644
--- a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/DeviceStateDispatcherTest.java
+++ b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/DeviceStateDispatcherTest.java
@@ -71,7 +71,7 @@ public class DeviceStateDispatcherTest {
 
         devices = mock(DeviceCollection.class);
         when(getDevices().getDeviceIdentifiers())
-                .thenReturn(new HashSet<String>(Arrays.asList(FIRST_DEVICE_IDENTIFIER, SECOND_DEVICE_IDENTIFIER)));
+                .thenReturn(new HashSet<>(Arrays.asList(FIRST_DEVICE_IDENTIFIER, SECOND_DEVICE_IDENTIFIER)));
         when(getDevices().getDevice(FIRST_DEVICE_IDENTIFIER)).thenReturn(getFirstDevice());
         when(getDevices().getDevice(SECOND_DEVICE_IDENTIFIER)).thenReturn(getSecondDevice());
     }
@@ -152,7 +152,7 @@ public class DeviceStateDispatcherTest {
         Device deviceWithUnknownIdentifier = mockDevice(UNKNOWN_DEVICE_IDENTIFIER);
         DeviceCollection devicesWithUnknownDevice = mock(DeviceCollection.class);
         when(devicesWithUnknownDevice.getDeviceIdentifiers())
-                .thenReturn(new HashSet<String>(Arrays.asList(UNKNOWN_DEVICE_IDENTIFIER)));
+                .thenReturn(new HashSet<>(Arrays.asList(UNKNOWN_DEVICE_IDENTIFIER)));
         when(devicesWithUnknownDevice.getDevice(UNKNOWN_DEVICE_IDENTIFIER)).thenReturn(deviceWithUnknownIdentifier);
 
         DeviceStateDispatcher dispatcher = new DeviceStateDispatcher();
@@ -178,11 +178,11 @@ public class DeviceStateDispatcherTest {
         Device deviceWithUnknownIdentifier = mockDevice(UNKNOWN_DEVICE_IDENTIFIER);
         DeviceCollection devicesWithUnknownDevice = mock(DeviceCollection.class);
         when(devicesWithUnknownDevice.getDeviceIdentifiers())
-                .thenReturn(new HashSet<String>(Arrays.asList(UNKNOWN_DEVICE_IDENTIFIER)));
+                .thenReturn(new HashSet<>(Arrays.asList(UNKNOWN_DEVICE_IDENTIFIER)));
         when(devicesWithUnknownDevice.getDevice(UNKNOWN_DEVICE_IDENTIFIER)).thenReturn(deviceWithUnknownIdentifier);
 
         DeviceCollection emptyDevices = mock(DeviceCollection.class);
-        when(emptyDevices.getDeviceIdentifiers()).thenReturn(new HashSet<String>());
+        when(emptyDevices.getDeviceIdentifiers()).thenReturn(new HashSet<>());
 
         DeviceStateDispatcher dispatcher = new DeviceStateDispatcher();
         dispatcher.dispatchDeviceStateUpdates(devicesWithUnknownDevice);
diff --git a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/RequestFactoryImplTest.java b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/RequestFactoryImplTest.java
index 3c2b8476c56..c9a0cefbcf4 100644
--- a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/RequestFactoryImplTest.java
+++ b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/RequestFactoryImplTest.java
@@ -75,7 +75,7 @@ public class RequestFactoryImplTest {
         when(requestMock.param(anyString(), anyString())).thenReturn(requestMock);
         when(requestMock.content(any())).thenAnswer(i -> {
             StringContentProvider provider = i.getArgument(0);
-            List<Byte> rawData = new ArrayList<Byte>();
+            List<Byte> rawData = new ArrayList<>();
             provider.forEach(b -> {
                 b.rewind();
                 while (b.hasRemaining()) {
diff --git a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/ActionsStateTest.java b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/ActionsStateTest.java
index 31e87485793..a12dd9fd34f 100644
--- a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/ActionsStateTest.java
+++ b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/ActionsStateTest.java
@@ -277,7 +277,7 @@ public class ActionsStateTest {
     public void testCanControlLightReturnsFalseWhenNoLightOptionIsAvailable() {
         // given:
         Actions actions = mock(Actions.class);
-        when(actions.getLight()).thenReturn(new LinkedList<Light>());
+        when(actions.getLight()).thenReturn(new LinkedList<>());
 
         ActionsState actionState = new ActionsState(DEVICE_IDENTIFIER, actions);
 
diff --git a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/json/DeviceCollectionTest.java b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/json/DeviceCollectionTest.java
index 032e346e636..2c435a6e667 100644
--- a/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/json/DeviceCollectionTest.java
+++ b/bundles/org.openhab.binding.mielecloud/src/test/java/org/openhab/binding/mielecloud/internal/webservice/api/json/DeviceCollectionTest.java
@@ -114,7 +114,7 @@ public class DeviceCollectionTest {
         assertEquals(false, remoteEnable.getSmartGrid().get());
 
         assertEquals(Light.ENABLE, state.getLight());
-        assertEquals(new ArrayList<Object>(), state.getElapsedTime().get());
+        assertEquals(new ArrayList<>(), state.getElapsedTime().get());
 
         SpinningSpeed spinningSpeed = state.getSpinningSpeed().get();
         assertEquals(Integer.valueOf(1200), spinningSpeed.getValueRaw().get());
@@ -229,7 +229,7 @@ public class DeviceCollectionTest {
         assertEquals(false, remoteEnable.getSmartGrid().get());
 
         assertEquals(Light.NOT_SUPPORTED, state.getLight());
-        assertEquals(new ArrayList<Object>(), state.getElapsedTime().get());
+        assertEquals(new ArrayList<>(), state.getElapsedTime().get());
 
         DryingStep dryingStep = state.getDryingStep().get();
         assertFalse(dryingStep.getValueRaw().isPresent());
diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
index b92495efae2..03e30718419 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
@@ -75,11 +75,11 @@ public class CloudConnector {
     private ConcurrentHashMap<@NonNull String, @NonNull HomeListDTO> homeLists = new ConcurrentHashMap<>();
     private static final Gson GSON = new GsonBuilder().serializeNulls().create();
 
-    private ExpiringCache<Boolean> logonCache = new ExpiringCache<Boolean>(CACHE_EXPIRY, () -> {
+    private ExpiringCache<Boolean> logonCache = new ExpiringCache<>(CACHE_EXPIRY, () -> {
         return logon();
     });
 
-    private ExpiringCache<String> refreshDeviceList = new ExpiringCache<String>(CACHE_EXPIRY, () -> {
+    private ExpiringCache<String> refreshDeviceList = new ExpiringCache<>(CACHE_EXPIRY, () -> {
         if (deviceListState == CloudListState.FAILED && !isConnected()) {
             return ("Could not connect to Xiaomi cloud");
         }
@@ -100,7 +100,7 @@ public class CloudConnector {
         return "done";// deviceList;
     });
 
-    private ExpiringCache<String> refreshHomeList = new ExpiringCache<String>(CACHE_EXPIRY, () -> {
+    private ExpiringCache<String> refreshHomeList = new ExpiringCache<>(CACHE_EXPIRY, () -> {
         if (homeListState == CloudListState.FAILED && !isConnected()) {
             return ("Could not connect to Xiaomi cloud");
         }
diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java
index 7b44b51564e..d4bccdeb24d 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java
@@ -85,7 +85,7 @@ public class CloudUtil {
         if (signedNonce == null || signedNonce.length() == 0) {
             throw new MiIoCryptoException("key is not nullable");
         }
-        List<String> exps = new ArrayList<String>();
+        List<String> exps = new ArrayList<>();
 
         if (requestUrl != null) {
             URI uri = URI.create(requestUrl);
@@ -95,7 +95,7 @@ public class CloudUtil {
         exps.add(nonce);
 
         if (params != null && !params.isEmpty()) {
-            final TreeMap<String, String> sortedParams = new TreeMap<String, String>(params);
+            final TreeMap<String, String> sortedParams = new TreeMap<>(params);
             Set<Map.Entry<String, String>> entries = sortedParams.entrySet();
             for (Map.Entry<String, String> entry : entries) {
                 exps.add(String.format("%s=%s", entry.getKey(), entry.getValue()));
diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java
index 1f3e0adee99..8e8c7139647 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java
@@ -149,7 +149,7 @@ public class MiCloudConnector {
 
     public String getMapUrl(String vacuumMap, String country) throws MiCloudException {
         String url = getApiUrl(country) + "/home/getmapfileurl";
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("data", "{\"obj_name\":\"" + vacuumMap + "\"}");
         String mapResponse = request(url, map);
         logger.trace("Response: {}", mapResponse);
@@ -266,7 +266,7 @@ public class MiCloudConnector {
     }
 
     public String request(String urlPart, String country, String params) throws MiCloudException {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("data", params);
         return request(urlPart, country, map);
     }
diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
index af0462220d1..cae9bb8a767 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
@@ -171,7 +171,7 @@ public class MiIoVacuumHandler extends MiIoAbstractHandler {
             }
             return null;
         });
-        map = new ExpiringCache<String>(CACHE_EXPIRY, () -> {
+        map = new ExpiringCache<>(CACHE_EXPIRY, () -> {
             try {
                 int ret = sendCommand(MiIoCommand.GET_MAP);
                 if (ret != 0) {
diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java
index 4118650abd5..11f17403461 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java
@@ -123,7 +123,7 @@ public class RRMapDraw {
      */
     private void drawMap(Graphics2D g2d, float scale) {
         Stroke stroke = new BasicStroke(1.1f * scale);
-        Set<Integer> roomIds = new HashSet<Integer>();
+        Set<Integer> roomIds = new HashSet<>();
         g2d.setStroke(stroke);
         for (int y = 0; y < rmfp.getImgHeight() - 1; y++) {
             for (int x = 0; x < rmfp.getImgWidth() + 1; x++) {
diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java
index c0c57eb85a7..437fbc2e973 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapFileParser.java
@@ -158,8 +158,8 @@ public class RRMapFileParser {
                 case PATH:
                 case GOTO_PATH:
                 case GOTO_PREDICTED_PATH:
-                    ArrayList<float[]> path = new ArrayList<float[]>();
-                    Map<String, Integer> detail = new HashMap<String, Integer>();
+                    ArrayList<float[]> path = new ArrayList<>();
+                    Map<String, Integer> detail = new HashMap<>();
                     int pairs = getUInt32LE(header, 0x04) / 4;
                     detail.put(PATH_POINT_LENGTH, getUInt32LE(header, 0x08));
                     detail.put(PATH_POINT_SIZE, getUInt32LE(header, 0x0C));
@@ -203,7 +203,7 @@ public class RRMapFileParser {
                 case MOB_FORBIDDEN_AREA:
                 case CARPET_FORBIDDEN_AREA:
                     int areaPairs = getUInt16(header, 0x08);
-                    ArrayList<float[]> area = new ArrayList<float[]>();
+                    ArrayList<float[]> area = new ArrayList<>();
                     for (int areaPair = 0; areaPair < areaPairs; areaPair++) {
                         float x0 = (getUInt16(raw, blockDataStart + areaPair * 16));
                         float y0 = getUInt16(raw, blockDataStart + areaPair * 16 + 2);
diff --git a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java
index 79ffccdc806..eb0c626c8dd 100644
--- a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java
+++ b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java
@@ -259,7 +259,7 @@ public class ReadmeHelper {
         StringBuilder sb = new StringBuilder();
         StringBuilder commentSb = new StringBuilder("Adding support for the following models:\r\n");
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        HashMap<String, String> names = new HashMap<String, String>();
+        HashMap<String, String> names = new HashMap<>();
         try {
             JsonReader reader = new JsonReader(new FileReader(DEVICE_NAMES_FILE));
             names = gson.fromJson(reader, names.getClass());
diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/MinecraftSocketHandler.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/MinecraftSocketHandler.java
index 463779a1a4f..aa164972c85 100644
--- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/MinecraftSocketHandler.java
+++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/MinecraftSocketHandler.java
@@ -42,8 +42,8 @@ public class MinecraftSocketHandler implements WebSocketEventHandler {
     private Logger logger = LoggerFactory.getLogger(MinecraftSocketHandler.class);
 
     private BehaviorSubject<ServerData> serverRx = BehaviorSubject.create();
-    private BehaviorSubject<List<SignData>> signsRx = BehaviorSubject.<List<SignData>> create();
-    private BehaviorSubject<List<PlayerData>> playersRx = BehaviorSubject.<List<PlayerData>> create();
+    private BehaviorSubject<List<SignData>> signsRx = BehaviorSubject.create();
+    private BehaviorSubject<List<PlayerData>> playersRx = BehaviorSubject.create();
 
     private Gson gson = new GsonBuilder().create();
 
diff --git a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/ServerConnection.java b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/ServerConnection.java
index ff33d23a961..5d93ce0d81d 100644
--- a/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/ServerConnection.java
+++ b/bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/server/ServerConnection.java
@@ -126,7 +126,7 @@ public class ServerConnection {
     public static Observable<ServerConnection> create(final ThingUID thingUID, final String host, final int port) {
         final String serverUrl = String.format("ws://%s:%d/stream", host, port);
 
-        return Observable.<ServerConnection> create(new OnSubscribe<ServerConnection>() {
+        return Observable.create(new OnSubscribe<>() {
 
             private final Logger logger = LoggerFactory.getLogger(ServerConnection.class);
 
diff --git a/bundles/org.openhab.binding.modbus.e3dc/src/main/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCThingHandler.java b/bundles/org.openhab.binding.modbus.e3dc/src/main/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCThingHandler.java
index 22a2818a6ba..facd4289174 100644
--- a/bundles/org.openhab.binding.modbus.e3dc/src/main/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCThingHandler.java
+++ b/bundles/org.openhab.binding.modbus.e3dc/src/main/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCThingHandler.java
@@ -115,7 +115,7 @@ public class E3DCThingHandler extends BaseBridgeHandler {
     private ChannelUID string3VoltChannel;
     private ChannelUID string3WattChannel;
 
-    private final ArrayList<E3DCWallboxThingHandler> listeners = new ArrayList<E3DCWallboxThingHandler>();
+    private final ArrayList<E3DCWallboxThingHandler> listeners = new ArrayList<>();
     private final Logger logger = LoggerFactory.getLogger(E3DCThingHandler.class);
     private final Parser dataParser = new Parser(DataType.DATA);
     private ReadStatus dataRead = ReadStatus.NOT_RECEIVED;
diff --git a/bundles/org.openhab.binding.modbus.e3dc/src/test/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCHandlerStateTest.java b/bundles/org.openhab.binding.modbus.e3dc/src/test/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCHandlerStateTest.java
index 5f5cb7efef2..9bf87eeaeba 100644
--- a/bundles/org.openhab.binding.modbus.e3dc/src/test/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCHandlerStateTest.java
+++ b/bundles/org.openhab.binding.modbus.e3dc/src/test/java/org/openhab/binding/modbus/e3dc/internal/handler/E3DCHandlerStateTest.java
@@ -53,7 +53,7 @@ public class E3DCHandlerStateTest {
         E3DCThingHandler handler = new E3DCThingHandler(bridge);
         handler.setCallback(callback);
 
-        HashMap<String, Object> map = new HashMap<String, Object>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("refresh", 2000);
         Configuration config = new Configuration(map);
         when(bridge.getConfiguration()).thenReturn(config);
@@ -104,6 +104,6 @@ public class E3DCHandlerStateTest {
 
     private AsyncModbusFailure<ModbusReadRequestBlueprint> getFailResult() {
         ModbusReadRequestBlueprint readRequest = mock(ModbusReadRequestBlueprint.class);
-        return new AsyncModbusFailure<ModbusReadRequestBlueprint>(readRequest, new Exception("Something failed!"));
+        return new AsyncModbusFailure<>(readRequest, new Exception("Something failed!"));
     }
 }
diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsActions.java b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsActions.java
index 101d46f0cf6..e4f77652636 100644
--- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsActions.java
+++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsActions.java
@@ -159,7 +159,7 @@ public class HeliosEasyControlsActions implements ThingActions {
 
     @RuleAction(label = "@text/action.getErrorMessages.label", description = "@text/action.getErrorMessages.description")
     public @ActionOutput(name = "errorMessages", type = "java.util.List<String>") List<String> getErrorMessages() {
-        return (handler != null) ? handler.getErrorMessages() : new ArrayList<String>();
+        return (handler != null) ? handler.getErrorMessages() : new ArrayList<>();
     }
 
     public static List<String> getErrorMessages(ThingActions actions) {
@@ -168,7 +168,7 @@ public class HeliosEasyControlsActions implements ThingActions {
 
     @RuleAction(label = "@text/action.getWarningMessages.label", description = "@text/action.getWarningMessages.description")
     public @ActionOutput(name = "warningMessages", type = "java.util.List<String>") List<String> getWarningMessages() {
-        return (handler != null) ? handler.getWarningMessages() : new ArrayList<String>();
+        return (handler != null) ? handler.getWarningMessages() : new ArrayList<>();
     }
 
     public static List<String> getWarningMessages(ThingActions actions) {
@@ -177,7 +177,7 @@ public class HeliosEasyControlsActions implements ThingActions {
 
     @RuleAction(label = "@text/action.getInfoMessages.label", description = "@text/action.getInfoMessages.description")
     public @ActionOutput(name = "infoMessages", type = "java.util.List<String>") List<String> getInfoMessages() {
-        return (handler != null) ? handler.getInfoMessages() : new ArrayList<String>();
+        return (handler != null) ? handler.getInfoMessages() : new ArrayList<>();
     }
 
     public static List<String> getInfoMessages(ThingActions actions) {
@@ -186,7 +186,7 @@ public class HeliosEasyControlsActions implements ThingActions {
 
     @RuleAction(label = "@text/action.getStatusMessages.label", description = "@text/action.getStatusMessages.description")
     public @ActionOutput(name = "statusMessages", type = "java.util.List<String>") List<String> getStatusMessages() {
-        return (handler != null) ? handler.getStatusMessages() : new ArrayList<String>();
+        return (handler != null) ? handler.getStatusMessages() : new ArrayList<>();
     }
 
     public static List<String> getStatusMessages(ThingActions actions) {
diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
index 4d3eeb3e77a..8a9061b4eed 100644
--- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
+++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
@@ -642,7 +642,7 @@ public class HeliosEasyControlsHandler extends BaseThingHandler {
     }
 
     private List<String> getMessages(long bitMask, int bits, String prefix) {
-        ArrayList<String> msg = new ArrayList<String>();
+        ArrayList<String> msg = new ArrayList<>();
         long mask = 1;
         for (int i = 0; i < bits; i++) {
             if ((bitMask & mask) != 0) {
@@ -693,7 +693,7 @@ public class HeliosEasyControlsHandler extends BaseThingHandler {
      * @return an <code>List</code> of messages indicated by the status flags sent by the device
      */
     protected List<String> getStatusMessages() {
-        ArrayList<String> msg = new ArrayList<String>();
+        ArrayList<String> msg = new ArrayList<>();
         if (this.statusFlags.length() == HeliosEasyControlsBindingConstants.BITS_STATUS_MSG) {
             for (int i = 0; i < HeliosEasyControlsBindingConstants.BITS_STATUS_MSG; i++) {
                 String key = HeliosEasyControlsBindingConstants.PREFIX_STATUS_MSG + i + "."
diff --git a/bundles/org.openhab.binding.modbus.studer/src/main/java/org/openhab/binding/modbus/studer/internal/StuderHandler.java b/bundles/org.openhab.binding.modbus.studer/src/main/java/org/openhab/binding/modbus/studer/internal/StuderHandler.java
index 18032a6eb37..fa86654ffc9 100644
--- a/bundles/org.openhab.binding.modbus.studer/src/main/java/org/openhab/binding/modbus/studer/internal/StuderHandler.java
+++ b/bundles/org.openhab.binding.modbus.studer/src/main/java/org/openhab/binding/modbus/studer/internal/StuderHandler.java
@@ -70,7 +70,7 @@ public class StuderHandler extends BaseThingHandler {
     /**
      * Array of tasks used to poll the device
      */
-    private ArrayList<PollTask> pollTasks = new ArrayList<PollTask>();
+    private ArrayList<PollTask> pollTasks = new ArrayList<>();
 
     /**
      * Communication interface to the slave endpoint we're connecting to
diff --git a/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java b/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java
index 39e57d362eb..0d1ecd3f601 100644
--- a/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryParticipant.java
@@ -41,7 +41,7 @@ public class SunspecDiscoveryParticipant implements ModbusDiscoveryParticipant {
 
     @Override
     public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
-        return new HashSet<ThingTypeUID>(SUPPORTED_THING_TYPES_UIDS.values());
+        return new HashSet<>(SUPPORTED_THING_TYPES_UIDS.values());
     }
 
     @Override
diff --git a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfile.java b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfile.java
index 7aadb84bbda..88e30604725 100644
--- a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfile.java
+++ b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfile.java
@@ -196,7 +196,7 @@ public class ModbusGainOffsetProfile<Q extends Quantity<Q>> implements StateProf
                         parameterName);
             }
         } else if (parameterValue instanceof BigDecimal parameterBigDecimal) {
-            result = Optional.of(new QuantityType<QU>(parameterBigDecimal.toString()));
+            result = Optional.of(new QuantityType<>(parameterBigDecimal.toString()));
         } else {
             logger.error("Parameter '{}' is not of type String or BigDecimal", parameterName);
             return result;
diff --git a/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/protocol/MPDResponseParser.java b/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/protocol/MPDResponseParser.java
index 5a0b8e6453b..f84e454bad2 100644
--- a/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/protocol/MPDResponseParser.java
+++ b/bundles/org.openhab.binding.mpd/src/main/java/org/openhab/binding/mpd/internal/protocol/MPDResponseParser.java
@@ -26,7 +26,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 public class MPDResponseParser {
 
     static Map<String, String> responseToMap(MPDResponse response) {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
 
         for (String line : response.getLines()) {
             int offset = line.indexOf(':');
diff --git a/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/utils/FutureCollector.java b/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/utils/FutureCollector.java
index 4ac55d6a09c..4b27d381727 100644
--- a/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/utils/FutureCollector.java
+++ b/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/utils/FutureCollector.java
@@ -31,11 +31,10 @@ import org.eclipse.jdt.annotation.Nullable;
 public class FutureCollector {
 
     public static <X> Collector<CompletableFuture<X>, Set<CompletableFuture<X>>, CompletableFuture<@Nullable Void>> allOf() {
-        return Collector.<CompletableFuture<X>, Set<CompletableFuture<X>>, CompletableFuture<@Nullable Void>> of(
-                (Supplier<Set<CompletableFuture<X>>>) HashSet::new, Set::add, (left, right) -> {
-                    left.addAll(right);
-                    return left;
-                }, a -> CompletableFuture.allOf(a.toArray(new CompletableFuture[a.size()])),
+        return Collector.of((Supplier<Set<CompletableFuture<X>>>) HashSet::new, Set::add, (left, right) -> {
+            left.addAll(right);
+            return left;
+        }, a -> CompletableFuture.allOf(a.toArray(new CompletableFuture[a.size()])),
                 Collector.Characteristics.UNORDERED);
     }
 }
diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/config/ChannelConfigurationTypeAdapterFactory.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/config/ChannelConfigurationTypeAdapterFactory.java
index c645466b9e4..120be726fb4 100644
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/config/ChannelConfigurationTypeAdapterFactory.java
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/config/ChannelConfigurationTypeAdapterFactory.java
@@ -78,7 +78,7 @@ public class ChannelConfigurationTypeAdapterFactory implements TypeAdapterFactor
         /* The delegate is the 'default' adapter */
         final TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
 
-        return new TypeAdapter<T>() {
+        return new TypeAdapter<>() {
             @Override
             public @Nullable T read(JsonReader in) throws IOException {
                 /* read the object using the default adapter, but translate the names in the reader */
@@ -99,7 +99,7 @@ public class ChannelConfigurationTypeAdapterFactory implements TypeAdapterFactor
         /* The delegate is the 'default' adapter */
         final TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
 
-        return new TypeAdapter<T>() {
+        return new TypeAdapter<>() {
             @Override
             public @Nullable T read(JsonReader in) throws IOException {
                 /* read the object using the default adapter, but translate the names in the reader */
diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/discovery/VehicleDiscovery.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/discovery/VehicleDiscovery.java
index af3b31da0e6..384b6b60a68 100644
--- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/discovery/VehicleDiscovery.java
+++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/discovery/VehicleDiscovery.java
@@ -138,7 +138,7 @@ public class VehicleDiscovery extends AbstractThingHandlerDiscoveryService<MyBMW
                     if (!thingFound) {
                         // Properties needed for functional Thing
                         VehicleAttributes vehicleAttributes = vehicle.getVehicleBase().getAttributes();
-                        Map<String, Object> convertedProperties = new HashMap<String, Object>(properties);
+                        Map<String, Object> convertedProperties = new HashMap<>(properties);
                         convertedProperties.put(MyBMWConstants.VIN, vehicle.getVehicleBase().getVin());
                         convertedProperties.put(MyBMWConstants.VEHICLE_BRAND, vehicleAttributes.getBrand());
                         convertedProperties.put(MyBMWConstants.REFRESH_INTERVAL,
diff --git a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/backend/JsonStringDeserializer.java b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/backend/JsonStringDeserializer.java
index ff91f740bb6..b7be478fed5 100644
--- a/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/backend/JsonStringDeserializer.java
+++ b/bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/handler/backend/JsonStringDeserializer.java
@@ -47,7 +47,7 @@ public interface JsonStringDeserializer {
             return Arrays.asList(vehicleBaseArray);
         } catch (JsonSyntaxException e) {
             LOGGER.debug("JsonSyntaxException {}", e.getMessage());
-            return new ArrayList<VehicleBase>();
+            return new ArrayList<>();
         }
     }
 
diff --git a/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/dto/StatusWrapper.java b/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/dto/StatusWrapper.java
index 9fce7609f74..ab0f02d103d 100644
--- a/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/dto/StatusWrapper.java
+++ b/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/dto/StatusWrapper.java
@@ -119,7 +119,7 @@ public class StatusWrapper {
     private boolean hasFuel;
     private boolean isHybrid;
 
-    private Map<String, State> specialHandlingMap = new HashMap<String, State>();
+    private Map<String, State> specialHandlingMap = new HashMap<>();
 
     public StatusWrapper(String type, String statusJson) {
         hasFuel = type.equals(VehicleType.CONVENTIONAL.toString()) || type.equals(VehicleType.PLUGIN_HYBRID.toString())
diff --git a/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/auth/AuthTest.java b/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/auth/AuthTest.java
index 4a6c0b4aee4..166053b7849 100644
--- a/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/auth/AuthTest.java
+++ b/bundles/org.openhab.binding.mybmw/src/test/java/org/openhab/binding/mybmw/internal/handler/auth/AuthTest.java
@@ -104,7 +104,7 @@ class AuthTest {
             Request loginRequest = authHttpClient.POST(authUrl);
             loginRequest.header("Content-Type", "application/x-www-form-urlencoded");
 
-            MultiMap<String> baseParams = new MultiMap<String>();
+            MultiMap<String> baseParams = new MultiMap<>();
             baseParams.put("client_id", aqr.clientId);
             baseParams.put("response_type", "code");
             baseParams.put("redirect_uri", aqr.returnUrl);
@@ -114,7 +114,7 @@ class AuthTest {
             baseParams.put("code_challenge", codeChallenge);
             baseParams.put("code_challenge_method", "S256");
 
-            MultiMap<String> loginParams = new MultiMap<String>(baseParams);
+            MultiMap<String> loginParams = new MultiMap<>(baseParams);
             loginParams.put("grant_type", "authorization_code");
             loginParams.put("username", user);
             loginParams.put("password", pwd);
@@ -125,7 +125,7 @@ class AuthTest {
             String authCode = getAuthCode(secondResonse.getContentAsString());
             logger.info(authCode);
 
-            MultiMap<String> authParams = new MultiMap<String>(baseParams);
+            MultiMap<String> authParams = new MultiMap<>(baseParams);
             authParams.put("authorization", authCode);
             Request authRequest = authHttpClient.POST(authUrl).followRedirects(false);
             authRequest.header("Content-Type", "application/x-www-form-urlencoded");
@@ -147,7 +147,7 @@ class AuthTest {
             codeRequest.header("Content-Type", "application/x-www-form-urlencoded");
             codeRequest.header(AUTHORIZATION, basicAuth);
 
-            MultiMap<String> codeParams = new MultiMap<String>();
+            MultiMap<String> codeParams = new MultiMap<>();
             codeParams.put("code", code);
             codeParams.put("code_verifier", codeVerifier);
             codeParams.put("redirect_uri", aqr.returnUrl);
@@ -170,7 +170,7 @@ class AuthTest {
             HttpClient apiHttpClient = new HttpClient(sslContextFactory);
             apiHttpClient.start();
 
-            MultiMap<String> vehicleParams = new MultiMap<String>();
+            MultiMap<String> vehicleParams = new MultiMap<>();
             vehicleParams.put("tireGuardMode", "ENABLED");
             vehicleParams.put("appDateTime", Long.toString(System.currentTimeMillis()));
             vehicleParams.put("apptimezone", "60");
@@ -193,7 +193,7 @@ class AuthTest {
             /**
              * CHARGE STATISTICS
              */
-            MultiMap<String> chargeStatisticsParams = new MultiMap<String>();
+            MultiMap<String> chargeStatisticsParams = new MultiMap<>();
             chargeStatisticsParams.put("vin", "WBY1Z81040V905639");
             chargeStatisticsParams.put("currentDate", Converter.getCurrentISOTime());
             params = UrlEncoded.encode(chargeStatisticsParams, StandardCharsets.UTF_8, false);
@@ -221,7 +221,7 @@ class AuthTest {
             /**
              * CHARGE SESSIONS
              */
-            MultiMap<String> chargeSessionsParams = new MultiMap<String>();
+            MultiMap<String> chargeSessionsParams = new MultiMap<>();
             chargeSessionsParams.put("vin", "WBY1Z81040V905639");
             chargeSessionsParams.put("maxResults", "40");
             chargeSessionsParams.put("include_date_picker", "true");
@@ -274,7 +274,7 @@ class AuthTest {
     }
 
     public static String codeFromUrl(String encodedUrl) {
-        final MultiMap<String> tokenMap = new MultiMap<String>();
+        final MultiMap<String> tokenMap = new MultiMap<>();
         UrlEncoded.decodeTo(encodedUrl, tokenMap, StandardCharsets.US_ASCII);
         final StringBuilder codeFound = new StringBuilder();
         tokenMap.forEach((key, value) -> {
diff --git a/bundles/org.openhab.binding.mycroft/src/main/java/org/openhab/binding/mycroft/internal/api/MycroftConnection.java b/bundles/org.openhab.binding.mycroft/src/main/java/org/openhab/binding/mycroft/internal/api/MycroftConnection.java
index a93b019e420..226bb91b96c 100644
--- a/bundles/org.openhab.binding.mycroft/src/main/java/org/openhab/binding/mycroft/internal/api/MycroftConnection.java
+++ b/bundles/org.openhab.binding.mycroft/src/main/java/org/openhab/binding/mycroft/internal/api/MycroftConnection.java
@@ -125,7 +125,7 @@ public class MycroftConnection {
     public void registerListener(MessageType messageType, MycroftMessageListener<? extends BaseMessage> listener) {
         Set<MycroftMessageListener<? extends BaseMessage>> messageTypeListeners = listeners.get(messageType);
         if (messageTypeListeners == null) {
-            messageTypeListeners = new HashSet<MycroftMessageListener<? extends BaseMessage>>();
+            messageTypeListeners = new HashSet<>();
             listeners.put(messageType, messageTypeListeners);
         }
         messageTypeListeners.add(listener);
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
index 162e95e91ef..f48e3a57f6c 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
@@ -121,7 +121,7 @@ public class NanoleafControllerHandler extends BaseBridgeHandler implements Nano
 
     private @Nullable HttpClient httpClientSSETouchEvent;
     private @Nullable Request sseTouchjobRequest;
-    private final List<NanoleafControllerListener> controllerListeners = new CopyOnWriteArrayList<NanoleafControllerListener>();
+    private final List<NanoleafControllerListener> controllerListeners = new CopyOnWriteArrayList<>();
     private PanelLayout previousPanelLayout = new PanelLayout();
     private final NanoleafPanelColors panelColors = new NanoleafPanelColors();
     private boolean updateVisualLayout = true;
diff --git a/bundles/org.openhab.binding.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java b/bundles/org.openhab.binding.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java
index 4457671c5cd..57dea1442f0 100644
--- a/bundles/org.openhab.binding.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java
+++ b/bundles/org.openhab.binding.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java
@@ -93,7 +93,7 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
     private static final String LOGGING_ID_PROPERTY = LoggingFilter.class.getName() + ".id";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<>() {
 
         @Override
         public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
@@ -194,7 +194,7 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<>(
                 COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/StrictEnumTypeAdapterFactory.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/StrictEnumTypeAdapterFactory.java
index 3c19bcea298..2c6a304bde8 100644
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/StrictEnumTypeAdapterFactory.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/StrictEnumTypeAdapterFactory.java
@@ -44,7 +44,7 @@ class StrictEnumTypeAdapterFactory implements TypeAdapterFactory {
     }
 
     private <T> TypeAdapter<T> newStrictEnumAdapter(@NonNullByDefault({}) TypeAdapter<T> delegateAdapter) {
-        return new TypeAdapter<T>() {
+        return new TypeAdapter<>() {
             @Override
             public void write(JsonWriter out, @Nullable T value) throws IOException {
                 delegateAdapter.write(out, value);
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/SimulatorConnector.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/SimulatorConnector.java
index cbd63e3cb9c..d85ce2d1f03 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/SimulatorConnector.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/SimulatorConnector.java
@@ -48,7 +48,7 @@ public class SimulatorConnector extends NibeHeatPumpBaseConnector {
 
     private static final Random RANDOM = new Random();
 
-    private final ArrayList<ModbusValue> dataReadoutValues = new ArrayList<ModbusValue>() {
+    private final ArrayList<ModbusValue> dataReadoutValues = new ArrayList<>() {
         {
             add(new ModbusValue(43009, 287));
             add(new ModbusValue(43008, 100));
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
index 037b0b35626..2b4403a9670 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
@@ -29,7 +29,7 @@ public class F1X45 {
 
     @SuppressWarnings("serial")
     private static final Map<Integer, VariableInformation> VARIABLE_INFO_F1X45 = Collections
-            .unmodifiableMap(new HashMap<Integer, VariableInformation>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
             // @formatter:off
                     put(40004, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "BT1 Outdoor temp"));
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X55.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X55.java
index f43509d251c..cc37001d5c8 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X55.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X55.java
@@ -29,7 +29,7 @@ public class F1X55 {
 
     @SuppressWarnings("serial")
     private static final Map<Integer, VariableInformation> VARIABLE_INFO_F1X55 = Collections
-            .unmodifiableMap(new HashMap<Integer, VariableInformation>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
             // @formatter:off
                     put(32260, new VariableInformation(   1, NibeDataType.U8 , Type.SENSOR  , "NIBE Inverter 216-state"));
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java
index d0ba6143098..38cabe7e17a 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F470.java
@@ -29,7 +29,7 @@ public class F470 {
 
     @SuppressWarnings("serial")
     private static final Map<Integer, VariableInformation> VARIABLE_INFO_F470 = Collections
-            .unmodifiableMap(new HashMap<Integer, VariableInformation>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
             // @formatter:off
                     put(40004, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "BT1 Outdoor Temperature"));
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F750.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F750.java
index d846457553a..b893abc0b29 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F750.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F750.java
@@ -29,7 +29,7 @@ public class F750 {
 
     @SuppressWarnings("serial")
     private static final Map<Integer, VariableInformation> VARIABLE_INFO_F750 = Collections
-            .unmodifiableMap(new HashMap<Integer, VariableInformation>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
             // @formatter:off
                     put(32260, new VariableInformation(   1, NibeDataType.U8 , Type.SENSOR  , "NIBE Inverter 216-state"));
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/SMO40.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/SMO40.java
index 600ed3392b2..6beae98fa28 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/SMO40.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/SMO40.java
@@ -29,7 +29,7 @@ public class SMO40 {
 
     @SuppressWarnings("serial")
     private static final Map<Integer, VariableInformation> VARIABLE_INFO_SMO40 = Collections
-            .unmodifiableMap(new HashMap<Integer, VariableInformation>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
             // @formatter:off
             put(40004, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "BT1 Outdoor Temperature"));
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/test/java/org/openhab/binding/nibeheatpump/internal/message/ModbusDataReadOutMessageTest.java b/bundles/org.openhab.binding.nibeheatpump/src/test/java/org/openhab/binding/nibeheatpump/internal/message/ModbusDataReadOutMessageTest.java
index bc7c3d85852..4ed61b043aa 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/test/java/org/openhab/binding/nibeheatpump/internal/message/ModbusDataReadOutMessageTest.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/test/java/org/openhab/binding/nibeheatpump/internal/message/ModbusDataReadOutMessageTest.java
@@ -32,7 +32,7 @@ public class ModbusDataReadOutMessageTest {
         final String okMessage = "5C0020685001A81F0100A86400FDA7D003449C1E004F9CA000509C7800519C0301529C1B01879C14014E9CC601479C010115B9B0FF3AB94B00C9AF0000489C0D014C9CE7004B9C0000FFFF0000FFFF0000FFFF000045";
 
         @SuppressWarnings("serial")
-        final ArrayList<ModbusValue> values = new ArrayList<ModbusValue>() {
+        final ArrayList<ModbusValue> values = new ArrayList<>() {
             {
                 add(new ModbusValue(43009, 287));
                 add(new ModbusValue(43008, 100));
@@ -67,7 +67,7 @@ public class ModbusDataReadOutMessageTest {
         final String message = "5C0020685001A81F0100A86400FDA7D003449C1E004F9CA000509C7800519C0301529C1B01879C14014E9CC601479C010115B9B0FF3AB94B00C9AF0000489C0D014C9CE7004B9C0000FFFF0000FFFF0000FFFF000045";
 
         @SuppressWarnings("serial")
-        final ArrayList<ModbusValue> expectedValues = new ArrayList<ModbusValue>() {
+        final ArrayList<ModbusValue> expectedValues = new ArrayList<>() {
             {
                 add(new ModbusValue(43009, 287));
                 add(new ModbusValue(43008, 100));
@@ -97,7 +97,7 @@ public class ModbusDataReadOutMessageTest {
         final String message = "5C0020685401A81F0100A86400FDA7D003449C1E004F9CA000509C7800519C0301529C1B01879C14014E9CC601479C010115B9B0FF3AB94B00C9AF0000489C0D014C9CE7004B9C0000FFFF0000FFFF00005C5C5C5C5C5C5C5C41";
 
         @SuppressWarnings("serial")
-        final ArrayList<ModbusValue> expectedValues = new ArrayList<ModbusValue>() {
+        final ArrayList<ModbusValue> expectedValues = new ArrayList<>() {
             {
                 add(new ModbusValue(43009, 287));
                 add(new ModbusValue(43008, 100));
@@ -128,7 +128,7 @@ public class ModbusDataReadOutMessageTest {
         final String message = "5C00206851449C2500489CFC004C9CF1004E9CC7014D9C0B024F9C2500509C3300519C0B01529C5C5C01569C3100C9AF000001A80C01FDA716FAFAA9070098A91B1BFFFF0000A0A9CA02FFFF00009CA99212FFFF0000BE";
 
         @SuppressWarnings("serial")
-        final ArrayList<ModbusValue> expectedValues = new ArrayList<ModbusValue>() {
+        final ArrayList<ModbusValue> expectedValues = new ArrayList<>() {
             {
                 add(new ModbusValue(40004, 37));
                 add(new ModbusValue(40008, 252));
@@ -158,7 +158,7 @@ public class ModbusDataReadOutMessageTest {
         final String message = "5C00206852449C2500489CFE004C9CF2004E9CD4014D9CFB014F9C2500509C3700519C0D01529C5C5C01569C3200C9AF000001A80C01FDA712FAFAA9070098A95C5C1BFFFF0000A0A9D102FFFF00009CA9B412FFFF00007F";
 
         @SuppressWarnings("serial")
-        final ArrayList<ModbusValue> expectedValues = new ArrayList<ModbusValue>() {
+        final ArrayList<ModbusValue> expectedValues = new ArrayList<>() {
             {
                 add(new ModbusValue(40004, 37));
                 add(new ModbusValue(40008, 254));
@@ -188,7 +188,7 @@ public class ModbusDataReadOutMessageTest {
         final String message = "5C00206850449C2600489CF6004C9CF1004E9CD6014D9C0C024F9C4500509C3F00519CF100529C0401569CD500C9AF000001A80C01FDA799FAFAA9020098A91A1BFFFF0000A0A9CA02FFFF00009CA99212FFFF0000C5";
 
         @SuppressWarnings("serial")
-        final ArrayList<ModbusValue> expectedValues = new ArrayList<ModbusValue>() {
+        final ArrayList<ModbusValue> expectedValues = new ArrayList<>() {
             {
                 add(new ModbusValue(40004, 38));
                 add(new ModbusValue(40008, 246));
diff --git a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ComponentRegister.java b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ComponentRegister.java
index 37eebd23aff..39fdc016c0b 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ComponentRegister.java
+++ b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ComponentRegister.java
@@ -30,7 +30,7 @@ import org.eclipse.jdt.annotation.Nullable;
 @NonNullByDefault
 public final class ComponentRegister {
 
-    private final @NotNull Map<SerialNumber, Component> register = new HashMap<SerialNumber, Component>();
+    private final @NotNull Map<SerialNumber, Component> register = new HashMap<>();
 
     /**
      * Stores a new Component in the register. If a component exists with the same id, that value is overwritten.
diff --git a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java
index 7bcdc76ece0..e6592783edf 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java
+++ b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java
@@ -29,7 +29,7 @@ import org.eclipse.jdt.annotation.Nullable;
 @NonNullByDefault
 public final class WeekProfileRegister {
 
-    private @NotNull Map<Integer, WeekProfile> register = new HashMap<Integer, WeekProfile>();
+    private @NotNull Map<Integer, WeekProfile> register = new HashMap<>();
 
     /**
      * Stores a new week profile in the register. If a week profile exists with the same id, that value is overwritten.
diff --git a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ZoneRegister.java b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ZoneRegister.java
index d1a2d5606b9..88d5da3fcd1 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ZoneRegister.java
+++ b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/ZoneRegister.java
@@ -30,7 +30,7 @@ import org.eclipse.jdt.annotation.Nullable;
 @NonNullByDefault
 public final class ZoneRegister {
 
-    private final @NotNull Map<Integer, Zone> register = new HashMap<Integer, Zone>();
+    private final @NotNull Map<Integer, Zone> register = new HashMap<>();
 
     /**
      * Stores a new Zone in the register. If a zone exists with the same id, that value is overwritten.
diff --git a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/dto/NuvoMenu.java b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/dto/NuvoMenu.java
index 3c7dd1d7ff1..96f295bdfb8 100644
--- a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/dto/NuvoMenu.java
+++ b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/dto/NuvoMenu.java
@@ -37,7 +37,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 public class NuvoMenu {
 
     @XmlElement(required = true)
-    protected List<NuvoMenu.Source> source = new ArrayList<NuvoMenu.Source>();
+    protected List<NuvoMenu.Source> source = new ArrayList<>();
 
     public List<NuvoMenu.Source> getSource() {
         return this.source;
@@ -46,7 +46,7 @@ public class NuvoMenu {
     @XmlAccessorType(XmlAccessType.FIELD)
     @XmlType(name = "")
     public static class Source {
-        protected List<NuvoMenu.Source.TopMenu> topmenu = new ArrayList<NuvoMenu.Source.TopMenu>();
+        protected List<NuvoMenu.Source.TopMenu> topmenu = new ArrayList<>();
 
         public List<NuvoMenu.Source.TopMenu> getTopMenu() {
             return this.topmenu;
@@ -55,7 +55,7 @@ public class NuvoMenu {
         @XmlAccessorType(XmlAccessType.FIELD)
         @XmlType(name = "")
         public static class TopMenu {
-            protected List<String> item = new ArrayList<String>();
+            protected List<String> item = new ArrayList<>();
             @XmlAttribute(name = "text", required = true)
             protected String text = "";
 
diff --git a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
index 8492e1c0f60..ee884e20359 100644
--- a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
+++ b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
@@ -156,19 +156,19 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
 
     private boolean isAnyOhNuvoNet = false;
     private NuvoMenu nuvoMenus = new NuvoMenu();
-    private HashMap<String, Set<NuvoEnum>> nuvoGroupMap = new HashMap<String, Set<NuvoEnum>>();
-    private HashMap<NuvoEnum, Integer> nuvoNetSrcMap = new HashMap<NuvoEnum, Integer>();
-    private HashMap<NuvoEnum, String> favPrefixMap = new HashMap<NuvoEnum, String>();
-    private HashMap<NuvoEnum, String[]> favoriteMap = new HashMap<NuvoEnum, String[]>();
+    private HashMap<String, Set<NuvoEnum>> nuvoGroupMap = new HashMap<>();
+    private HashMap<NuvoEnum, Integer> nuvoNetSrcMap = new HashMap<>();
+    private HashMap<NuvoEnum, String> favPrefixMap = new HashMap<>();
+    private HashMap<NuvoEnum, String[]> favoriteMap = new HashMap<>();
 
-    private HashMap<NuvoEnum, byte[]> albumArtMap = new HashMap<NuvoEnum, byte[]>();
-    private HashMap<NuvoEnum, Integer> albumArtIds = new HashMap<NuvoEnum, Integer>();
-    private HashMap<NuvoEnum, String> dispInfoCache = new HashMap<NuvoEnum, String>();
+    private HashMap<NuvoEnum, byte[]> albumArtMap = new HashMap<>();
+    private HashMap<NuvoEnum, Integer> albumArtIds = new HashMap<>();
+    private HashMap<NuvoEnum, String> dispInfoCache = new HashMap<>();
 
     Set<Integer> activeZones = new HashSet<>(1);
 
     // A tree map that maps the source ids to source labels
-    TreeMap<String, String> sourceLabels = new TreeMap<String, String>();
+    TreeMap<String, String> sourceLabels = new TreeMap<>();
 
     // Indicates if there is a need to poll status because of a disconnection used for MPS4 systems
     boolean pollStatusNeeded = true;
@@ -233,10 +233,10 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
         nuvoNetSrcMap.put(NuvoEnum.SOURCE5, config.nuvoNetSrc5);
         nuvoNetSrcMap.put(NuvoEnum.SOURCE6, config.nuvoNetSrc6);
 
-        nuvoGroupMap.put("1", new HashSet<NuvoEnum>());
-        nuvoGroupMap.put("2", new HashSet<NuvoEnum>());
-        nuvoGroupMap.put("3", new HashSet<NuvoEnum>());
-        nuvoGroupMap.put("4", new HashSet<NuvoEnum>());
+        nuvoGroupMap.put("1", new HashSet<>());
+        nuvoGroupMap.put("2", new HashSet<>());
+        nuvoGroupMap.put("3", new HashSet<>());
+        nuvoGroupMap.put("4", new HashSet<>());
 
         if (this.isMps4) {
             logger.debug("Port set to {} configuring binding for MPS4 compatability", MPS4_PORT);
@@ -1385,7 +1385,7 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
                 break;
             case CHANNEL_TRACK_LENGTH:
             case CHANNEL_TRACK_POSITION:
-                state = new QuantityType<Time>(Integer.parseInt(value) / 10, NuvoHandler.API_SECOND_UNIT);
+                state = new QuantityType<>(Integer.parseInt(value) / 10, NuvoHandler.API_SECOND_UNIT);
                 break;
             case CHANNEL_ALBUM_ART:
                 state = new RawType(bytes, "image/jpeg");
diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
index bbc8cc222aa..2ca01de22d4 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
@@ -23,8 +23,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.ojelectronics.internal.config.OJElectronicsThermostatConfiguration;
@@ -106,7 +104,7 @@ public class ThermostatHandler extends BaseThingHandler {
             }
         } else {
             synchronized (this) {
-                updatedValues.add(new AbstractMap.SimpleImmutableEntry<String, Command>(channelUID.getId(), command));
+                updatedValues.add(new AbstractMap.SimpleImmutableEntry<>(channelUID.getId(), command));
 
                 BridgeHandler bridgeHandler = Objects.requireNonNull(getBridge()).getHandler();
                 if (bridgeHandler != null) {
@@ -193,7 +191,7 @@ public class ThermostatHandler extends BaseThingHandler {
 
     private void updateManualSetpoint(ThermostatModel thermostat) {
         updateState(BindingConstants.CHANNEL_OWD5_MANUALSETPOINT,
-                new QuantityType<Temperature>(thermostat.manualModeSetpoint / (double) 100, SIUnits.CELSIUS));
+                new QuantityType<>(thermostat.manualModeSetpoint / (double) 100, SIUnits.CELSIUS));
     }
 
     private void updateManualSetpoint(Command command) {
@@ -233,7 +231,7 @@ public class ThermostatHandler extends BaseThingHandler {
 
     private void updateComfortSetpoint(ThermostatModel thermostat) {
         updateState(BindingConstants.CHANNEL_OWD5_COMFORTSETPOINT,
-                new QuantityType<Temperature>(thermostat.comfortSetpoint / (double) 100, SIUnits.CELSIUS));
+                new QuantityType<>(thermostat.comfortSetpoint / (double) 100, SIUnits.CELSIUS));
     }
 
     private void updateComfortSetpoint(Command command) {
@@ -266,22 +264,22 @@ public class ThermostatHandler extends BaseThingHandler {
 
     private void updateFloorTemperature(ThermostatModel thermostat) {
         updateState(BindingConstants.CHANNEL_OWD5_FLOORTEMPERATURE,
-                new QuantityType<Temperature>(thermostat.floorTemperature / (double) 100, SIUnits.CELSIUS));
+                new QuantityType<>(thermostat.floorTemperature / (double) 100, SIUnits.CELSIUS));
     }
 
     private void updateFloorTemperature(ThermostatRealTimeValuesModel thermostatRealTimeValues) {
-        updateState(BindingConstants.CHANNEL_OWD5_FLOORTEMPERATURE, new QuantityType<Temperature>(
-                thermostatRealTimeValues.floorTemperature / (double) 100, SIUnits.CELSIUS));
+        updateState(BindingConstants.CHANNEL_OWD5_FLOORTEMPERATURE,
+                new QuantityType<>(thermostatRealTimeValues.floorTemperature / (double) 100, SIUnits.CELSIUS));
     }
 
     private void updateRoomTemperature(ThermostatModel thermostat) {
         updateState(BindingConstants.CHANNEL_OWD5_ROOMTEMPERATURE,
-                new QuantityType<Temperature>(thermostat.roomTemperature / (double) 100, SIUnits.CELSIUS));
+                new QuantityType<>(thermostat.roomTemperature / (double) 100, SIUnits.CELSIUS));
     }
 
     private void updateRoomTemperature(ThermostatRealTimeValuesModel thermostatRealTimeValues) {
-        updateState(BindingConstants.CHANNEL_OWD5_ROOMTEMPERATURE, new QuantityType<Temperature>(
-                thermostatRealTimeValues.roomTemperature / (double) 100, SIUnits.CELSIUS));
+        updateState(BindingConstants.CHANNEL_OWD5_ROOMTEMPERATURE,
+                new QuantityType<>(thermostatRealTimeValues.roomTemperature / (double) 100, SIUnits.CELSIUS));
     }
 
     private void updateHeating(ThermostatModel thermostat) {
diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentModel.java b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentModel.java
index 5821e6fea5e..da7f3712827 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentModel.java
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentModel.java
@@ -33,7 +33,7 @@ public class GroupContentModel {
 
     public String groupName = "";
 
-    public List<ThermostatModel> thermostats = new ArrayList<ThermostatModel>();
+    public List<ThermostatModel> thermostats = new ArrayList<>();
 
     public int regulationMode;
 
diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentResponseModel.java b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentResponseModel.java
index bae9ccdabf1..4c0893a8b8d 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentResponseModel.java
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/GroupContentResponseModel.java
@@ -26,5 +26,5 @@ import org.openhab.binding.ojelectronics.internal.models.ResponseModelBase;
 @NonNullByDefault
 public class GroupContentResponseModel extends ResponseModelBase {
 
-    public List<GroupContentModel> groupContents = new ArrayList<GroupContentModel>();
+    public List<GroupContentModel> groupContents = new ArrayList<>();
 }
diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/ScheduleModel.java b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/ScheduleModel.java
index f1e67ee804a..b913c97e74d 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/ScheduleModel.java
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/models/groups/ScheduleModel.java
@@ -25,7 +25,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 @NonNullByDefault
 public class ScheduleModel {
 
-    public List<DayModel> days = new ArrayList<DayModel>();
+    public List<DayModel> days = new ArrayList<>();
 
     public boolean modifiedDueToVerification;
 }
diff --git a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/discovery/ObjectPropertyRequest.java b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/discovery/ObjectPropertyRequest.java
index b8a960a66fc..89c6f1d190c 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/discovery/ObjectPropertyRequest.java
+++ b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/discovery/ObjectPropertyRequest.java
@@ -62,7 +62,7 @@ public class ObjectPropertyRequest<T extends ObjectProperties> implements Iterab
 
     @Override
     public Iterator<T> iterator() {
-        List<T> messages = new ArrayList<T>();
+        List<T> messages = new ArrayList<>();
         int currentObjectNumber = objectNumber;
 
         while (true) {
@@ -122,8 +122,7 @@ public class ObjectPropertyRequest<T extends ObjectProperties> implements Iterab
         }
 
         public ObjectPropertyRequest<T> build() {
-            return new ObjectPropertyRequest<T>(bridgeHandler, request, objectNumber, filter1, filter2, filter3,
-                    offset);
+            return new ObjectPropertyRequest<>(bridgeHandler, request, objectNumber, filter1, filter2, filter3, offset);
         }
     }
 }
diff --git a/bundles/org.openhab.binding.onebusaway/src/main/java/org/openhab/binding/onebusaway/internal/handler/RouteHandler.java b/bundles/org.openhab.binding.onebusaway/src/main/java/org/openhab/binding/onebusaway/internal/handler/RouteHandler.java
index 98554e2963b..9ea3d6bce49 100644
--- a/bundles/org.openhab.binding.onebusaway/src/main/java/org/openhab/binding/onebusaway/internal/handler/RouteHandler.java
+++ b/bundles/org.openhab.binding.onebusaway/src/main/java/org/openhab/binding/onebusaway/internal/handler/RouteHandler.java
@@ -226,7 +226,7 @@ public class RouteHandler extends BaseThingHandler implements RouteDataListener
         scheduleTriggerEvents(channelUID, now, arrivalAndDepartures,
                 (ArrivalAndDeparture data) -> data.predicted ? data.predictedArrivalTime : data.scheduledArrivalTime,
                 EVENT_ARRIVAL);
-        scheduleTriggerEvents(channelUID, now, arrivalAndDepartures, new Function<ArrivalAndDeparture, Long>() {
+        scheduleTriggerEvents(channelUID, now, arrivalAndDepartures, new Function<>() {
             @Override
             public Long apply(ArrivalAndDeparture data) {
                 return data.predicted ? data.predictedDepartureTime : data.scheduledDepartureTime;
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV100.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV100.java
index 9331b2ba43d..28227eef950 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV100.java
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV100.java
@@ -233,10 +233,10 @@ class OpenSprinklerHttpApiV100 implements OpenSprinklerApi {
     @Override
     public QuantityType<Time> getRainDelay() {
         if (state.jcReply.rdst == 0) {
-            return new QuantityType<Time>(0, Units.SECOND);
+            return new QuantityType<>(0, Units.SECOND);
         }
         long remainingTime = state.jcReply.rdst - state.jcReply.devt;
-        return new QuantityType<Time>(remainingTime, Units.SECOND);
+        return new QuantityType<>(remainingTime, Units.SECOND);
     }
 
     /**
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/handler/OpenSprinklerDeviceHandler.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/handler/OpenSprinklerDeviceHandler.java
index 59d1521a54f..d70041888f6 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/handler/OpenSprinklerDeviceHandler.java
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/handler/OpenSprinklerDeviceHandler.java
@@ -19,9 +19,6 @@ import static org.openhab.core.library.unit.Units.PERCENT;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.ElectricCurrent;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.opensprinkler.internal.OpenSprinklerStateDescriptionProvider;
 import org.openhab.binding.opensprinkler.internal.api.OpenSprinklerApi;
@@ -82,7 +79,7 @@ public class OpenSprinklerDeviceHandler extends OpenSprinklerBaseHandler {
                 updateState(channel, QuantityType.valueOf(localAPI.waterLevel(), PERCENT));
                 break;
             case SENSOR_CURRENT_DRAW:
-                updateState(channel, new QuantityType<ElectricCurrent>(localAPI.currentDraw(), MILLI(Units.AMPERE)));
+                updateState(channel, new QuantityType<>(localAPI.currentDraw(), MILLI(Units.AMPERE)));
                 break;
             case SENSOR_SIGNAL_STRENGTH:
                 int rssiValue = localAPI.signalStrength();
@@ -99,7 +96,7 @@ public class OpenSprinklerDeviceHandler extends OpenSprinklerBaseHandler {
                 }
                 break;
             case SENSOR_FLOW_COUNT:
-                updateState(channel, new QuantityType<Dimensionless>(localAPI.flowSensorCount(), Units.ONE));
+                updateState(channel, new QuantityType<>(localAPI.flowSensorCount(), Units.ONE));
                 break;
             case CHANNEL_PROGRAMS:
                 break;
diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAlarmHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAlarmHandler.java
index c554f182c26..0bd59ad0dfc 100644
--- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAlarmHandler.java
+++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetAlarmHandler.java
@@ -55,7 +55,7 @@ public class OpenWebNetAlarmHandler extends OpenWebNetThingHandler {
 
     private static long lastAllDevicesRefreshTS = 0; // ts when last all device refresh was sent for this handler
 
-    private static Set<OpenWebNetAlarmHandler> zoneHandlers = new HashSet<OpenWebNetAlarmHandler>();
+    private static Set<OpenWebNetAlarmHandler> zoneHandlers = new HashSet<>();
 
     private static final String BATTERY_OK = "OK";
     private static final String BATTERY_FAULT = "FAULT";
diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java
index 7557429fcae..2b34b98a483 100644
--- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java
+++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetEnergyHandler.java
@@ -20,9 +20,6 @@ import java.util.Set;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import javax.measure.quantity.Energy;
-import javax.measure.quantity.Power;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.openwebnet.internal.OpenWebNetBindingConstants;
@@ -252,7 +249,7 @@ public class OpenWebNetEnergyHandler extends OpenWebNetThingHandler {
         Integer activePower;
         try {
             activePower = Integer.parseInt(msg.getDimValues()[0]);
-            updateState(CHANNEL_POWER, new QuantityType<Power>(activePower, Units.WATT));
+            updateState(CHANNEL_POWER, new QuantityType<>(activePower, Units.WATT));
         } catch (FrameException e) {
             logger.warn("FrameException on frame {}: {}", msg, e.getMessage());
             updateState(CHANNEL_POWER, UnDefType.UNDEF);
@@ -271,7 +268,7 @@ public class OpenWebNetEnergyHandler extends OpenWebNetThingHandler {
         Double currentDayEnergy;
         try {
             currentDayEnergy = Double.parseDouble(msg.getDimValues()[0]) / 1000d;
-            updateState(CHANNEL_ENERGY_TOTALIZER_DAY, new QuantityType<Energy>(currentDayEnergy, Units.KILOWATT_HOUR));
+            updateState(CHANNEL_ENERGY_TOTALIZER_DAY, new QuantityType<>(currentDayEnergy, Units.KILOWATT_HOUR));
         } catch (FrameException e) {
             logger.warn("FrameException on frame {}: {}", msg, e.getMessage());
             updateState(CHANNEL_ENERGY_TOTALIZER_DAY, UnDefType.UNDEF);
@@ -290,8 +287,7 @@ public class OpenWebNetEnergyHandler extends OpenWebNetThingHandler {
         Double currentMonthEnergy;
         try {
             currentMonthEnergy = Double.parseDouble(msg.getDimValues()[0]) / 1000d;
-            updateState(CHANNEL_ENERGY_TOTALIZER_MONTH,
-                    new QuantityType<Energy>(currentMonthEnergy, Units.KILOWATT_HOUR));
+            updateState(CHANNEL_ENERGY_TOTALIZER_MONTH, new QuantityType<>(currentMonthEnergy, Units.KILOWATT_HOUR));
         } catch (FrameException e) {
             logger.warn("FrameException on frame {}: {}", msg, e.getMessage());
             updateState(CHANNEL_ENERGY_TOTALIZER_MONTH, UnDefType.UNDEF);
diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetScenarioHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetScenarioHandler.java
index 56e8c1a693a..fe412291c02 100644
--- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetScenarioHandler.java
+++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetScenarioHandler.java
@@ -342,7 +342,7 @@ public class OpenWebNetScenarioHandler extends OpenWebNetThingHandler {
     }
 
     private static Set<Integer> csvStringToSetInt(String s) {
-        TreeSet<Integer> intSet = new TreeSet<Integer>();
+        TreeSet<Integer> intSet = new TreeSet<>();
         String sNorm = s.replaceAll("\\s", "");
         Scanner sc = new Scanner(sNorm);
         sc.useDelimiter(",");
diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPanelHandler.java b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPanelHandler.java
index e316dc6a196..c49d25f6b9e 100644
--- a/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPanelHandler.java
+++ b/bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/handlers/ParadoxPanelHandler.java
@@ -14,8 +14,6 @@ package org.openhab.binding.paradoxalarm.internal.handlers;
 
 import static org.openhab.binding.paradoxalarm.internal.handlers.ParadoxAlarmBindingConstants.*;
 
-import javax.measure.quantity.ElectricPotential;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.paradoxalarm.internal.model.ParadoxInformation;
 import org.openhab.binding.paradoxalarm.internal.model.ParadoxPanel;
@@ -59,10 +57,9 @@ public class ParadoxPanelHandler extends EntityBaseHandler {
             updateProperty(PANEL_BOOTLOADER_VERSION_PROPERTY_NAME, panelInformation.getBootLoaderVersion().toString());
 
             updateState(PANEL_TIME, new DateTimeType(panel.getPanelTime()));
-            updateState(PANEL_INPUT_VOLTAGE, new QuantityType<ElectricPotential>(panel.getVdcLevel(), Units.VOLT));
-            updateState(PANEL_BOARD_VOLTAGE, new QuantityType<ElectricPotential>(panel.getDcLevel(), Units.VOLT));
-            updateState(PANEL_BATTERY_VOLTAGE,
-                    new QuantityType<ElectricPotential>(panel.getBatteryLevel(), Units.VOLT));
+            updateState(PANEL_INPUT_VOLTAGE, new QuantityType<>(panel.getVdcLevel(), Units.VOLT));
+            updateState(PANEL_BOARD_VOLTAGE, new QuantityType<>(panel.getDcLevel(), Units.VOLT));
+            updateState(PANEL_BATTERY_VOLTAGE, new QuantityType<>(panel.getBatteryLevel(), Units.VOLT));
         }
     }
 }
diff --git a/bundles/org.openhab.binding.plex/src/main/java/org/openhab/binding/plex/internal/handler/PlexServerHandler.java b/bundles/org.openhab.binding.plex/src/main/java/org/openhab/binding/plex/internal/handler/PlexServerHandler.java
index 54ded9f3584..9459c45e0ab 100644
--- a/bundles/org.openhab.binding.plex/src/main/java/org/openhab/binding/plex/internal/handler/PlexServerHandler.java
+++ b/bundles/org.openhab.binding.plex/src/main/java/org/openhab/binding/plex/internal/handler/PlexServerHandler.java
@@ -169,7 +169,7 @@ public class PlexServerHandler extends BaseBridgeHandler implements PlexUpdateLi
      * @return
      */
     public List<String> getAvailablePlayers() {
-        List<String> availablePlayers = new ArrayList<String>();
+        List<String> availablePlayers = new ArrayList<>();
         MediaContainer sessionData = plexAPIConnector.getSessionData();
 
         if (sessionData != null && sessionData.getSize() > 0) {
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java
index 5ad60cf019a..3aead2f9771 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java
@@ -433,12 +433,12 @@ public class PlugwiseHAController {
     }
 
     private <T> PlugwiseHAControllerRequest<T> newRequest(Class<T> responseType, @Nullable Transformer transformer) {
-        return new PlugwiseHAControllerRequest<T>(responseType, this.xStream, transformer, this.httpClient, this.host,
+        return new PlugwiseHAControllerRequest<>(responseType, this.xStream, transformer, this.httpClient, this.host,
                 this.port, this.username, this.smileId);
     }
 
     private <T> PlugwiseHAControllerRequest<T> newRequest(Class<T> responseType) {
-        return new PlugwiseHAControllerRequest<T>(responseType, this.xStream, null, this.httpClient, this.host,
+        return new PlugwiseHAControllerRequest<>(responseType, this.xStream, null, this.httpClient, this.host,
                 this.port, this.username, this.smileId);
     }
 
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
index 8303be37046..ed86c4d973e 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
@@ -39,7 +39,7 @@ public class Location extends PlugwiseBaseModel implements PlugwiseComparableDat
     private String preset;
 
     @XStreamImplicit(itemFieldName = "appliance")
-    private List<String> locationAppliances = new ArrayList<String>();
+    private List<String> locationAppliances = new ArrayList<>();
 
     @XStreamImplicit(itemFieldName = "point_log", keyFieldName = "type")
     private Logs pointLogs;
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java
index 034c907cb20..57e38ccccef 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java
@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.Map;
 
 import javax.measure.Unit;
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Power;
 import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Temperature;
 
@@ -242,7 +240,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
 
                 if (batteryLevel != null) {
                     batteryLevel = batteryLevel * 100;
-                    state = new QuantityType<Dimensionless>(batteryLevel.intValue(), Units.PERCENT);
+                    state = new QuantityType<>(batteryLevel.intValue(), Units.PERCENT);
                     if (batteryLevel <= config.getLowBatteryPercentage()) {
                         updateState(APPLIANCE_BATTERYLEVELLOW_CHANNEL, OnOffType.ON);
                     } else {
@@ -285,7 +283,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getOffsetTemperatureUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getOffsetTemperature().get(), unit);
+                    state = new QuantityType<>(entity.getOffsetTemperature().get(), unit);
                 }
                 break;
             case APPLIANCE_POWER_CHANNEL:
@@ -295,14 +293,14 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                 break;
             case APPLIANCE_POWER_USAGE_CHANNEL:
                 if (entity.getPowerUsage().isPresent()) {
-                    state = new QuantityType<Power>(entity.getPowerUsage().get(), Units.WATT);
+                    state = new QuantityType<>(entity.getPowerUsage().get(), Units.WATT);
                 }
                 break;
             case APPLIANCE_SETPOINT_CHANNEL:
                 if (entity.getSetpointTemperature().isPresent()) {
                     Unit<Temperature> unit = entity.getSetpointTemperatureUnit().orElse(UNIT_CELSIUS)
                             .equals(UNIT_CELSIUS) ? SIUnits.CELSIUS : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getSetpointTemperature().get(), unit);
+                    state = new QuantityType<>(entity.getSetpointTemperature().get(), unit);
                 }
                 break;
             case APPLIANCE_TEMPERATURE_CHANNEL:
@@ -310,19 +308,19 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getTemperatureUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getTemperature().get(), unit);
+                    state = new QuantityType<>(entity.getTemperature().get(), unit);
                 }
                 break;
             case APPLIANCE_VALVEPOSITION_CHANNEL:
                 if (entity.getValvePosition().isPresent()) {
                     Double valvePosition = entity.getValvePosition().get() * 100;
-                    state = new QuantityType<Dimensionless>(valvePosition.intValue(), Units.PERCENT);
+                    state = new QuantityType<>(valvePosition.intValue(), Units.PERCENT);
                 }
                 break;
             case APPLIANCE_WATERPRESSURE_CHANNEL:
                 if (entity.getWaterPressure().isPresent()) {
                     Unit<Pressure> unit = HECTO(SIUnits.PASCAL);
-                    state = new QuantityType<Pressure>(entity.getWaterPressure().get(), unit);
+                    state = new QuantityType<>(entity.getWaterPressure().get(), unit);
                 }
                 break;
             case APPLIANCE_COOLINGSTATE_CHANNEL:
@@ -334,7 +332,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                 if (entity.getIntendedBoilerTemp().isPresent()) {
                     Unit<Temperature> unit = entity.getIntendedBoilerTempUnit().orElse(UNIT_CELSIUS)
                             .equals(UNIT_CELSIUS) ? SIUnits.CELSIUS : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getIntendedBoilerTemp().get(), unit);
+                    state = new QuantityType<>(entity.getIntendedBoilerTemp().get(), unit);
                 }
                 break;
             case APPLIANCE_FLAMESTATE_CHANNEL:
@@ -350,12 +348,12 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
             case APPLIANCE_MODULATIONLEVEL_CHANNEL:
                 if (entity.getModulationLevel().isPresent()) {
                     Double modulationLevel = entity.getModulationLevel().get() * 100;
-                    state = new QuantityType<Dimensionless>(modulationLevel.intValue(), Units.PERCENT);
+                    state = new QuantityType<>(modulationLevel.intValue(), Units.PERCENT);
                 }
                 break;
             case APPLIANCE_OTAPPLICATIONFAULTCODE_CHANNEL:
                 if (entity.getOTAppFaultCode().isPresent()) {
-                    state = new QuantityType<Dimensionless>(entity.getOTAppFaultCode().get().intValue(), Units.PERCENT);
+                    state = new QuantityType<>(entity.getOTAppFaultCode().get().intValue(), Units.PERCENT);
                 }
                 break;
             case APPLIANCE_RETURNWATERTEMPERATURE_CHANNEL:
@@ -363,7 +361,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getReturnWaterTempUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getReturnWaterTemp().get(), unit);
+                    state = new QuantityType<>(entity.getReturnWaterTemp().get(), unit);
                 }
                 break;
             case APPLIANCE_DHWTEMPERATURE_CHANNEL:
@@ -371,12 +369,12 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getDHWTempUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getDHWTemp().get(), unit);
+                    state = new QuantityType<>(entity.getDHWTemp().get(), unit);
                 }
                 break;
             case APPLIANCE_OTOEMFAULTCODE_CHANNEL:
                 if (entity.getOTOEMFaultcode().isPresent()) {
-                    state = new QuantityType<Dimensionless>(entity.getOTOEMFaultcode().get().intValue(), Units.PERCENT);
+                    state = new QuantityType<>(entity.getOTOEMFaultcode().get().intValue(), Units.PERCENT);
                 }
                 break;
             case APPLIANCE_BOILERTEMPERATURE_CHANNEL:
@@ -384,7 +382,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getBoilerTempUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getBoilerTemp().get(), unit);
+                    state = new QuantityType<>(entity.getBoilerTemp().get(), unit);
                 }
                 break;
             case APPLIANCE_DHWSETPOINT_CHANNEL:
@@ -392,7 +390,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getDHTSetpointUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getDHTSetpoint().get(), unit);
+                    state = new QuantityType<>(entity.getDHTSetpoint().get(), unit);
                 }
                 break;
             case APPLIANCE_MAXBOILERTEMPERATURE_CHANNEL:
@@ -400,7 +398,7 @@ public class PlugwiseHAApplianceHandler extends PlugwiseHABaseHandler<Appliance,
                     Unit<Temperature> unit = entity.getMaxBoilerTempUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getMaxBoilerTemp().get(), unit);
+                    state = new QuantityType<>(entity.getMaxBoilerTemp().get(), unit);
                 }
                 break;
             case APPLIANCE_DHWCOMFORTMODE_CHANNEL:
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAZoneHandler.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAZoneHandler.java
index 7c7c7e6cc30..0155e76b74a 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAZoneHandler.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAZoneHandler.java
@@ -218,7 +218,7 @@ public class PlugwiseHAZoneHandler extends PlugwiseHABaseHandler<Location, Plugw
                 if (entity.getSetpointTemperature().isPresent()) {
                     Unit<Temperature> unit = entity.getSetpointTemperatureUnit().orElse(UNIT_CELSIUS)
                             .equals(UNIT_CELSIUS) ? SIUnits.CELSIUS : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getSetpointTemperature().get(), unit);
+                    state = new QuantityType<>(entity.getSetpointTemperature().get(), unit);
                 }
                 break;
             case ZONE_REGULATION_CHANNEL:
@@ -232,7 +232,7 @@ public class PlugwiseHAZoneHandler extends PlugwiseHABaseHandler<Location, Plugw
                     Unit<Temperature> unit = entity.getTemperatureUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
                             ? SIUnits.CELSIUS
                             : ImperialUnits.FAHRENHEIT;
-                    state = new QuantityType<Temperature>(entity.getTemperature().get(), unit);
+                    state = new QuantityType<>(entity.getTemperature().get(), unit);
                 }
                 break;
             default:
diff --git a/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/PulseaudioClient.java b/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/PulseaudioClient.java
index 164149ed002..de193d7340f 100644
--- a/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/PulseaudioClient.java
+++ b/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/PulseaudioClient.java
@@ -149,7 +149,7 @@ public class PulseaudioClient {
      */
     public synchronized void update() {
         // one step copy
-        modules = new ArrayList<Module>(Parser.parseModules(listModules()));
+        modules = new ArrayList<>(Parser.parseModules(listModules()));
 
         List<AbstractAudioDeviceConfig> newItems = new ArrayList<>(); // prepare new list before assigning it
         if (configuration.sink) {
@@ -382,7 +382,7 @@ public class PulseaudioClient {
         if (itemType == null) {
             return Optional.empty();
         }
-        List<Module> modulesCopy = new ArrayList<Module>(modules);
+        List<Module> modulesCopy = new ArrayList<>(modules);
         var isSource = item instanceof Source;
         return modulesCopy.stream() // iteration on modules
                 .filter(module -> MODULE_SIMPLE_PROTOCOL_TCP_NAME.equals(module.getPaName())) // filter on module name
diff --git a/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPanelHandler.java b/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPanelHandler.java
index 2d78f327e8c..c1ac93b6b94 100644
--- a/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPanelHandler.java
+++ b/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPanelHandler.java
@@ -69,7 +69,7 @@ public class QolsysIQPanelHandler extends BaseBridgeHandler
     private @Nullable QolsysiqClient apiClient;
     private @Nullable ScheduledFuture<?> retryFuture;
     private @Nullable QolsysIQChildDiscoveryService discoveryService;
-    private List<Partition> partitions = Collections.synchronizedList(new LinkedList<Partition>());
+    private List<Partition> partitions = Collections.synchronizedList(new LinkedList<>());
     private String key = "";
 
     public QolsysIQPanelHandler(Bridge bridge) {
diff --git a/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPartitionHandler.java b/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPartitionHandler.java
index 7371eb178e9..3f766623f6b 100644
--- a/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPartitionHandler.java
+++ b/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQPartitionHandler.java
@@ -75,7 +75,7 @@ public class QolsysIQPartitionHandler extends BaseBridgeHandler implements Qolsy
     private @Nullable ScheduledFuture<?> errorFuture;
     private @Nullable String armCode;
     private @Nullable String disarmCode;
-    private List<Zone> zones = Collections.synchronizedList(new LinkedList<Zone>());
+    private List<Zone> zones = Collections.synchronizedList(new LinkedList<>());
     private int partitionId;
 
     public QolsysIQPartitionHandler(Bridge bridge) {
@@ -278,7 +278,7 @@ public class QolsysIQPartitionHandler extends BaseBridgeHandler implements Qolsy
     }
 
     private void setSecureArm(Boolean secure) {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("secureArm", String.valueOf(secure));
         getThing().setProperties(props);
     }
diff --git a/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQZoneHandler.java b/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQZoneHandler.java
index 8d993d2114d..87c2a69e46d 100644
--- a/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQZoneHandler.java
+++ b/bundles/org.openhab.binding.qolsysiq/src/main/java/org/openhab/binding/qolsysiq/internal/handler/QolsysIQZoneHandler.java
@@ -78,7 +78,7 @@ public class QolsysIQZoneHandler extends BaseThingHandler {
         logger.debug("updateZone {}", zone.zoneId);
         updateState(QolsysIQBindingConstants.CHANNEL_ZONE_STATE, new DecimalType(zone.state));
         updateZoneStatus(zone.status);
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("type", zone.type);
         props.put("name", zone.name);
         props.put("group", zone.group);
diff --git a/bundles/org.openhab.binding.radiothermostat/src/main/java/org/openhab/binding/radiothermostat/internal/handler/RadioThermostatHandler.java b/bundles/org.openhab.binding.radiothermostat/src/main/java/org/openhab/binding/radiothermostat/internal/handler/RadioThermostatHandler.java
index 043cbe0cb09..197bbf76034 100644
--- a/bundles/org.openhab.binding.radiothermostat/src/main/java/org/openhab/binding/radiothermostat/internal/handler/RadioThermostatHandler.java
+++ b/bundles/org.openhab.binding.radiothermostat/src/main/java/org/openhab/binding/radiothermostat/internal/handler/RadioThermostatHandler.java
@@ -516,8 +516,7 @@ public class RadioThermostatHandler extends BaseThingHandler implements RadioThe
         switch (channelId) {
             case TEMPERATURE:
                 if (data.getThermostatData().getTemperature() != null) {
-                    return new QuantityType<Temperature>(data.getThermostatData().getTemperature(),
-                            API_TEMPERATURE_UNIT);
+                    return new QuantityType<>(data.getThermostatData().getTemperature(), API_TEMPERATURE_UNIT);
                 } else {
                     return null;
                 }
@@ -535,7 +534,7 @@ public class RadioThermostatHandler extends BaseThingHandler implements RadioThe
                 return data.getThermostatData().getProgramMode();
             case SET_POINT:
                 if (data.getThermostatData().getSetpoint() != 0) {
-                    return new QuantityType<Temperature>(data.getThermostatData().getSetpoint(), API_TEMPERATURE_UNIT);
+                    return new QuantityType<>(data.getThermostatData().getSetpoint(), API_TEMPERATURE_UNIT);
                 } else {
                     return null;
                 }
diff --git a/bundles/org.openhab.binding.renault/src/main/java/org/openhab/binding/renault/internal/handler/RenaultHandler.java b/bundles/org.openhab.binding.renault/src/main/java/org/openhab/binding/renault/internal/handler/RenaultHandler.java
index d8f584f25c1..7b4085a1b95 100644
--- a/bundles/org.openhab.binding.renault/src/main/java/org/openhab/binding/renault/internal/handler/RenaultHandler.java
+++ b/bundles/org.openhab.binding.renault/src/main/java/org/openhab/binding/renault/internal/handler/RenaultHandler.java
@@ -24,10 +24,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import javax.measure.quantity.Energy;
-import javax.measure.quantity.Length;
 import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Time;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -116,7 +113,7 @@ public class RenaultHandler extends BaseThingHandler {
         }
         updateStatus(ThingStatus.UNKNOWN);
         updateState(CHANNEL_HVAC_TARGET_TEMPERATURE,
-                new QuantityType<Temperature>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
+                new QuantityType<>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
 
         reschedulePollingJob();
     }
@@ -128,11 +125,11 @@ public class RenaultHandler extends BaseThingHandler {
                 if (!car.isDisableHvac()) {
                     if (command instanceof RefreshType) {
                         updateState(CHANNEL_HVAC_TARGET_TEMPERATURE,
-                                new QuantityType<Temperature>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
+                                new QuantityType<>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
                     } else if (command instanceof DecimalType decimalCommand) {
                         car.setHvacTargetTemperature(decimalCommand.doubleValue());
                         updateState(CHANNEL_HVAC_TARGET_TEMPERATURE,
-                                new QuantityType<Temperature>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
+                                new QuantityType<>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
                     } else if (command instanceof QuantityType) {
                         @Nullable
                         QuantityType<Temperature> celsius = ((QuantityType<Temperature>) command)
@@ -141,7 +138,7 @@ public class RenaultHandler extends BaseThingHandler {
                             car.setHvacTargetTemperature(celsius.doubleValue());
                         }
                         updateState(CHANNEL_HVAC_TARGET_TEMPERATURE,
-                                new QuantityType<Temperature>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
+                                new QuantityType<>(car.getHvacTargetTemperature(), SIUnits.CELSIUS));
                     }
                 }
                 break;
@@ -287,7 +284,7 @@ public class RenaultHandler extends BaseThingHandler {
                 Double externalTemperature = car.getExternalTemperature();
                 if (externalTemperature != null) {
                     updateState(CHANNEL_EXTERNAL_TEMPERATURE,
-                            new QuantityType<Temperature>(externalTemperature.doubleValue(), SIUnits.CELSIUS));
+                            new QuantityType<>(externalTemperature.doubleValue(), SIUnits.CELSIUS));
                 }
             } catch (RenaultNotImplementedException e) {
                 logger.warn("Disabling unsupported HVAC status update.");
@@ -328,7 +325,7 @@ public class RenaultHandler extends BaseThingHandler {
                 httpSession.getCockpit(car);
                 Double odometer = car.getOdometer();
                 if (odometer != null) {
-                    updateState(CHANNEL_ODOMETER, new QuantityType<Length>(odometer.doubleValue(), KILO(METRE)));
+                    updateState(CHANNEL_ODOMETER, new QuantityType<>(odometer.doubleValue(), KILO(METRE)));
                 }
             } catch (RenaultNotImplementedException e) {
                 logger.warn("Disabling unsupported cockpit status update.");
@@ -351,18 +348,17 @@ public class RenaultHandler extends BaseThingHandler {
                 }
                 Double estimatedRange = car.getEstimatedRange();
                 if (estimatedRange != null) {
-                    updateState(CHANNEL_ESTIMATED_RANGE,
-                            new QuantityType<Length>(estimatedRange.doubleValue(), KILO(METRE)));
+                    updateState(CHANNEL_ESTIMATED_RANGE, new QuantityType<>(estimatedRange.doubleValue(), KILO(METRE)));
                 }
                 Double batteryAvailableEnergy = car.getBatteryAvailableEnergy();
                 if (batteryAvailableEnergy != null) {
                     updateState(CHANNEL_BATTERY_AVAILABLE_ENERGY,
-                            new QuantityType<Energy>(batteryAvailableEnergy.doubleValue(), KILOWATT_HOUR));
+                            new QuantityType<>(batteryAvailableEnergy.doubleValue(), KILOWATT_HOUR));
                 }
                 Integer chargingRemainingTime = car.getChargingRemainingTime();
                 if (chargingRemainingTime != null) {
                     updateState(CHANNEL_CHARGING_REMAINING_TIME,
-                            new QuantityType<Time>(chargingRemainingTime.doubleValue(), MINUTE));
+                            new QuantityType<>(chargingRemainingTime.doubleValue(), MINUTE));
                 }
                 ZonedDateTime batteryStatusUpdated = car.getBatteryStatusUpdated();
                 if (batteryStatusUpdated != null) {
diff --git a/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/discovery/ResolVBusBridgeDiscovery.java b/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/discovery/ResolVBusBridgeDiscovery.java
index 698e225e34b..d6db667178c 100644
--- a/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/discovery/ResolVBusBridgeDiscovery.java
+++ b/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/discovery/ResolVBusBridgeDiscovery.java
@@ -80,7 +80,7 @@ public class ResolVBusBridgeDiscovery extends AbstractDiscoveryService {
 
             TcpDataSource[] dataSources = TcpDataSourceProvider.discoverDataSources(broadcastAddress, 3, 500, false);
 
-            Map<String, TcpDataSource> currentDataSourceById = new HashMap<String, TcpDataSource>();
+            Map<String, TcpDataSource> currentDataSourceById = new HashMap<>();
             for (TcpDataSource ds : dataSources) {
                 if (!discoveryRunning) {
                     break;
diff --git a/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/providers/ResolChannelTypeProvider.java b/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/providers/ResolChannelTypeProvider.java
index 300c598d2b3..85519986510 100644
--- a/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/providers/ResolChannelTypeProvider.java
+++ b/bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/providers/ResolChannelTypeProvider.java
@@ -37,7 +37,7 @@ import de.resol.vbus.SpecificationFile.Unit;
 @Component(service = { ChannelTypeProvider.class, ResolChannelTypeProvider.class })
 @NonNullByDefault
 public class ResolChannelTypeProvider implements ChannelTypeProvider {
-    private Map<ChannelTypeUID, ChannelType> channelTypes = new ConcurrentHashMap<ChannelTypeUID, ChannelType>();
+    private Map<ChannelTypeUID, ChannelType> channelTypes = new ConcurrentHashMap<>();
 
     public ResolChannelTypeProvider() {
         // let's add all channel types from known by the resol-vbus java library
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/RFXComBindingConstants.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/RFXComBindingConstants.java
index 023dac4a39c..e3a24fd1f7c 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/RFXComBindingConstants.java
+++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/RFXComBindingConstants.java
@@ -207,7 +207,7 @@ public class RFXComBindingConstants {
      * Map RFXCOM packet types to RFXCOM Thing types and vice versa.
      */
     public static final Map<PacketType, ThingTypeUID> PACKET_TYPE_THING_TYPE_UID_MAP = Collections
-            .unmodifiableMap(new HashMap<PacketType, ThingTypeUID>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
                     put(PacketType.BAROMETRIC, RFXComBindingConstants.THING_TYPE_BAROMETRIC);
                     put(PacketType.BBQ, RFXComBindingConstants.THING_TYPE_BBQ_TEMPERATURE);
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComMessageFactoryImpl.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComMessageFactoryImpl.java
index b3a977ed4b1..3a1e00b469f 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComMessageFactoryImpl.java
+++ b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/messages/RFXComMessageFactoryImpl.java
@@ -37,7 +37,7 @@ public enum RFXComMessageFactoryImpl implements RFXComMessageFactory {
 
     @SuppressWarnings("serial")
     private static final Map<PacketType, Class<? extends RFXComMessage>> MESSAGE_CLASSES = Collections
-            .unmodifiableMap(new HashMap<PacketType, Class<? extends RFXComMessage>>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
                     put(PacketType.INTERFACE_CONTROL, RFXComInterfaceControlMessage.class);
                     put(PacketType.INTERFACE_MESSAGE, RFXComInterfaceMessage.class);
diff --git a/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/Apps.java b/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/Apps.java
index dd6e44d423b..ca1318f2cd1 100644
--- a/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/Apps.java
+++ b/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/Apps.java
@@ -35,7 +35,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 @XmlRootElement(name = "apps")
 public class Apps {
     @XmlElement
-    private List<Apps.App> app = new ArrayList<Apps.App>();
+    private List<Apps.App> app = new ArrayList<>();
 
     public List<Apps.App> getApp() {
         return this.app;
diff --git a/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/TvChannels.java b/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/TvChannels.java
index 4b12876e292..b96b77171da 100644
--- a/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/TvChannels.java
+++ b/bundles/org.openhab.binding.roku/src/main/java/org/openhab/binding/roku/internal/dto/TvChannels.java
@@ -33,7 +33,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 @XmlRootElement(name = "tv-channels")
 public class TvChannels {
     @XmlElement
-    private List<TvChannels.Channel> channel = new ArrayList<TvChannels.Channel>();
+    private List<TvChannels.Channel> channel = new ArrayList<>();
 
     public List<TvChannels.Channel> getChannel() {
         return this.channel;
diff --git a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/source/RioSourceProtocol.java b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/source/RioSourceProtocol.java
index 99ce9656d31..5e298d02f43 100644
--- a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/source/RioSourceProtocol.java
+++ b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/source/RioSourceProtocol.java
@@ -127,20 +127,19 @@ class RioSourceProtocol extends AbstractRioProtocol {
      * The table of channels to unique identifiers for media management functions
      */
     @SuppressWarnings("serial")
-    private final Map<String, AtomicInteger> mmSeqNbrs = Collections
-            .unmodifiableMap(new HashMap<String, AtomicInteger>() {
-                {
-                    put(RioConstants.CHANNEL_SOURCEMMMENU, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMSCREEN, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMTITLE, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMATTR, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMBUTTONOKTEXT, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMBUTTONBACKTEXT, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMINFOTEXT, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMHELPTEXT, new AtomicInteger(0));
-                    put(RioConstants.CHANNEL_SOURCEMMTEXTFIELD, new AtomicInteger(0));
-                }
-            });
+    private final Map<String, AtomicInteger> mmSeqNbrs = Collections.unmodifiableMap(new HashMap<>() {
+        {
+            put(RioConstants.CHANNEL_SOURCEMMMENU, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMSCREEN, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMTITLE, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMATTR, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMBUTTONOKTEXT, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMBUTTONBACKTEXT, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMINFOTEXT, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMHELPTEXT, new AtomicInteger(0));
+            put(RioConstants.CHANNEL_SOURCEMMTEXTFIELD, new AtomicInteger(0));
+        }
+    });
 
     /**
      * The client used for http requests
diff --git a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/ServiceFactory.java b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/ServiceFactory.java
index 988eac7da9f..6dcbb30a5e6 100644
--- a/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/ServiceFactory.java
+++ b/bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/service/ServiceFactory.java
@@ -32,7 +32,7 @@ public class ServiceFactory {
 
     @SuppressWarnings("serial")
     private static final Map<String, Class<? extends SamsungTvService>> SERVICEMAP = Collections
-            .unmodifiableMap(new HashMap<String, Class<? extends SamsungTvService>>() {
+            .unmodifiableMap(new HashMap<>() {
                 {
                     put(MainTVServerService.SERVICE_NAME, MainTVServerService.class);
                     put(MediaRendererService.SERVICE_NAME, MediaRendererService.class);
diff --git a/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java b/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java
index ebd8f9c81d0..85733e6e870 100644
--- a/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java
+++ b/bundles/org.openhab.binding.senechome/src/main/java/org/openhab/binding/senechome/internal/SenecHomeHandler.java
@@ -326,7 +326,7 @@ public class SenecHomeHandler extends BaseThingHandler {
         } else {
             value = value.setScale(scale, RoundingMode.HALF_UP);
         }
-        updateState(channel.getUID(), new QuantityType<Q>(value, unit));
+        updateState(channel.getUID(), new QuantityType<>(value, unit));
     }
 
     protected BigDecimal getSenecValue(String value) {
diff --git a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/ConditionHandlerTest.java b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/ConditionHandlerTest.java
index 8ec83313436..1ad06d91f65 100644
--- a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/ConditionHandlerTest.java
+++ b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/ConditionHandlerTest.java
@@ -39,7 +39,7 @@ public class ConditionHandlerTest {
     public void testValidNoPressureUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -62,7 +62,7 @@ public class ConditionHandlerTest {
     public void testValidWithPressureUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -86,7 +86,7 @@ public class ConditionHandlerTest {
     public void testInvalidUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -105,7 +105,7 @@ public class ConditionHandlerTest {
     public void testEmptyUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -119,7 +119,7 @@ public class ConditionHandlerTest {
     public void testNullUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -133,7 +133,7 @@ public class ConditionHandlerTest {
     public void testInternalUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("ipAddress", "192.168.178.1");
         t.setConfiguration(properties);
diff --git a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/NoiseHandlerTest.java b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/NoiseHandlerTest.java
index c17f7ce9633..878feb424f2 100644
--- a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/NoiseHandlerTest.java
+++ b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/NoiseHandlerTest.java
@@ -37,7 +37,7 @@ public class NoiseHandlerTest {
     public void testValidUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -59,7 +59,7 @@ public class NoiseHandlerTest {
     public void testInvalidUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -81,7 +81,7 @@ public class NoiseHandlerTest {
     public void testEmptyUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -95,7 +95,7 @@ public class NoiseHandlerTest {
     public void testNullUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
diff --git a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/PMHandlerTest.java b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/PMHandlerTest.java
index 085bad4ba6e..d15fd5e14b4 100644
--- a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/PMHandlerTest.java
+++ b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/PMHandlerTest.java
@@ -42,7 +42,7 @@ public class PMHandlerTest {
     public void testValidConfigStatus() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -71,7 +71,7 @@ public class PMHandlerTest {
     public void testInvalidConfigStatus() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", -1);
         t.setConfiguration(properties);
@@ -100,7 +100,7 @@ public class PMHandlerTest {
     public void testValidUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -122,7 +122,7 @@ public class PMHandlerTest {
     public void testInvalidUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -145,7 +145,7 @@ public class PMHandlerTest {
     public void testEmptyUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
@@ -159,7 +159,7 @@ public class PMHandlerTest {
     public void testNullUpdate() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("ipAdress", "192.168.178.1");
         t.setConfiguration(properties);
@@ -173,7 +173,7 @@ public class PMHandlerTest {
     public void testInternalPMSensor() {
         ThingMock t = new ThingMock();
 
-        HashMap<String, Object> properties = new HashMap<String, Object>();
+        HashMap<String, Object> properties = new HashMap<>();
         // String sensorid taken from thing-types.xml
         properties.put("sensorid", 12345);
         t.setConfiguration(properties);
diff --git a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/mock/ThingMock.java b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/mock/ThingMock.java
index c8f5a257743..222915d36cc 100644
--- a/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/mock/ThingMock.java
+++ b/bundles/org.openhab.binding.sensorcommunity/src/test/java/org/openhab/binding/sensorcommunity/internal/mock/ThingMock.java
@@ -50,12 +50,12 @@ public class ThingMock implements Thing {
 
     @Override
     public List<Channel> getChannels() {
-        return new ArrayList<Channel>();
+        return new ArrayList<>();
     }
 
     @Override
     public List<Channel> getChannelsOfGroup(String channelGroupId) {
-        return new ArrayList<Channel>();
+        return new ArrayList<>();
     }
 
     @Override
@@ -121,7 +121,7 @@ public class ThingMock implements Thing {
 
     @Override
     public Map<String, String> getProperties() {
-        return new HashMap<String, String>();
+        return new HashMap<>();
     }
 
     @Override
diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoapHandler.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoapHandler.java
index d7a708f93ae..d933736be94 100644
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoapHandler.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api1/Shelly1CoapHandler.java
@@ -448,7 +448,7 @@ public class Shelly1CoapHandler implements Shelly1CoapListener {
         }
 
         List<CoIotSensor> sensorUpdates = list.generic;
-        Map<String, State> updates = new TreeMap<String, State>();
+        Map<String, State> updates = new TreeMap<>();
         logger.debug("{}: {} CoAP sensor updates received", thingName, sensorUpdates.size());
         int failed = 0;
         ShellyColorUtils col = new ShellyColorUtils();
diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyBluDiscoveryService.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyBluDiscoveryService.java
index 4cff48475e3..7d2e7794a9b 100644
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyBluDiscoveryService.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/discovery/ShellyBluDiscoveryService.java
@@ -57,8 +57,7 @@ public class ShellyBluDiscoveryService extends AbstractDiscoveryService {
     @SuppressWarnings("null")
     public void registerDeviceDiscoveryService() {
         if (discoveryService == null) {
-            discoveryService = bundleContext.registerService(DiscoveryService.class.getName(), this,
-                    new Hashtable<String, Object>());
+            discoveryService = bundleContext.registerService(DiscoveryService.class.getName(), this, new Hashtable<>());
         }
     }
 
diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerCache.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerCache.java
index f13d0ff6655..85bc0cf65be 100644
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerCache.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerCache.java
@@ -29,7 +29,7 @@ public class ShellyManagerCache<K, V> extends ConcurrentHashMap<K, V> {
 
     private static final long serialVersionUID = 1L;
 
-    private Map<K, Long> timeMap = new ConcurrentHashMap<K, Long>();
+    private Map<K, Long> timeMap = new ConcurrentHashMap<>();
     private long expiryInMillis = ShellyManagerConstants.CACHE_TIMEOUT_DEF_MIN * 60 * 1000; // Default 1h
 
     public ShellyManagerCache() {
diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java
index ea6dbbbfe92..ca1ca3a92c4 100644
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java
@@ -457,7 +457,7 @@ public class ShellyManagerPage {
             // no files available for this device type
             logger.info("{}: No firmware files found for device type {}", LOG_PREFIX, deviceType);
             list = new FwArchList();
-            list.versions = new ArrayList<FwArchEntry>();
+            list.versions = new ArrayList<>();
         } else {
             // Create selection list
             json = "{" + json.replace("[{", "\"versions\":[{") + "}"; // make it a named array
diff --git a/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java b/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java
index 8458f57ca2b..7f1e293a6b9 100644
--- a/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java
+++ b/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java
@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.measure.quantity.ElectricCurrent;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.jupiter.api.Test;
@@ -269,8 +267,7 @@ public class TestRdsData {
             assertNotNull(celsius);
             assertEquals(18.55, celsius.floatValue(), 0.01);
 
-            assertEquals(new QuantityType<ElectricCurrent>(0, Units.AMPERE),
-                    dataPoints.getPointByClass("'HDevElLd").getState());
+            assertEquals(new QuantityType<>(0, Units.AMPERE), dataPoints.getPointByClass("'HDevElLd").getState());
 
             state = dataPoints.getPointByClass("'SpHPcf").getState();
             assertTrue(state instanceof QuantityType<?>);
diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/connectors/ConnectorBase.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/connectors/ConnectorBase.java
index 7eb20125961..fe326affa00 100644
--- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/connectors/ConnectorBase.java
+++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/connectors/ConnectorBase.java
@@ -119,7 +119,7 @@ public abstract class ConnectorBase<T> implements IMeterReaderConnector<T> {
 
     @Override
     public Publisher<T> getMeterValues(byte @Nullable [] initMessage, Duration period, ExecutorService executor) {
-        Flowable<T> itemPublisher = Flowable.<T> create((emitter) -> {
+        Flowable<T> itemPublisher = Flowable.create((emitter) -> {
             emitValues(initMessage, emitter);
         }, BackpressureStrategy.DROP);
 
diff --git a/bundles/org.openhab.binding.smartmeter/src/test/java/org/openhab/binding/smartmeter/TestMeterReading.java b/bundles/org.openhab.binding.smartmeter/src/test/java/org/openhab/binding/smartmeter/TestMeterReading.java
index 4809788f1ec..5f3acee9588 100644
--- a/bundles/org.openhab.binding.smartmeter/src/test/java/org/openhab/binding/smartmeter/TestMeterReading.java
+++ b/bundles/org.openhab.binding.smartmeter/src/test/java/org/openhab/binding/smartmeter/TestMeterReading.java
@@ -136,8 +136,7 @@ public class TestMeterReading {
     }
 
     MeterDevice<Object> getMeterDevice(ConnectorBase<Object> connector) {
-        return new MeterDevice<Object>(() -> mock(SerialPortManager.class), "id", "port", null, 9600, 0,
-                ProtocolMode.SML) {
+        return new MeterDevice<>(() -> mock(SerialPortManager.class), "id", "port", null, 9600, 0, ProtocolMode.SML) {
 
             @Override
             protected @NonNull IMeterReaderConnector<Object> createConnector(
diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java
index 3f665134489..415812ffa20 100644
--- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java
+++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/SmartthingsServlet.java
@@ -65,7 +65,7 @@ public class SmartthingsServlet extends HttpServlet {
             return;
         }
         try {
-            Dictionary<String, String> servletParams = new Hashtable<String, String>();
+            Dictionary<String, String> servletParams = new Hashtable<>();
             httpService.registerServlet(PATH, this, servletParams, httpService.createDefaultHttpContext());
         } catch (ServletException | NamespaceException e) {
             logger.warn("Could not start Smartthings servlet service: {}", e.getMessage());
@@ -133,7 +133,7 @@ public class SmartthingsServlet extends HttpServlet {
                 break;
             case "error":
                 // This is an error message from smartthings
-                Map<String, String> map = new HashMap<String, String>();
+                Map<String, String> map = new HashMap<>();
                 map = gson.fromJson(s, map.getClass());
                 logger.warn("Error message from Smartthings: {}", map.get("message"));
                 break;
@@ -162,7 +162,7 @@ public class SmartthingsServlet extends HttpServlet {
     }
 
     private void publishEvent(String topic, String name, String data) {
-        Dictionary<String, String> props = new Hashtable<String, String>();
+        Dictionary<String, String> props = new Hashtable<>();
         props.put(name, data);
         Event event = new Event(topic, props);
         if (eventAdmin != null) {
diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsBridgeHandler.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsBridgeHandler.java
index cd34a97fbd1..ee80f72e7c3 100644
--- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsBridgeHandler.java
+++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsBridgeHandler.java
@@ -106,7 +106,7 @@ public class SmartthingsBridgeHandler extends ConfigStatusBridgeHandler {
 
     @Override
     public Collection<ConfigStatusMessage> getConfigStatus() {
-        Collection<ConfigStatusMessage> configStatusMessages = new LinkedList<ConfigStatusMessage>();
+        Collection<ConfigStatusMessage> configStatusMessages = new LinkedList<>();
 
         // The IP must be provided
         String ip = config.smartthingsIp;
diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsThingHandler.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsThingHandler.java
index ab9044904b8..a259be985d6 100644
--- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsThingHandler.java
+++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/handler/SmartthingsThingHandler.java
@@ -54,7 +54,7 @@ public class SmartthingsThingHandler extends ConfigStatusThingHandler {
     private String smartthingsName;
     private int timeout;
     private SmartthingsHandlerFactory smartthingsHandlerFactory;
-    private Map<ChannelUID, SmartthingsConverter> converters = new HashMap<ChannelUID, SmartthingsConverter>();
+    private Map<ChannelUID, SmartthingsConverter> converters = new HashMap<>();
 
     private final String smartthingsConverterName = "smartthings-converter";
 
@@ -243,7 +243,7 @@ public class SmartthingsThingHandler extends ConfigStatusThingHandler {
 
     @Override
     public Collection<ConfigStatusMessage> getConfigStatus() {
-        Collection<ConfigStatusMessage> configStatusMessages = new LinkedList<ConfigStatusMessage>();
+        Collection<ConfigStatusMessage> configStatusMessages = new LinkedList<>();
 
         // The name must be provided
         String stName = config.smartthingsName;
diff --git a/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/MessageReader.java b/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/MessageReader.java
index ec64cc1c248..3c5e52e56c4 100644
--- a/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/MessageReader.java
+++ b/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/MessageReader.java
@@ -50,7 +50,7 @@ public class MessageReader extends Thread {
         if (this.modem.getStatus() == Status.Started) {
             try {
                 this.modem.getModemDriver().lock();
-                ArrayList<InboundMessage> messageList = new ArrayList<InboundMessage>();
+                ArrayList<InboundMessage> messageList = new ArrayList<>();
                 try {
                     for (int i = 0; i < (this.modem.getModemDriver().getMemoryLocations().length() / 2); i++) {
                         String memLocation = this.modem.getModemDriver().getMemoryLocations().substring((i * 2),
diff --git a/bundles/org.openhab.binding.smsmodem/src/main/java/org/openhab/binding/smsmodem/internal/handler/SMSModemBridgeHandler.java b/bundles/org.openhab.binding.smsmodem/src/main/java/org/openhab/binding/smsmodem/internal/handler/SMSModemBridgeHandler.java
index 85fd97e298a..db5e16ea5a6 100644
--- a/bundles/org.openhab.binding.smsmodem/src/main/java/org/openhab/binding/smsmodem/internal/handler/SMSModemBridgeHandler.java
+++ b/bundles/org.openhab.binding.smsmodem/src/main/java/org/openhab/binding/smsmodem/internal/handler/SMSModemBridgeHandler.java
@@ -91,7 +91,7 @@ public class SMSModemBridgeHandler extends BaseBridgeHandler
     private @Nullable ScheduledFuture<?> checkScheduled;
 
     // we keep a list of msisdn sender for autodiscovery
-    private Set<String> senderMsisdn = new HashSet<String>();
+    private Set<String> senderMsisdn = new HashSet<>();
     private @Nullable SMSConversationDiscoveryService discoveryService;
 
     private boolean shouldRun = false;
diff --git a/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/discovery/SncfDiscoveryService.java b/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/discovery/SncfDiscoveryService.java
index 4663bedb96b..5663a43b16d 100644
--- a/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/discovery/SncfDiscoveryService.java
+++ b/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/discovery/SncfDiscoveryService.java
@@ -72,7 +72,7 @@ public class SncfDiscoveryService extends AbstractThingHandlerDiscoveryService<S
                 if (places != null && !places.isEmpty()) {
                     places.forEach(place -> {
                         // stop_point:SNCF:87386573:Bus
-                        List<String> idElts = new LinkedList<String>(Arrays.asList(place.id.split(":")));
+                        List<String> idElts = new LinkedList<>(Arrays.asList(place.id.split(":")));
                         idElts.remove(0);
                         idElts.remove(0);
                         thingDiscovered(DiscoveryResultBuilder
diff --git a/bundles/org.openhab.binding.solarmax/src/test/java/org/openhab/binding/solarmax/internal/connector/SolarmaxConnectorFindCommands.java b/bundles/org.openhab.binding.solarmax/src/test/java/org/openhab/binding/solarmax/internal/connector/SolarmaxConnectorFindCommands.java
index 4e590f1b376..5a61aed9f6d 100644
--- a/bundles/org.openhab.binding.solarmax/src/test/java/org/openhab/binding/solarmax/internal/connector/SolarmaxConnectorFindCommands.java
+++ b/bundles/org.openhab.binding.solarmax/src/test/java/org/openhab/binding/solarmax/internal/connector/SolarmaxConnectorFindCommands.java
@@ -48,7 +48,7 @@ public class SolarmaxConnectorFindCommands {
     @Test
     public void testForCommands() throws UnknownHostException, SolarMaxException {
         List<String> validCommands = new ArrayList<>();
-        List<String> commandsToCheck = new ArrayList<String>();
+        List<String> commandsToCheck = new ArrayList<>();
         List<String> failedCommands = new ArrayList<>();
         int failedCommandRetry = 0;
         String lastFailedCommand = "";
@@ -123,7 +123,7 @@ public class SolarmaxConnectorFindCommands {
 
     private boolean checkIsValidCommand(String command)
             throws InterruptedException, UnknownHostException, SolarMaxException {
-        List<String> commands = new ArrayList<String>();
+        List<String> commands = new ArrayList<>();
         commands.add(command);
 
         Map<String, @Nullable String> responseMap = null;
diff --git a/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxLocalAccessHandler.java b/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxLocalAccessHandler.java
index be7abd3cb2b..94b418f3651 100644
--- a/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxLocalAccessHandler.java
+++ b/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxLocalAccessHandler.java
@@ -69,7 +69,7 @@ public class SolaxLocalAccessHandler extends BaseThingHandler {
 
     private boolean alreadyRemovedUnsupportedChannels;
 
-    private final Set<String> unsupportedExistingChannels = new HashSet<String>();
+    private final Set<String> unsupportedExistingChannels = new HashSet<>();
 
     private final ReentrantLock retrieveDataCallLock = new ReentrantLock();
 
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
index b3ece7e5782..0b1a79dce15 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
@@ -121,7 +121,7 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
     private @Nullable ScheduledFuture<?> loginFuture;
 
     // List of futures used for command retries
-    private Collection<ScheduledFuture<?>> retryFutures = new ConcurrentLinkedQueue<ScheduledFuture<?>>();
+    private Collection<ScheduledFuture<?>> retryFutures = new ConcurrentLinkedQueue<>();
 
     /**
      * List of executions
diff --git a/bundles/org.openhab.binding.sonnen/src/main/java/org/openhab/binding/sonnen/internal/SonnenHandler.java b/bundles/org.openhab.binding.sonnen/src/main/java/org/openhab/binding/sonnen/internal/SonnenHandler.java
index aadbefd9e4c..ae27263f04c 100644
--- a/bundles/org.openhab.binding.sonnen/src/main/java/org/openhab/binding/sonnen/internal/SonnenHandler.java
+++ b/bundles/org.openhab.binding.sonnen/src/main/java/org/openhab/binding/sonnen/internal/SonnenHandler.java
@@ -19,10 +19,6 @@ import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Energy;
-import javax.measure.quantity.Power;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonnen.internal.communication.SonnenJSONCommunication;
@@ -207,19 +203,19 @@ public class SonnenHandler extends BaseThingHandler {
             if (dataPM != null && dataPM.length >= 2) {
                 switch (channelId) {
                     case CHANNELENERGYIMPORTEDSTATEPRODUCTION:
-                        state = new QuantityType<Energy>(dataPM[0].getKwhImported(), Units.KILOWATT_HOUR);
+                        state = new QuantityType<>(dataPM[0].getKwhImported(), Units.KILOWATT_HOUR);
                         update(state, channelId);
                         break;
                     case CHANNELENERGYEXPORTEDSTATEPRODUCTION:
-                        state = new QuantityType<Energy>(dataPM[0].getKwhExported(), Units.KILOWATT_HOUR);
+                        state = new QuantityType<>(dataPM[0].getKwhExported(), Units.KILOWATT_HOUR);
                         update(state, channelId);
                         break;
                     case CHANNELENERGYIMPORTEDSTATECONSUMPTION:
-                        state = new QuantityType<Energy>(dataPM[1].getKwhImported(), Units.KILOWATT_HOUR);
+                        state = new QuantityType<>(dataPM[1].getKwhImported(), Units.KILOWATT_HOUR);
                         update(state, channelId);
                         break;
                     case CHANNELENERGYEXPORTEDSTATECONSUMPTION:
-                        state = new QuantityType<Energy>(dataPM[1].getKwhExported(), Units.KILOWATT_HOUR);
+                        state = new QuantityType<>(dataPM[1].getKwhExported(), Units.KILOWATT_HOUR);
                         update(state, channelId);
                         break;
                 }
@@ -234,34 +230,34 @@ public class SonnenHandler extends BaseThingHandler {
                         update(OnOffType.from(data.isBatteryCharging()), channelId);
                         break;
                     case CHANNELCONSUMPTION:
-                        state = new QuantityType<Power>(data.getConsumptionHouse(), Units.WATT);
+                        state = new QuantityType<>(data.getConsumptionHouse(), Units.WATT);
                         update(state, channelId);
                         break;
                     case CHANNELBATTERYDISCHARGING:
-                        state = new QuantityType<Power>(data.getbatteryCurrent() > 0 ? data.getbatteryCurrent() : 0,
+                        state = new QuantityType<>(data.getbatteryCurrent() > 0 ? data.getbatteryCurrent() : 0,
                                 Units.WATT);
                         update(state, channelId);
                         break;
                     case CHANNELBATTERYCHARGING:
-                        state = new QuantityType<Power>(
-                                data.getbatteryCurrent() <= 0 ? (data.getbatteryCurrent() * -1) : 0, Units.WATT);
+                        state = new QuantityType<>(data.getbatteryCurrent() <= 0 ? (data.getbatteryCurrent() * -1) : 0,
+                                Units.WATT);
                         update(state, channelId);
                         break;
                     case CHANNELGRIDFEEDIN:
-                        state = new QuantityType<Power>(data.getGridValue() > 0 ? data.getGridValue() : 0, Units.WATT);
+                        state = new QuantityType<>(data.getGridValue() > 0 ? data.getGridValue() : 0, Units.WATT);
                         update(state, channelId);
                         break;
                     case CHANNELGRIDCONSUMPTION:
-                        state = new QuantityType<Power>(data.getGridValue() <= 0 ? (data.getGridValue() * -1) : 0,
+                        state = new QuantityType<>(data.getGridValue() <= 0 ? (data.getGridValue() * -1) : 0,
                                 Units.WATT);
                         update(state, channelId);
                         break;
                     case CHANNELSOLARPRODUCTION:
-                        state = new QuantityType<Power>(data.getSolarProduction(), Units.WATT);
+                        state = new QuantityType<>(data.getSolarProduction(), Units.WATT);
                         update(state, channelId);
                         break;
                     case CHANNELBATTERYLEVEL:
-                        state = new QuantityType<Dimensionless>(data.getBatteryChargingLevel(), Units.PERCENT);
+                        state = new QuantityType<>(data.getBatteryChargingLevel(), Units.PERCENT);
                         update(state, channelId);
                         break;
                     case CHANNELFLOWCONSUMPTIONBATTERYSTATE:
diff --git a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/dto/SurePetcareBaseObject.java b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/dto/SurePetcareBaseObject.java
index 58acb409bd5..d429360b974 100644
--- a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/dto/SurePetcareBaseObject.java
+++ b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/dto/SurePetcareBaseObject.java
@@ -32,7 +32,7 @@ public class SurePetcareBaseObject {
     public ZonedDateTime updatedAt = ZonedDateTime.now();
 
     public Map<String, String> getThingProperties() {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("id", id.toString());
         properties.put("version", version);
         properties.put("createdAt", createdAt.toString());
diff --git a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareDeviceHandler.java b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareDeviceHandler.java
index caa5d1085de..6d3ca78f16a 100644
--- a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareDeviceHandler.java
+++ b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareDeviceHandler.java
@@ -19,8 +19,6 @@ import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.List;
 
-import javax.measure.quantity.Mass;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.surepetcare.internal.SurePetcareAPIHelper;
 import org.openhab.binding.surepetcare.internal.SurePetcareApiException;
@@ -154,18 +152,18 @@ public class SurePetcareDeviceHandler extends SurePetcareBaseObjectHandler {
                         if (bowlId == BOWL_ID_ONE_BOWL_USED) {
                             updateState(DEVICE_CHANNEL_BOWLS_FOOD,
                                     new StringType(bowlSettings.get(0).foodId.toString()));
-                            updateState(DEVICE_CHANNEL_BOWLS_TARGET, new QuantityType<Mass>(
+                            updateState(DEVICE_CHANNEL_BOWLS_TARGET, new QuantityType<>(
                                     device.control.bowls.bowlSettings.get(0).targetId, SIUnits.GRAM));
                         } else if (bowlId == BOWL_ID_TWO_BOWLS_USED) {
                             updateState(DEVICE_CHANNEL_BOWLS_FOOD_LEFT,
                                     new StringType(bowlSettings.get(0).foodId.toString()));
                             updateState(DEVICE_CHANNEL_BOWLS_TARGET_LEFT,
-                                    new QuantityType<Mass>(bowlSettings.get(0).targetId, SIUnits.GRAM));
+                                    new QuantityType<>(bowlSettings.get(0).targetId, SIUnits.GRAM));
                             if (numBowls > 1) {
                                 updateState(DEVICE_CHANNEL_BOWLS_FOOD_RIGHT,
                                         new StringType(bowlSettings.get(1).foodId.toString()));
                                 updateState(DEVICE_CHANNEL_BOWLS_TARGET_RIGHT,
-                                        new QuantityType<Mass>(bowlSettings.get(1).targetId, SIUnits.GRAM));
+                                        new QuantityType<>(bowlSettings.get(1).targetId, SIUnits.GRAM));
                             }
                         }
                     }
diff --git a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcarePetHandler.java b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcarePetHandler.java
index 184717010ee..6c1678696e4 100644
--- a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcarePetHandler.java
+++ b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcarePetHandler.java
@@ -18,8 +18,6 @@ import java.io.IOException;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
-import javax.measure.quantity.Mass;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.surepetcare.internal.SurePetcareAPIHelper;
@@ -183,7 +181,7 @@ public class SurePetcarePetHandler extends SurePetcareBaseObjectHandler {
                 updateState(PET_CHANNEL_DATE_OF_BIRTH, pet.dateOfBirth == null ? UnDefType.UNDEF
                         : new DateTimeType(pet.dateOfBirth.atStartOfDay(ZoneId.systemDefault())));
                 updateState(PET_CHANNEL_WEIGHT,
-                        pet.weight == null ? UnDefType.UNDEF : new QuantityType<Mass>(pet.weight, SIUnits.KILOGRAM));
+                        pet.weight == null ? UnDefType.UNDEF : new QuantityType<>(pet.weight, SIUnits.KILOGRAM));
                 if (pet.tagId != null) {
                     SurePetcareTag tag = petcareAPI.getTag(pet.tagId.toString());
                     if (tag != null) {
@@ -200,13 +198,13 @@ public class SurePetcarePetHandler extends SurePetcareBaseObjectHandler {
                         if (numBowls > 0) {
                             if (bowlId == BOWL_ID_ONE_BOWL_USED) {
                                 updateState(PET_CHANNEL_FEEDER_LAST_CHANGE,
-                                        new QuantityType<Mass>(feeding.feedChange.get(0), SIUnits.GRAM));
+                                        new QuantityType<>(feeding.feedChange.get(0), SIUnits.GRAM));
                             } else if (bowlId == BOWL_ID_TWO_BOWLS_USED) {
                                 updateState(PET_CHANNEL_FEEDER_LAST_CHANGE_LEFT,
-                                        new QuantityType<Mass>(feeding.feedChange.get(0), SIUnits.GRAM));
+                                        new QuantityType<>(feeding.feedChange.get(0), SIUnits.GRAM));
                                 if (numBowls > 1) {
                                     updateState(PET_CHANNEL_FEEDER_LAST_CHANGE_RIGHT,
-                                            new QuantityType<Mass>(feeding.feedChange.get(1), SIUnits.GRAM));
+                                            new QuantityType<>(feeding.feedChange.get(1), SIUnits.GRAM));
                                 }
                             }
                         }
diff --git a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandAlarmSensorHandler.java b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandAlarmSensorHandler.java
index 5f571d3e377..7a7825652bf 100644
--- a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandAlarmSensorHandler.java
+++ b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandAlarmSensorHandler.java
@@ -16,9 +16,6 @@ import static org.openhab.binding.touchwand.internal.TouchWandBindingConstants.*
 
 import java.util.ArrayList;
 
-import javax.measure.quantity.Illuminance;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.touchwand.internal.dto.TouchWandAlarmSensorCurrentStatus.BinarySensorEvent;
 import org.openhab.binding.touchwand.internal.dto.TouchWandAlarmSensorCurrentStatus.Sensor;
@@ -89,7 +86,7 @@ public class TouchWandAlarmSensorHandler extends TouchWandBaseUnitHandler {
     void updateIllumination(TouchWandUnitDataAlarmSensor unitData) {
         for (Sensor sensor : unitData.getCurrStatus().getSensorsStatus()) {
             if (sensor.type == SENSOR_TYPE_LUMINANCE) {
-                updateState(CHANNEL_ILLUMINATION, new QuantityType<Illuminance>(sensor.value, Units.LUX));
+                updateState(CHANNEL_ILLUMINATION, new QuantityType<>(sensor.value, Units.LUX));
             }
         }
     }
@@ -126,7 +123,7 @@ public class TouchWandAlarmSensorHandler extends TouchWandBaseUnitHandler {
     void updateChannelTemperature(TouchWandUnitDataAlarmSensor unitData) {
         for (Sensor sensor : unitData.getCurrStatus().getSensorsStatus()) {
             if (sensor.type == SENSOR_TYPE_TEMPERATURE) {
-                updateState(CHANNEL_TEMPERATURE, new QuantityType<Temperature>(sensor.value, SIUnits.CELSIUS));
+                updateState(CHANNEL_TEMPERATURE, new QuantityType<>(sensor.value, SIUnits.CELSIUS));
             }
         }
     }
diff --git a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandRestClient.java b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandRestClient.java
index 958a1cb925d..f64eb7ce596 100644
--- a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandRestClient.java
+++ b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandRestClient.java
@@ -76,7 +76,7 @@ public class TouchWandRestClient {
 
     private static final int REQUEST_TIMEOUT_SEC = 10;
 
-    private static final Map<String, String> COMMAND_MAP = new HashMap<String, String>();
+    private static final Map<String, String> COMMAND_MAP = new HashMap<>();
     static {
         COMMAND_MAP.put(CMD_LOGIN, "/auth/login?");
         COMMAND_MAP.put(CMD_LIST_UNITS, "/units/listUnits");
diff --git a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandThermostatHandler.java b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandThermostatHandler.java
index e2b85fd1eec..02ac0e7d3c2 100644
--- a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandThermostatHandler.java
+++ b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandThermostatHandler.java
@@ -96,13 +96,13 @@ public class TouchWandThermostatHandler extends TouchWandBaseUnitHandler {
 
     void updateTargetTemperature(TouchWandThermostatUnitData unitData) {
         int targetTemperature = unitData.getCurrStatus().getTargetTemperature();
-        QuantityType<Temperature> temperatureValue = new QuantityType<Temperature>(targetTemperature, SIUnits.CELSIUS);
+        QuantityType<Temperature> temperatureValue = new QuantityType<>(targetTemperature, SIUnits.CELSIUS);
         updateState(CHANNEL_THERMOSTAT_TARGET_TEMPERATURE, temperatureValue);
     }
 
     void updateRoomTemperature(TouchWandThermostatUnitData unitData) {
         int roomTemperature = unitData.getCurrStatus().getRoomTemperature();
-        QuantityType<Temperature> temperatureValue = new QuantityType<Temperature>(roomTemperature, SIUnits.CELSIUS);
+        QuantityType<Temperature> temperatureValue = new QuantityType<>(roomTemperature, SIUnits.CELSIUS);
         updateState(CHANNEL_THERMOSTAT_ROOM_TEMPERATURE, temperatureValue);
     }
 
diff --git a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/dto/TouchWandAlarmSensorCurrentStatus.java b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/dto/TouchWandAlarmSensorCurrentStatus.java
index a9a9d4d8b31..06a19af7a63 100644
--- a/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/dto/TouchWandAlarmSensorCurrentStatus.java
+++ b/bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/dto/TouchWandAlarmSensorCurrentStatus.java
@@ -28,9 +28,9 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 public class TouchWandAlarmSensorCurrentStatus {
 
     private int batt;
-    private List<Sensor> sensorsStatus = new ArrayList<Sensor>();
-    private List<AlarmEvent> alarmsStatus = new ArrayList<AlarmEvent>();
-    private List<BinarySensorEvent> bSensorsStatus = new ArrayList<BinarySensorEvent>();
+    private List<Sensor> sensorsStatus = new ArrayList<>();
+    private List<AlarmEvent> alarmsStatus = new ArrayList<>();
+    private List<BinarySensorEvent> bSensorsStatus = new ArrayList<>();
 
     public void setBatt(Integer batt) {
         this.batt = batt;
diff --git a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java
index a63d32f9030..78262320952 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java
+++ b/bundles/org.openhab.binding.tradfri/src/main/java/org/openhab/binding/tradfri/internal/model/TradfriAirPurifierData.java
@@ -14,7 +14,6 @@ package org.openhab.binding.tradfri.internal.model;
 
 import static org.openhab.binding.tradfri.internal.TradfriBindingConstants.*;
 
-import javax.measure.quantity.Dimensionless;
 import javax.measure.quantity.Time;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -123,7 +122,7 @@ public class TradfriAirPurifierData extends TradfriDeviceData {
         if (airQuality != null) {
             int pm25InPpm = airQuality.getAsInt();
             if (pm25InPpm != AIR_PURIFIER_AIR_QUALITY_UNDEFINED) {
-                return new QuantityType<Dimensionless>(pm25InPpm, Units.PARTS_PER_MILLION);
+                return new QuantityType<>(pm25InPpm, Units.PARTS_PER_MILLION);
             } else {
                 return UnDefType.UNDEF;
             }
@@ -157,7 +156,7 @@ public class TradfriAirPurifierData extends TradfriDeviceData {
         JsonElement nextFilterCheckTTL = attributes.get(NEXT_FILTER_CHECK);
         if (nextFilterCheckTTL != null) {
             int remainingMinutes = nextFilterCheckTTL.getAsInt();
-            return new QuantityType<Time>(remainingMinutes, Units.MINUTE);
+            return new QuantityType<>(remainingMinutes, Units.MINUTE);
         } else {
             return null;
         }
@@ -177,7 +176,7 @@ public class TradfriAirPurifierData extends TradfriDeviceData {
         JsonElement filterUptime = attributes.get(FILTER_UPTIME);
         if (filterUptime != null) {
             int filterUptimeMinutes = filterUptime.getAsInt();
-            return new QuantityType<Time>(filterUptimeMinutes, Units.MINUTE);
+            return new QuantityType<>(filterUptimeMinutes, Units.MINUTE);
         } else {
             return null;
         }
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/UpnpControlHandlerFactory.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/UpnpControlHandlerFactory.java
index 75a8f1f6e99..dc020a30c97 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/UpnpControlHandlerFactory.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/UpnpControlHandlerFactory.java
@@ -227,7 +227,7 @@ public class UpnpControlHandlerFactory extends BaseThingHandlerFactory implement
             UpnpAudioSink audioSink = new UpnpAudioSink(handler, audioHTTPServer, callbackUrl);
             @SuppressWarnings("unchecked")
             ServiceRegistration<AudioSink> reg = (ServiceRegistration<AudioSink>) bundleContext
-                    .registerService(AudioSink.class.getName(), audioSink, new Hashtable<String, Object>());
+                    .registerService(AudioSink.class.getName(), audioSink, new Hashtable<>());
             Thing thing = handler.getThing();
             audioSinkRegistrations.put(thing.getUID().toString(), reg);
             logger.debug("Audio sink added for media renderer {}", thing.getLabel());
@@ -236,7 +236,7 @@ public class UpnpControlHandlerFactory extends BaseThingHandlerFactory implement
                     callbackUrl);
             @SuppressWarnings("unchecked")
             ServiceRegistration<AudioSink> notificationReg = (ServiceRegistration<AudioSink>) bundleContext
-                    .registerService(AudioSink.class.getName(), notificationAudioSink, new Hashtable<String, Object>());
+                    .registerService(AudioSink.class.getName(), notificationAudioSink, new Hashtable<>());
             audioSinkRegistrations.put(thing.getUID().toString() + NOTIFICATION_AUDIOSINK_EXTENSION, notificationReg);
             logger.debug("Notification audio sink added for media renderer {}", thing.getLabel());
         }
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpHandler.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpHandler.java
index f3f06b028b0..1c16a74dd3f 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpHandler.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpHandler.java
@@ -316,11 +316,11 @@ public abstract class UpnpHandler extends BaseThingHandler implements UpnpIOPart
         }
 
         // Set new futures, so we don't try to use service when connection id's are not known yet
-        isConnectionIdSet = new CompletableFuture<Boolean>();
-        isAvTransportIdSet = new CompletableFuture<Boolean>();
-        isRcsIdSet = new CompletableFuture<Boolean>();
+        isConnectionIdSet = new CompletableFuture<>();
+        isAvTransportIdSet = new CompletableFuture<>();
+        isRcsIdSet = new CompletableFuture<>();
 
-        HashMap<String, String> inputs = new HashMap<String, String>();
+        HashMap<String, String> inputs = new HashMap<>();
         inputs.put("RemoteProtocolInfo", remoteProtocolInfo);
         inputs.put("PeerConnectionManager", peerConnectionManager);
         inputs.put("PeerConnectionID", Integer.toString(peerConnectionId));
@@ -363,8 +363,8 @@ public abstract class UpnpHandler extends BaseThingHandler implements UpnpIOPart
         }
 
         // Set new futures, so we don't try to use service when connection id's are not known yet
-        isAvTransportIdSet = new CompletableFuture<Boolean>();
-        isRcsIdSet = new CompletableFuture<Boolean>();
+        isAvTransportIdSet = new CompletableFuture<>();
+        isRcsIdSet = new CompletableFuture<>();
 
         // ConnectionID will default to 0 if not set through prepareForConnection method
         Map<String, String> inputs = Map.of(CONNECTION_ID, Integer.toString(connectionId));
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java
index 993d95abb44..c4e45df49d6 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java
@@ -312,8 +312,8 @@ public class UpnpRendererHandler extends UpnpHandler {
             if (stopping != null) {
                 stopping.complete(false);
             }
-            isStopping = new CompletableFuture<Boolean>(); // set this so we can check if stop confirmation has been
-                                                           // received
+            isStopping = new CompletableFuture<>(); // set this so we can check if stop confirmation has been
+                                                    // received
         }
 
         Map<String, String> inputs = Map.of(INSTANCE_ID, Integer.toString(avTransportId));
@@ -421,8 +421,8 @@ public class UpnpRendererHandler extends UpnpHandler {
             if (settingURI != null) {
                 settingURI.complete(false);
             }
-            isSettingURI = new CompletableFuture<Boolean>(); // set this so we don't start playing when not finished
-                                                             // setting URI
+            isSettingURI = new CompletableFuture<>(); // set this so we don't start playing when not finished
+                                                      // setting URI
         } else {
             logger.debug("New URI {} is same as previous on renderer {}", nowPlayingUri, thing.getLabel());
         }
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpServerHandler.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpServerHandler.java
index ef77e12a017..343184cdf5a 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpServerHandler.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpServerHandler.java
@@ -216,7 +216,7 @@ public class UpnpServerHandler extends UpnpHandler {
         }
 
         if (browsed) {
-            isBrowsing = new CompletableFuture<Boolean>();
+            isBrowsing = new CompletableFuture<>();
 
             Map<String, String> inputs = new HashMap<>();
             inputs.put("ObjectID", objectID);
@@ -262,7 +262,7 @@ public class UpnpServerHandler extends UpnpHandler {
         }
 
         if (browsed) {
-            isBrowsing = new CompletableFuture<Boolean>();
+            isBrowsing = new CompletableFuture<>();
 
             Map<String, String> inputs = new HashMap<>();
             inputs.put("ContainerID", containerID);
@@ -687,7 +687,7 @@ public class UpnpServerHandler extends UpnpHandler {
                 updateTitleSelection(removeDuplicates(list));
             }
         } else {
-            updateTitleSelection(new ArrayList<UpnpEntry>());
+            updateTitleSelection(new ArrayList<>());
         }
         browseUp = false;
         if (browsing != null) {
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/queue/UpnpEntryQueue.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/queue/UpnpEntryQueue.java
index 41c8c0badcf..d78afc1acc9 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/queue/UpnpEntryQueue.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/queue/UpnpEntryQueue.java
@@ -132,7 +132,7 @@ public class UpnpEntryQueue {
         }
 
         // Shuffle the queue again
-        shuffledQueue = new ArrayList<UpnpEntry>(currentQueue);
+        shuffledQueue = new ArrayList<>(currentQueue);
         Collections.shuffle(shuffledQueue);
         if (current != null) {
             // Put the current entry at the beginning of the shuffled queue
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/services/UpnpRenderingControlConfiguration.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/services/UpnpRenderingControlConfiguration.java
index d6ca43a0d8d..4b26e78534f 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/services/UpnpRenderingControlConfiguration.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/services/UpnpRenderingControlConfiguration.java
@@ -58,7 +58,7 @@ public class UpnpRenderingControlConfiguration {
             mute = (rcService.getStateVariable("Mute") != null);
             loudness = (rcService.getStateVariable("Loudness") != null);
             if (rcService.getStateVariable("A_ARG_TYPE_Channel") != null) {
-                audioChannels = new HashSet<String>(Arrays
+                audioChannels = new HashSet<>(Arrays
                         .asList(rcService.getStateVariable("A_ARG_TYPE_Channel").getTypeDetails().getAllowedValues()));
             }
         }
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
index 603299e2caa..3f95a04a080 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
@@ -153,7 +153,7 @@ public class UpnpXMLParser {
 
     private static class AVTransportEventHandler extends DefaultHandler {
 
-        private final Map<String, String> changes = new HashMap<String, String>();
+        private final Map<String, String> changes = new HashMap<>();
 
         AVTransportEventHandler() {
             // shouldn't be used outside of this package.
@@ -202,7 +202,7 @@ public class UpnpXMLParser {
 
         // Maintain a set of elements it is not useful to complain about.
         // This list will be initialized on the first failure case.
-        private static List<String> ignore = new ArrayList<String>();
+        private static List<String> ignore = new ArrayList<>();
 
         private String id = "";
         private String refId = "";
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/test/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandlerTest.java b/bundles/org.openhab.binding.upnpcontrol/src/test/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandlerTest.java
index 9b8bfff02f6..893bc560a9c 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/test/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandlerTest.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/test/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandlerTest.java
@@ -365,7 +365,7 @@ public class UpnpRendererHandlerTest extends UpnpHandlerTest {
 
         // Register a media queue
         expectLastChangeOnSetAVTransportURI(true, 2);
-        List<UpnpEntry> startList = new ArrayList<UpnpEntry>();
+        List<UpnpEntry> startList = new ArrayList<>();
         startList.add(requireNonNull(upnpEntryQueue.get(2)));
         UpnpEntryQueue startQueue = new UpnpEntryQueue(startList, "54321");
         handler.registerQueue(requireNonNull(startQueue));
diff --git a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPTimerList.java b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPTimerList.java
index 0c9406199c0..915fa63ceda 100644
--- a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPTimerList.java
+++ b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPTimerList.java
@@ -26,7 +26,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 @NonNullByDefault
 public class SVDRPTimerList {
 
-    private List<String> timers = new ArrayList<String>();
+    private List<String> timers = new ArrayList<>();
 
     /**
      * parse object from SVDRP Client Response
@@ -36,7 +36,7 @@ public class SVDRPTimerList {
      */
     public static SVDRPTimerList parse(String message) {
         SVDRPTimerList timers = new SVDRPTimerList();
-        List<String> lines = new ArrayList<String>();
+        List<String> lines = new ArrayList<>();
 
         StringTokenizer st = new StringTokenizer(message, System.lineSeparator());
         while (st.hasMoreTokens()) {
diff --git a/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/VelbusPacketInputStream.java b/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/VelbusPacketInputStream.java
index eca99b0aa21..5987f861790 100644
--- a/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/VelbusPacketInputStream.java
+++ b/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/VelbusPacketInputStream.java
@@ -34,7 +34,7 @@ public class VelbusPacketInputStream {
 
     public InputStream inputStream;
 
-    private ArrayList<Byte> currentData = new ArrayList<Byte>();
+    private ArrayList<Byte> currentData = new ArrayList<>();
     private @Nullable Byte currentSTX = null;
     private @Nullable Byte currentPriority = null;
     private @Nullable Byte currentAddress = null;
diff --git a/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusSensorWithAlarmClockHandler.java b/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusSensorWithAlarmClockHandler.java
index 1e8af276f00..aadd8621dee 100644
--- a/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusSensorWithAlarmClockHandler.java
+++ b/bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusSensorWithAlarmClockHandler.java
@@ -49,7 +49,7 @@ public class VelbusSensorWithAlarmClockHandler extends VelbusSensorHandler {
     public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<>(Arrays.asList(THING_TYPE_VMB2PBN,
             THING_TYPE_VMB6PBN, THING_TYPE_VMB8PBU, THING_TYPE_VMBPIRC, THING_TYPE_VMBPIRM, THING_TYPE_VMBRFR8S,
             THING_TYPE_VMBVP1, THING_TYPE_VMBKP, THING_TYPE_VMBIN, THING_TYPE_VMB4PB));
-    private static final HashMap<ThingTypeUID, Integer> ALARM_CONFIGURATION_MEMORY_ADDRESSES = new HashMap<ThingTypeUID, Integer>();
+    private static final HashMap<ThingTypeUID, Integer> ALARM_CONFIGURATION_MEMORY_ADDRESSES = new HashMap<>();
 
     static {
         ALARM_CONFIGURATION_MEMORY_ADDRESSES.put(THING_TYPE_VMB2PBN, 0x0093);
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
index e5def170ec7..4f8d5a76050 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
@@ -49,7 +49,7 @@ public class VeluxRSBindingConfig extends VeluxBindingConfig {
     /**
      * The ascending sorted list of generic Objects indexed by an Integer
      */
-    private SortedMap<Integer, String> mapAscending = new TreeMap<>(new Comparator<Integer>() {
+    private SortedMap<Integer, String> mapAscending = new TreeMap<>(new Comparator<>() {
         @Override
         public int compare(Integer o1, Integer o2) {
             return o1.compareTo(o2);
@@ -58,7 +58,7 @@ public class VeluxRSBindingConfig extends VeluxBindingConfig {
     /**
      * The descending sorted list of generic Objects indexed by an Integer
      */
-    private SortedMap<Integer, String> mapDescending = new TreeMap<>(new Comparator<Integer>() {
+    private SortedMap<Integer, String> mapDescending = new TreeMap<>(new Comparator<>() {
         @Override
         public int compare(Integer o1, Integer o2) {
             return o2.compareTo(o1);
diff --git a/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java b/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java
index 7a0afcb4d03..a92e98cdaaf 100644
--- a/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java
+++ b/bundles/org.openhab.binding.venstarthermostat/src/main/java/org/openhab/binding/venstarthermostat/internal/handler/VenstarThermostatHandler.java
@@ -39,7 +39,6 @@ import java.util.concurrent.TimeoutException;
 
 import javax.measure.Quantity;
 import javax.measure.Unit;
-import javax.measure.quantity.Dimensionless;
 import javax.measure.quantity.Temperature;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -327,7 +326,7 @@ public class VenstarThermostatHandler extends ConfigStatusThingHandler {
         Optional<VenstarSensor> optSensor = sensorData.stream()
                 .filter(sensor -> "Thermostat".equalsIgnoreCase(sensor.getName())).findAny();
         if (optSensor.isPresent()) {
-            return new QuantityType<Temperature>(optSensor.get().getTemp(), unitSystem);
+            return new QuantityType<>(optSensor.get().getTemp(), unitSystem);
         }
 
         return UnDefType.UNDEF;
@@ -337,7 +336,7 @@ public class VenstarThermostatHandler extends ConfigStatusThingHandler {
         Optional<VenstarSensor> optSensor = sensorData.stream()
                 .filter(sensor -> "Thermostat".equalsIgnoreCase(sensor.getName())).findAny();
         if (optSensor.isPresent()) {
-            return new QuantityType<Dimensionless>(optSensor.get().getHum(), Units.PERCENT);
+            return new QuantityType<>(optSensor.get().getHum(), Units.PERCENT);
         }
 
         return UnDefType.UNDEF;
@@ -347,7 +346,7 @@ public class VenstarThermostatHandler extends ConfigStatusThingHandler {
         Optional<VenstarSensor> optSensor = sensorData.stream()
                 .filter(sensor -> "Outdoor".equalsIgnoreCase(sensor.getName())).findAny();
         if (optSensor.isPresent()) {
-            return new QuantityType<Temperature>(optSensor.get().getTemp(), unitSystem);
+            return new QuantityType<>(optSensor.get().getTemp(), unitSystem);
         }
 
         return UnDefType.UNDEF;
@@ -421,11 +420,11 @@ public class VenstarThermostatHandler extends ConfigStatusThingHandler {
     }
 
     private QuantityType<Temperature> getCoolingSetpoint() {
-        return new QuantityType<Temperature>(infoData.getCooltemp(), unitSystem);
+        return new QuantityType<>(infoData.getCooltemp(), unitSystem);
     }
 
     private QuantityType<Temperature> getHeatingSetpoint() {
-        return new QuantityType<Temperature>(infoData.getHeattemp(), unitSystem);
+        return new QuantityType<>(infoData.getHeattemp(), unitSystem);
     }
 
     private ZonedDateTime getTimestampRuntime(VenstarRuntime runtime) {
@@ -629,7 +628,7 @@ public class VenstarThermostatHandler extends ConfigStatusThingHandler {
         if (command instanceof QuantityType) {
             return (QuantityType<U>) command;
         }
-        return new QuantityType<U>(new BigDecimal(command.toString()), defaultUnit);
+        return new QuantityType<>(new BigDecimal(command.toString()), defaultUnit);
     }
 
     protected DecimalType commandToDecimalType(Command command) {
diff --git a/bundles/org.openhab.binding.ventaair/src/main/java/org/openhab/binding/ventaair/internal/VentaThingHandler.java b/bundles/org.openhab.binding.ventaair/src/main/java/org/openhab/binding/ventaair/internal/VentaThingHandler.java
index 0667c0f046d..bb47f972ce0 100644
--- a/bundles/org.openhab.binding.ventaair/src/main/java/org/openhab/binding/ventaair/internal/VentaThingHandler.java
+++ b/bundles/org.openhab.binding.ventaair/src/main/java/org/openhab/binding/ventaair/internal/VentaThingHandler.java
@@ -296,15 +296,15 @@ public class VentaThingHandler extends BaseThingHandler {
                 int discReplaceHours = info.getDiscIonT() * 5 / 60;
                 int cleaningHours = info.getCleaningT() * 5 / 60;
 
-                QuantityType<Time> opHoursState = new QuantityType<Time>(opHours, Units.HOUR);
+                QuantityType<Time> opHoursState = new QuantityType<>(opHours, Units.HOUR);
                 updateState(VentaAirBindingConstants.CHANNEL_OPERATION_TIME, opHoursState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_OPERATION_TIME, opHoursState);
 
-                QuantityType<Time> discReplaceHoursState = new QuantityType<Time>(2200 - discReplaceHours, Units.HOUR);
+                QuantityType<Time> discReplaceHoursState = new QuantityType<>(2200 - discReplaceHours, Units.HOUR);
                 updateState(VentaAirBindingConstants.CHANNEL_DISC_REPLACE_TIME, discReplaceHoursState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_DISC_REPLACE_TIME, discReplaceHoursState);
 
-                QuantityType<Time> cleaningHoursState = new QuantityType<Time>(4400 - cleaningHours, Units.HOUR);
+                QuantityType<Time> cleaningHoursState = new QuantityType<>(4400 - cleaningHours, Units.HOUR);
                 updateState(VentaAirBindingConstants.CHANNEL_CLEANING_TIME, cleaningHoursState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_CLEANING_TIME, cleaningHoursState);
 
@@ -312,11 +312,11 @@ public class VentaThingHandler extends BaseThingHandler {
                 updateState(VentaAirBindingConstants.CHANNEL_CLEAN_MODE, cleanModeState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_CLEAN_MODE, cleanModeState);
 
-                QuantityType<Time> timerTimePassedState = new QuantityType<Time>(info.getTimerT(), Units.MINUTE);
+                QuantityType<Time> timerTimePassedState = new QuantityType<>(info.getTimerT(), Units.MINUTE);
                 updateState(VentaAirBindingConstants.CHANNEL_TIMER_TIME_PASSED, timerTimePassedState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_TIMER_TIME_PASSED, timerTimePassedState);
 
-                QuantityType<Time> serviceTimeState = new QuantityType<Time>(info.getServiceT(), Units.MINUTE);
+                QuantityType<Time> serviceTimeState = new QuantityType<>(info.getServiceT(), Units.MINUTE);
                 updateState(VentaAirBindingConstants.CHANNEL_SERVICE_TIME, serviceTimeState);
                 channelValueCache.put(VentaAirBindingConstants.CHANNEL_SERVICE_TIME, serviceTimeState);
 
diff --git a/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/VerisureHandlerFactory.java b/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/VerisureHandlerFactory.java
index e50896f96ab..9ce5262b000 100644
--- a/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/VerisureHandlerFactory.java
+++ b/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/VerisureHandlerFactory.java
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 @Component(service = ThingHandlerFactory.class, configurationPid = "binding.verisure")
 public class VerisureHandlerFactory extends BaseThingHandlerFactory {
 
-    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<ThingTypeUID>();
+    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<>();
     static {
         SUPPORTED_THING_TYPES.addAll(VerisureBridgeHandler.SUPPORTED_THING_TYPES);
         SUPPORTED_THING_TYPES.addAll(VerisureAlarmThingHandler.SUPPORTED_THING_TYPES);
diff --git a/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureClimateDeviceThingHandler.java b/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureClimateDeviceThingHandler.java
index 51d61c738f7..e19f5efdc4c 100644
--- a/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureClimateDeviceThingHandler.java
+++ b/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureClimateDeviceThingHandler.java
@@ -18,9 +18,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.Temperature;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.verisure.internal.dto.VerisureBatteryStatusDTO;
 import org.openhab.binding.verisure.internal.dto.VerisureClimatesDTO;
@@ -46,7 +43,7 @@ import org.openhab.core.types.UnDefType;
 @NonNullByDefault
 public class VerisureClimateDeviceThingHandler extends VerisureThingHandler<VerisureClimatesDTO> {
 
-    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<ThingTypeUID>();
+    public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = new HashSet<>();
     static {
         SUPPORTED_THING_TYPES.add(THING_TYPE_SMOKEDETECTOR);
         SUPPORTED_THING_TYPES.add(THING_TYPE_WATERDETECTOR);
@@ -93,12 +90,12 @@ public class VerisureClimateDeviceThingHandler extends VerisureThingHandler<Veri
             case CHANNEL_TEMPERATURE:
                 if (climateList != null && !climateList.isEmpty()) {
                     double temperature = climateList.get(0).getTemperatureValue();
-                    return new QuantityType<Temperature>(temperature, SIUnits.CELSIUS);
+                    return new QuantityType<>(temperature, SIUnits.CELSIUS);
                 }
             case CHANNEL_HUMIDITY:
                 if (climateList != null && !climateList.isEmpty() && climateList.get(0).isHumidityEnabled()) {
                     double humidity = climateList.get(0).getHumidityValue();
-                    return new QuantityType<Dimensionless>(humidity, Units.PERCENT);
+                    return new QuantityType<>(humidity, Units.PERCENT);
                 }
             case CHANNEL_HUMIDITY_ENABLED:
                 if (climateList != null && !climateList.isEmpty()) {
diff --git a/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureMiceDetectionThingHandler.java b/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureMiceDetectionThingHandler.java
index 9ad0efb3d22..59ae1bc79b5 100644
--- a/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureMiceDetectionThingHandler.java
+++ b/bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/handler/VerisureMiceDetectionThingHandler.java
@@ -17,9 +17,6 @@ import static org.openhab.binding.verisure.internal.VerisureBindingConstants.*;
 import java.util.List;
 import java.util.Set;
 
-import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Time;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.verisure.internal.dto.VerisureMiceDetectionDTO;
 import org.openhab.binding.verisure.internal.dto.VerisureMiceDetectionDTO.Detection;
@@ -98,15 +95,15 @@ public class VerisureMiceDetectionThingHandler extends VerisureThingHandler<Veri
                 }
             case CHANNEL_DURATION_LATEST_DETECTION:
                 if (mouse.getDetections().isEmpty()) {
-                    return new QuantityType<Time>(0, Units.SECOND);
+                    return new QuantityType<>(0, Units.SECOND);
                 } else {
-                    return new QuantityType<Time>(mouse.getDetections().get(0).getDuration(), Units.SECOND);
+                    return new QuantityType<>(mouse.getDetections().get(0).getDuration(), Units.SECOND);
                 }
             case CHANNEL_DURATION_LAST_24_HOURS:
                 if (mouse.getDetections().isEmpty()) {
-                    return new QuantityType<Time>(0, Units.SECOND);
+                    return new QuantityType<>(0, Units.SECOND);
                 } else {
-                    return new QuantityType<Time>(mouse.getDetections().stream().mapToInt(Detection::getDuration).sum(),
+                    return new QuantityType<>(mouse.getDetections().stream().mapToInt(Detection::getDuration).sum(),
                             Units.SECOND);
                 }
             case CHANNEL_LOCATION:
@@ -115,7 +112,7 @@ public class VerisureMiceDetectionThingHandler extends VerisureThingHandler<Veri
             case CHANNEL_TEMPERATURE:
                 double temperature = miceDetectionJSON.getTemperatureValue();
                 return temperature != VerisureMiceDetectionDTO.UNDEFINED
-                        ? new QuantityType<Temperature>(temperature, SIUnits.CELSIUS)
+                        ? new QuantityType<>(temperature, SIUnits.CELSIUS)
                         : UnDefType.UNDEF;
         }
         return UnDefType.UNDEF;
diff --git a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/applist/VizioApps.java b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/applist/VizioApps.java
index 9aea9c4795b..4bf09de1d56 100644
--- a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/applist/VizioApps.java
+++ b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/applist/VizioApps.java
@@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName;
  */
 public class VizioApps {
     @SerializedName("Apps")
-    private List<VizioApp> apps = new ArrayList<VizioApp>();
+    private List<VizioApp> apps = new ArrayList<>();
 
     public List<VizioApp> getApps() {
         return apps;
diff --git a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/audio/Audio.java b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/audio/Audio.java
index d13e16301c6..4864cb34b43 100644
--- a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/audio/Audio.java
+++ b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/audio/Audio.java
@@ -30,7 +30,7 @@ public class Audio {
     @SerializedName("STATUS")
     private Status status;
     @SerializedName("HASHLIST")
-    private List<Long> hashlist = new ArrayList<Long>();
+    private List<Long> hashlist = new ArrayList<>();
     @SerializedName("GROUP")
     private String group;
     @SerializedName("NAME")
@@ -38,7 +38,7 @@ public class Audio {
     @SerializedName("PARAMETERS")
     private Parameters parameters;
     @SerializedName("ITEMS")
-    private List<ItemAudio> items = new ArrayList<ItemAudio>();
+    private List<ItemAudio> items = new ArrayList<>();
     @SerializedName("URI")
     private String uri;
     @SerializedName("CNAME")
diff --git a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/input/CurrentInput.java b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/input/CurrentInput.java
index 08b6782c11a..9825094f458 100644
--- a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/input/CurrentInput.java
+++ b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/input/CurrentInput.java
@@ -30,9 +30,9 @@ public class CurrentInput {
     @SerializedName("STATUS")
     private Status status;
     @SerializedName("ITEMS")
-    private List<ItemInput> items = new ArrayList<ItemInput>();
+    private List<ItemInput> items = new ArrayList<>();
     @SerializedName("HASHLIST")
-    private List<Long> hashlist = new ArrayList<Long>();
+    private List<Long> hashlist = new ArrayList<>();
     @SerializedName("URI")
     private String uri;
     @SerializedName("PARAMETERS")
diff --git a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/inputlist/InputList.java b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/inputlist/InputList.java
index 64d569d0220..b05ec45329f 100644
--- a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/inputlist/InputList.java
+++ b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/inputlist/InputList.java
@@ -31,7 +31,7 @@ public class InputList {
     @SerializedName("STATUS")
     private Status status;
     @SerializedName("HASHLIST")
-    private List<Long> hashlist = new ArrayList<Long>();
+    private List<Long> hashlist = new ArrayList<>();
     @SerializedName("GROUP")
     private String group;
     @SerializedName("NAME")
@@ -39,7 +39,7 @@ public class InputList {
     @SerializedName("PARAMETERS")
     private Parameters parameters;
     @SerializedName("ITEMS")
-    private List<Item> items = new ArrayList<Item>();
+    private List<Item> items = new ArrayList<>();
     @SerializedName("URI")
     private String uri;
     @SerializedName("CNAME")
diff --git a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/power/PowerMode.java b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/power/PowerMode.java
index 397774911c5..87162017dc5 100644
--- a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/power/PowerMode.java
+++ b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/dto/power/PowerMode.java
@@ -29,7 +29,7 @@ public class PowerMode {
     @SerializedName("STATUS")
     private Status status;
     @SerializedName("ITEMS")
-    private List<ItemPower> items = new ArrayList<ItemPower>();
+    private List<ItemPower> items = new ArrayList<>();
     @SerializedName("URI")
     private String uri;
 
diff --git a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/handler/VizioHandler.java b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/handler/VizioHandler.java
index db624aae13a..80539e26d5c 100644
--- a/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/handler/VizioHandler.java
+++ b/bundles/org.openhab.binding.vizio/src/main/java/org/openhab/binding/vizio/internal/handler/VizioHandler.java
@@ -83,7 +83,7 @@ public class VizioHandler extends BaseThingHandler {
     private @Nullable ScheduledFuture<?> metadataRefreshJob;
 
     private VizioCommunicator communicator;
-    private List<VizioApp> userConfigApps = new ArrayList<VizioApp>();
+    private List<VizioApp> userConfigApps = new ArrayList<>();
     private Object sequenceLock = new Object();
 
     private int pairingDeviceId = -1;
diff --git a/bundles/org.openhab.binding.warmup/src/main/java/org/openhab/binding/warmup/internal/discovery/WarmupDiscoveryService.java b/bundles/org.openhab.binding.warmup/src/main/java/org/openhab/binding/warmup/internal/discovery/WarmupDiscoveryService.java
index d4777623c63..f41a6152609 100644
--- a/bundles/org.openhab.binding.warmup/src/main/java/org/openhab/binding/warmup/internal/discovery/WarmupDiscoveryService.java
+++ b/bundles/org.openhab.binding.warmup/src/main/java/org/openhab/binding/warmup/internal/discovery/WarmupDiscoveryService.java
@@ -66,7 +66,7 @@ public class WarmupDiscoveryService extends AbstractThingHandlerDiscoveryService
     @Override
     public void refresh(@Nullable QueryResponseDTO domain) {
         if (domain != null) {
-            HashSet<ThingUID> discoveredThings = new HashSet<ThingUID>();
+            HashSet<ThingUID> discoveredThings = new HashSet<>();
             for (LocationDTO location : domain.getData().getUser().getLocations()) {
                 for (RoomDTO room : location.getRooms()) {
                     discoverRoom(location, room, discoveredThings);
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoPowerBank.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoPowerBank.java
index ac1841ada18..2c03450e482 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoPowerBank.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoPowerBank.java
@@ -30,7 +30,7 @@ import org.openhab.core.library.types.QuantityType;
 @NonNullByDefault
 public class WemoPowerBank {
 
-    private final Deque<CacheItem> slidingCache = new ConcurrentLinkedDeque<CacheItem>();
+    private final Deque<CacheItem> slidingCache = new ConcurrentLinkedDeque<>();
 
     @Nullable
     private QuantityType<?> previousCurrentPower = null;
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoUtil.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoUtil.java
index 03b9724c51f..2ab045410da 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoUtil.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoUtil.java
@@ -121,7 +121,7 @@ public class WemoUtil {
     }
 
     private static Map<String, String> buildBuiltinXMLEntityMap() {
-        Map<String, String> entities = new HashMap<String, String>(10);
+        Map<String, String> entities = new HashMap<>(10);
         entities.put("lt", "<");
         entities.put("gt", ">");
         entities.put("amp", "&");
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoBaseThingHandler.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoBaseThingHandler.java
index 8565418c2ae..6fe48e7b637 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoBaseThingHandler.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoBaseThingHandler.java
@@ -57,7 +57,7 @@ public abstract class WemoBaseThingHandler extends BaseThingHandler implements U
     protected WemoHttpCall wemoHttpCaller;
 
     private @Nullable String host;
-    private Map<String, Instant> subscriptions = new ConcurrentHashMap<String, Instant>();
+    private Map<String, Instant> subscriptions = new ConcurrentHashMap<>();
 
     public WemoBaseThingHandler(Thing thing, UpnpIOService upnpIOService, WemoHttpCall wemoHttpCaller) {
         super(thing);
@@ -182,7 +182,7 @@ public abstract class WemoBaseThingHandler extends BaseThingHandler implements U
 
     private int scanForPort(String host) {
         Integer portFromService = getPortFromService();
-        List<Integer> portsToCheck = new ArrayList<Integer>(PORT_RANGE_END - PORT_RANGE_START + 1);
+        List<Integer> portsToCheck = new ArrayList<>(PORT_RANGE_END - PORT_RANGE_START + 1);
         Stream<Integer> portRange = IntStream.rangeClosed(PORT_RANGE_START, PORT_RANGE_END).boxed();
         if (portFromService != null) {
             portsToCheck.add(portFromService);
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoInsightHandler.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoInsightHandler.java
index 93207ca8193..ed8d6af9a1a 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoInsightHandler.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoInsightHandler.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 public class WemoInsightHandler extends WemoHandler {
 
     private final Logger logger = LoggerFactory.getLogger(WemoInsightHandler.class);
-    private final Map<String, String> stateMap = new ConcurrentHashMap<String, String>();
+    private final Map<String, String> stateMap = new ConcurrentHashMap<>();
 
     private WemoPowerBank wemoPowerBank = new WemoPowerBank();
     private int currentPowerSlidingSeconds;
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoMotionHandler.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoMotionHandler.java
index b7767db1e09..3ad8845d957 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoMotionHandler.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoMotionHandler.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 public class WemoMotionHandler extends WemoHandler {
 
     private final Logger logger = LoggerFactory.getLogger(WemoMotionHandler.class);
-    private final Map<String, String> stateMap = new ConcurrentHashMap<String, String>();
+    private final Map<String, String> stateMap = new ConcurrentHashMap<>();
 
     public WemoMotionHandler(Thing thing, UpnpIOService upnpIOService, WemoHttpCall wemoHttpCaller) {
         super(thing, upnpIOService, wemoHttpCaller);
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoSwitchHandler.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoSwitchHandler.java
index 7ece8575367..33e966d069d 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoSwitchHandler.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoSwitchHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 public class WemoSwitchHandler extends WemoHandler {
 
     private final Logger logger = LoggerFactory.getLogger(WemoSwitchHandler.class);
-    private final Map<String, String> stateMap = new ConcurrentHashMap<String, String>();
+    private final Map<String, String> stateMap = new ConcurrentHashMap<>();
 
     public WemoSwitchHandler(Thing thing, UpnpIOService upnpIOService, WemoHttpCall wemoHttpCaller) {
         super(thing, upnpIOService, wemoHttpCaller);
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandlerFactory.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandlerFactory.java
index b5b53ba9d9b..8b3fc96d399 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandlerFactory.java
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandlerFactory.java
@@ -42,7 +42,7 @@ import org.osgi.service.component.annotations.Reference;
 @Component(configurationPid = "binding.wlanthermo", service = ThingHandlerFactory.class)
 public class WlanThermoHandlerFactory extends BaseThingHandlerFactory {
 
-    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<ThingTypeUID>(
+    private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = new HashSet<>(
             Arrays.asList(WlanThermoBindingConstants.THING_TYPE_WLANTHERMO_NANO_V1,
                     WlanThermoBindingConstants.THING_TYPE_WLANTHERMO_MINI,
                     WlanThermoBindingConstants.THING_TYPE_WLANTHERMO_ESP32));
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/data/Pitmaster.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/data/Pitmaster.java
index 58b9fb85213..fedb2fb4f9d 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/data/Pitmaster.java
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/data/Pitmaster.java
@@ -28,10 +28,10 @@ public class Pitmaster {
 
     @SerializedName("type")
     @Expose
-    private List<String> type = new ArrayList<String>();
+    private List<String> type = new ArrayList<>();
     @SerializedName("pm")
     @Expose
-    private List<Pm> pm = new ArrayList<Pm>();
+    private List<Pm> pm = new ArrayList<>();
 
     /**
      * No args constructor for use in serialization
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Ext.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Ext.java
index b4234bc7f1b..7e7bd00647a 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Ext.java
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Ext.java
@@ -43,5 +43,5 @@ public class Ext {
     public Integer service;
     @SerializedName("services")
     @Expose
-    public List<String> services = new ArrayList<String>();
+    public List<String> services = new ArrayList<>();
 }
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Notes.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Notes.java
index aa54d455d6e..d234f3616cf 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Notes.java
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Notes.java
@@ -28,7 +28,7 @@ public class Notes {
 
     @SerializedName("fcm")
     @Expose
-    public List<Object> fcm = new ArrayList<Object>();
+    public List<Object> fcm = new ArrayList<>();
     @SerializedName("ext")
     @Expose
     public Ext ext;
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Settings.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Settings.java
index 4eb2f5ab9f9..49b857df087 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Settings.java
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/dto/settings/Settings.java
@@ -34,19 +34,19 @@ public class Settings {
     public System system;
     @SerializedName("hardware")
     @Expose
-    public List<String> hardware = new ArrayList<String>();
+    public List<String> hardware = new ArrayList<>();
     @SerializedName("api")
     @Expose
     public Api api;
     @SerializedName("sensors")
     @Expose
-    public List<String> sensors = new ArrayList<String>();
+    public List<String> sensors = new ArrayList<>();
     @SerializedName("pid")
     @Expose
-    public List<Pid> pid = new ArrayList<Pid>();
+    public List<Pid> pid = new ArrayList<>();
     @SerializedName("aktor")
     @Expose
-    public List<String> aktor = new ArrayList<String>();
+    public List<String> aktor = new ArrayList<>();
     @SerializedName("iot")
     @Expose
     public Iot iot;
diff --git a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java
index 66e81f6f632..417e36233a1 100644
--- a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java
+++ b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
 public class WLedBridgeHandler extends BaseBridgeHandler {
     private final Logger logger = LoggerFactory.getLogger(getClass());
     public final WledDynamicStateDescriptionProvider stateDescriptionProvider;
-    private Map<Integer, WLedSegmentHandler> segmentHandlers = new HashMap<Integer, WLedSegmentHandler>();
+    private Map<Integer, WLedSegmentHandler> segmentHandlers = new HashMap<>();
     private WledApiFactory apiFactory;
     public boolean hasWhite = false;
     public @Nullable WledApi api;
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/WolfSmartsetBindingConstants.java b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/WolfSmartsetBindingConstants.java
index d81733848fd..e6ee9996208 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/WolfSmartsetBindingConstants.java
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/WolfSmartsetBindingConstants.java
@@ -85,7 +85,6 @@ public class WolfSmartsetBindingConstants {
     public static final String CONFIG_SYSTEM_ID = "systemId";
     public static final String CONFIG_UNIT_ID = "unitId";
 
-    public static final List<SubMenuEntryWithMenuItemTabView> EMPTY_UNITS = Collections
-            .<SubMenuEntryWithMenuItemTabView> emptyList();
-    public static final List<GetSystemListDTO> EMPTY_SYSTEMS = Collections.<GetSystemListDTO> emptyList();
+    public static final List<SubMenuEntryWithMenuItemTabView> EMPTY_UNITS = Collections.emptyList();
+    public static final List<GetSystemListDTO> EMPTY_SYSTEMS = Collections.emptyList();
 }
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/api/WolfSmartsetApi.java b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/api/WolfSmartsetApi.java
index 0082dbb8be3..0cb6906d841 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/api/WolfSmartsetApi.java
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/api/WolfSmartsetApi.java
@@ -318,7 +318,7 @@ public class WolfSmartsetApi {
     private String getSystemDescriptionString(Integer systemId, Integer gatewayId) {
         String resp = "";
         try {
-            Map<String, String> params = new HashMap<String, String>();
+            Map<String, String> params = new HashMap<>();
             params.put("SystemId", systemId.toString());
             params.put("GatewayId", gatewayId.toString());
             resp = requestGET("api/portal/GetGuiDescriptionForGateway", params).get();
@@ -406,7 +406,7 @@ public class WolfSmartsetApi {
     }
 
     private CompletableFuture<String> requestGET(String url) throws WolfSmartsetCloudException {
-        return requestGET(url, new HashMap<String, String>());
+        return requestGET(url, new HashMap<>());
     }
 
     private CompletableFuture<String> requestGET(String url, Map<String, String> params)
diff --git a/bundles/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmMonitorHandler.java b/bundles/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmMonitorHandler.java
index b5074ec77e4..4474434fb8c 100644
--- a/bundles/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmMonitorHandler.java
+++ b/bundles/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmMonitorHandler.java
@@ -22,8 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import javax.measure.quantity.Time;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.zoneminder.internal.action.ZmActions;
@@ -217,7 +215,7 @@ public class ZmMonitorHandler extends BaseThingHandler {
                 new DateTimeType(ZonedDateTime.ofInstant(event.getEnd().toInstant(), timeZoneProvider.getTimeZone())));
         updateChannelState(CHANNEL_EVENT_FRAMES, new DecimalType(event.getFrames()));
         updateChannelState(CHANNEL_EVENT_ALARM_FRAMES, new DecimalType(event.getAlarmFrames()));
-        updateChannelState(CHANNEL_EVENT_LENGTH, new QuantityType<Time>(event.getLength(), Units.SECOND));
+        updateChannelState(CHANNEL_EVENT_LENGTH, new QuantityType<>(event.getLength(), Units.SECOND));
     }
 
     private void clearEventChannels() {
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
index 14151b1bd70..9b5ee21d5b3 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
@@ -99,7 +99,7 @@ public class HomekitChangeListener implements ItemRegistryChangeListener {
         this.instance = instance;
         this.applyUpdatesDebouncer = new Debouncer("update-homekit-devices-" + instance, scheduler,
                 Duration.ofMillis(1000), Clock.systemUTC(), this::applyUpdates);
-        metadataChangeListener = new RegistryChangeListener<Metadata>() {
+        metadataChangeListener = new RegistryChangeListener<>() {
             @Override
             public void added(final Metadata metadata) {
                 final MetadataKey uid = metadata.getUID();
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
index 17262aa4cba..29a8cd44da0 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
@@ -66,7 +66,7 @@ public class HomekitAccessoryFactory {
     public static final String METADATA_KEY = "homekit"; // prefix for HomeKit meta information in items.xml
 
     /** List of mandatory attributes for each accessory type. **/
-    private static final Map<HomekitAccessoryType, HomekitCharacteristicType[]> MANDATORY_CHARACTERISTICS = new HashMap<HomekitAccessoryType, HomekitCharacteristicType[]>() {
+    private static final Map<HomekitAccessoryType, HomekitCharacteristicType[]> MANDATORY_CHARACTERISTICS = new HashMap<>() {
         {
             put(ACCESSORY_GROUP, new HomekitCharacteristicType[] {});
             put(LEAK_SENSOR, new HomekitCharacteristicType[] { LEAK_DETECTED_STATE });
@@ -113,7 +113,7 @@ public class HomekitAccessoryFactory {
     };
 
     /** List of service implementation for each accessory type. **/
-    private static final Map<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>> SERVICE_IMPL_MAP = new HashMap<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>>() {
+    private static final Map<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>> SERVICE_IMPL_MAP = new HashMap<>() {
         {
             put(ACCESSORY_GROUP, HomekitAccessoryGroupImpl.class);
             put(LEAK_SENSOR, HomekitLeakSensorImpl.class);
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
index 7f85464dbf4..1fb51259cc2 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
@@ -162,7 +162,7 @@ public class HomekitCharacteristicFactory {
     private static final Logger LOGGER = LoggerFactory.getLogger(HomekitCharacteristicFactory.class);
 
     // List of optional characteristics and corresponding method to create them.
-    private static final Map<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>> OPTIONAL = new HashMap<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>>() {
+    private static final Map<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>> OPTIONAL = new HashMap<>() {
         {
             put(NAME, HomekitCharacteristicFactory::createNameCharacteristic);
             put(BATTERY_LOW_STATUS, HomekitCharacteristicFactory::createStatusLowBatteryCharacteristic);
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitValveImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitValveImpl.java
index e29258ce5f9..f3a0141a188 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitValveImpl.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitValveImpl.java
@@ -59,7 +59,7 @@ public class HomekitValveImpl extends AbstractHomekitAccessoryImpl implements Va
     public static final String CONFIG_DEFAULT_DURATION = "homekitDefaultDuration";
     private static final String CONFIG_TIMER = "homekitTimer";
 
-    private static final Map<String, ValveTypeEnum> CONFIG_VALVE_TYPE_MAPPING = new HashMap<String, ValveTypeEnum>() {
+    private static final Map<String, ValveTypeEnum> CONFIG_VALVE_TYPE_MAPPING = new HashMap<>() {
         {
             put("GENERIC", ValveTypeEnum.GENERIC);
             put("IRRIGATION", ValveTypeEnum.IRRIGATION);
diff --git a/bundles/org.openhab.io.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java b/bundles/org.openhab.io.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java
index 221854dab82..ffb6d5fd3cc 100644
--- a/bundles/org.openhab.io.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java
+++ b/bundles/org.openhab.io.neeo/src/3rdparty/java/org/glassfish/jersey/filter/LoggingFilter.java
@@ -93,7 +93,7 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
     private static final String LOGGING_ID_PROPERTY = LoggingFilter.class.getName() + ".id";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<>() {
 
         @Override
         public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
@@ -194,7 +194,7 @@ public final class LoggingFilter implements ContainerRequestFilter, ClientReques
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<>(
                 COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
index 6c8563d045f..802b6252dca 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
@@ -167,7 +167,7 @@ public abstract class AbstractDynamoDBItem<T> implements DynamoDBItem<T> {
 
         @Override
         public EnhancedType<ZonedDateTime> type() {
-            return EnhancedType.<ZonedDateTime> of(ZonedDateTime.class);
+            return EnhancedType.of(ZonedDateTime.class);
         }
 
         @Override
@@ -206,7 +206,7 @@ public abstract class AbstractDynamoDBItem<T> implements DynamoDBItem<T> {
 
         @Override
         public EnhancedType<ZonedDateTime> type() {
-            return EnhancedType.<ZonedDateTime> of(ZonedDateTime.class);
+            return EnhancedType.of(ZonedDateTime.class);
         }
 
         @Override
diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBPersistenceService.java b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBPersistenceService.java
index 991b1f76f9a..5b96dec8695 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBPersistenceService.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBPersistenceService.java
@@ -423,7 +423,7 @@ public class DynamoDBPersistenceService implements QueryablePersistenceService {
 
             CompletableFuture<List<DynamoDBItem<?>>> itemsFuture = new CompletableFuture<>();
             final SdkPublisher<? extends DynamoDBItem<?>> itemPublisher = table.query(queryExpression).items();
-            Subscriber<DynamoDBItem<?>> pageSubscriber = new PageOfInterestSubscriber<DynamoDBItem<?>>(itemsFuture,
+            Subscriber<DynamoDBItem<?>> pageSubscriber = new PageOfInterestSubscriber<>(itemsFuture,
                     filter.getPageNumber(), filter.getPageSize());
             itemPublisher.subscribe(pageSubscriber);
             // NumberItem.getUnit() is expensive, we avoid calling it in the loop
@@ -566,14 +566,14 @@ public class DynamoDBPersistenceService implements QueryablePersistenceService {
                 @Override
                 public TableCreatingPutItem<? extends DynamoDBItem<?>> visit(
                         DynamoDBBigDecimalItem dynamoBigDecimalItem) {
-                    return new TableCreatingPutItem<DynamoDBBigDecimalItem>(DynamoDBPersistenceService.this,
-                            dynamoBigDecimalItem, getTable(DynamoDBBigDecimalItem.class));
+                    return new TableCreatingPutItem<>(DynamoDBPersistenceService.this, dynamoBigDecimalItem,
+                            getTable(DynamoDBBigDecimalItem.class));
                 }
 
                 @Override
                 public TableCreatingPutItem<? extends DynamoDBItem<?>> visit(DynamoDBStringItem dynamoStringItem) {
-                    return new TableCreatingPutItem<DynamoDBStringItem>(DynamoDBPersistenceService.this,
-                            dynamoStringItem, getTable(DynamoDBStringItem.class));
+                    return new TableCreatingPutItem<>(DynamoDBPersistenceService.this, dynamoStringItem,
+                            getTable(DynamoDBStringItem.class));
                 }
             }).putItemAsync();
         }, executor).exceptionally(e -> {
diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBTableNameResolver.java b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBTableNameResolver.java
index bc06ea544dd..a6ad6aacc70 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBTableNameResolver.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBTableNameResolver.java
@@ -105,7 +105,7 @@ public class DynamoDBTableNameResolver {
      */
     private String getTableNameAccordingToLegacySchema(DynamoDBItem<?> item) {
         // Use the visitor pattern to deduce the table name
-        return item.accept(new DynamoDBItemVisitor<String>() {
+        return item.accept(new DynamoDBItemVisitor<>() {
 
             @Override
             public String visit(DynamoDBBigDecimalItem dynamoBigDecimalItem) {
diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/TableCreatingPutItem.java b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/TableCreatingPutItem.java
index b9990ce78c6..daaef0b3f88 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/TableCreatingPutItem.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/TableCreatingPutItem.java
@@ -80,7 +80,7 @@ public class TableCreatingPutItem<T extends DynamoDBItem<?>> {
     private final DynamoDBPersistenceService service;
     private T dto;
     private DynamoDbAsyncTable<T> table;
-    private CompletableFuture<Void> aggregateFuture = new CompletableFuture<Void>();
+    private CompletableFuture<Void> aggregateFuture = new CompletableFuture<>();
     private Instant start = Instant.now();
     private ExecutorService executor;
     private DynamoDbAsyncClient lowLevelClient;
diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
index 1e72aaba629..b764cf03d61 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
@@ -404,7 +404,7 @@ public class JdbcMapper {
             initialized = false;
         }
 
-        List<ItemsVO> itemIdTableNames = ifItemsTableExists() ? getItemIDTableNames() : new ArrayList<ItemsVO>();
+        List<ItemsVO> itemIdTableNames = ifItemsTableExists() ? getItemIDTableNames() : new ArrayList<>();
         var itemTables = getItemTables().stream().map(ItemsVO::getTableName).collect(Collectors.toList());
         List<ItemVO> oldNewTableNames;
 
diff --git a/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/NamingStrategyTest.java b/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/NamingStrategyTest.java
index 68a41bd97d4..9abbcd31c64 100644
--- a/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/NamingStrategyTest.java
+++ b/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/NamingStrategyTest.java
@@ -136,7 +136,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(1, "First");
         itemIdToItemNameMap.put(3, "Third");
 
-        List<String> itemTables = new ArrayList<String>(3);
+        List<String> itemTables = new ArrayList<>(3);
         itemTables.add("Item1");
         itemTables.add("Item2");
         itemTables.add("Item3");
@@ -159,7 +159,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(2, "Second");
         itemIdToItemNameMap.put(3, "Third");
 
-        List<String> itemTables = new ArrayList<String>(3);
+        List<String> itemTables = new ArrayList<>(3);
         itemTables.add("Item1");
         itemTables.add("Item002");
         itemTables.add("third_0003");
@@ -183,7 +183,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(2, "Second");
         itemIdToItemNameMap.put(3, "Third");
 
-        List<String> itemTables = new ArrayList<String>(3);
+        List<String> itemTables = new ArrayList<>(3);
         itemTables.add("Item1");
         itemTables.add("Item002");
         itemTables.add("third_0003");
@@ -228,7 +228,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(1, "MyItem");
         itemIdToItemNameMap.put(2, "myItem");
 
-        List<String> itemTables = new ArrayList<String>(2);
+        List<String> itemTables = new ArrayList<>(2);
         itemTables.add("MyItem");
         itemTables.add("myItem");
 
@@ -249,7 +249,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(1, "MyItem");
         itemIdToItemNameMap.put(2, "myItem");
 
-        List<String> itemTables = new ArrayList<String>(2);
+        List<String> itemTables = new ArrayList<>(2);
         itemTables.add("Item1");
         itemTables.add("Item2");
 
@@ -270,7 +270,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(1, "MyItem");
         itemIdToItemNameMap.put(2, "myItem");
 
-        List<String> itemTables = new ArrayList<String>(2);
+        List<String> itemTables = new ArrayList<>(2);
         itemTables.add("Item1");
         itemTables.add("Item2");
 
@@ -367,7 +367,7 @@ public class NamingStrategyTest {
         itemIdToItemNameMap.put(1, "Item2");
         itemIdToItemNameMap.put(2, "Item1");
 
-        List<String> itemTables = new ArrayList<String>(2);
+        List<String> itemTables = new ArrayList<>(2);
         itemTables.add("Item2");
         itemTables.add("Item1");
 
@@ -432,7 +432,7 @@ public class NamingStrategyTest {
     }
 
     private List<String> getItemTables(String tableName) {
-        List<String> itemTables = new ArrayList<String>(1);
+        List<String> itemTables = new ArrayList<>(1);
         itemTables.add(tableName);
         return itemTables;
     }
diff --git a/bundles/org.openhab.persistence.mapdb/src/main/java/org/openhab/persistence/mapdb/internal/MapDbPersistenceService.java b/bundles/org.openhab.persistence.mapdb/src/main/java/org/openhab/persistence/mapdb/internal/MapDbPersistenceService.java
index 25546a6bada..0d51e746bc2 100644
--- a/bundles/org.openhab.persistence.mapdb/src/main/java/org/openhab/persistence/mapdb/internal/MapDbPersistenceService.java
+++ b/bundles/org.openhab.persistence.mapdb/src/main/java/org/openhab/persistence/mapdb/internal/MapDbPersistenceService.java
@@ -207,7 +207,7 @@ public class MapDbPersistenceService implements QueryablePersistenceService {
 
     @SuppressWarnings("null")
     private Optional<MapDbItem> deserialize(String json) {
-        MapDbItem item = mapper.<MapDbItem> fromJson(json, MapDbItem.class);
+        MapDbItem item = mapper.fromJson(json, MapDbItem.class);
         if (item == null || !item.isValid()) {
             logger.warn("Deserialized invalid item: {}", item);
             return Optional.empty();
diff --git a/bundles/org.openhab.voice.mimictts/src/main/java/org/openhab/voice/mimic/internal/MimicTTSService.java b/bundles/org.openhab.voice.mimictts/src/main/java/org/openhab/voice/mimic/internal/MimicTTSService.java
index f15b6282da2..529b064541d 100644
--- a/bundles/org.openhab.voice.mimictts/src/main/java/org/openhab/voice/mimic/internal/MimicTTSService.java
+++ b/bundles/org.openhab.voice.mimictts/src/main/java/org/openhab/voice/mimic/internal/MimicTTSService.java
@@ -208,7 +208,7 @@ public class MimicTTSService extends AbstractCachedTTSService {
 
     @Override
     public Set<AudioFormat> getSupportedFormats() {
-        return Set.<AudioFormat> of(AUDIO_FORMAT);
+        return Set.of(AUDIO_FORMAT);
     }
 
     /**
diff --git a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java
index fa0b92cc9f2..620055e0def 100644
--- a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java
+++ b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java
@@ -261,7 +261,7 @@ public abstract class AbstractMieleThingHandlerTest extends JavaOSGiTest {
         List<ChannelDefinition> channelDefinitions = thingType.getChannelDefinitions();
         assertNotNull(channelDefinitions);
 
-        List<Channel> channels = new ArrayList<Channel>();
+        List<Channel> channels = new ArrayList<>();
         for (ChannelDefinition channelDefinition : channelDefinitions) {
             ChannelTypeUID channelTypeUid = channelDefinition.getChannelTypeUID();
             assertNotNull(channelTypeUid);
diff --git a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java
index a44eeaa206f..387d5cccf8c 100644
--- a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java
+++ b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java
@@ -499,8 +499,7 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
             assertNull(bits);
             assertNull(registers);
             assertNotNull(error);
-            AsyncModbusFailure<ModbusReadRequestBlueprint> result = new AsyncModbusFailure<ModbusReadRequestBlueprint>(
-                    request, error);
+            AsyncModbusFailure<ModbusReadRequestBlueprint> result = new AsyncModbusFailure<>(request, error);
             dataHandler.handleReadError(result);
         }
         return dataHandler;
@@ -551,7 +550,7 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
         dataHandler.handleCommand(new ChannelUID(dataHandler.getThing().getUID(), channel), command);
 
         if (error != null) {
-            dataHandler.handleReadError(new AsyncModbusFailure<ModbusReadRequestBlueprint>(request, error));
+            dataHandler.handleReadError(new AsyncModbusFailure<>(request, error));
         } else {
             ModbusResponse resp = new ModbusResponse() {
 
diff --git a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusPollerThingHandlerTest.java b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusPollerThingHandlerTest.java
index 7495db8604a..ba30c530750 100644
--- a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusPollerThingHandlerTest.java
+++ b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusPollerThingHandlerTest.java
@@ -246,7 +246,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
         assertThat(poller.getStatusInfo().toString(), poller.getStatus(), is(equalTo(ThingStatus.ONLINE)));
 
         verifyEndpointBasicInitInteraction();
-        verify(mockedModbusManager).newModbusCommunicationInterface(argThat(new TypeSafeMatcher<ModbusSlaveEndpoint>() {
+        verify(mockedModbusManager).newModbusCommunicationInterface(argThat(new TypeSafeMatcher<>() {
 
             @Override
             public void describeTo(Description description) {
@@ -259,7 +259,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
             }
         }), any());
 
-        verify(comms).registerRegularPoll(argThat(new TypeSafeMatcher<ModbusReadRequestBlueprint>() {
+        verify(comms).registerRegularPoll(argThat(new TypeSafeMatcher<>() {
 
             @Override
             public void describeTo(Description description) {
@@ -326,7 +326,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
 
         // verify registration
         final AtomicReference<ModbusReadCallback> callbackRef = new AtomicReference<>();
-        verify(mockedModbusManager).newModbusCommunicationInterface(argThat(new TypeSafeMatcher<ModbusSlaveEndpoint>() {
+        verify(mockedModbusManager).newModbusCommunicationInterface(argThat(new TypeSafeMatcher<>() {
 
             @Override
             public void describeTo(Description description) {
@@ -338,7 +338,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
                 return checkEndpoint(endpoint);
             }
         }), any());
-        verify(comms).registerRegularPoll(argThat(new TypeSafeMatcher<ModbusReadRequestBlueprint>() {
+        verify(comms).registerRegularPoll(argThat(new TypeSafeMatcher<>() {
 
             @Override
             public void describeTo(Description description) {
@@ -348,7 +348,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
             protected boolean matchesSafely(ModbusReadRequestBlueprint request) {
                 return checkRequest(request, ModbusReadFunctionCode.READ_COILS);
             }
-        }), eq(150l), eq(0L), argThat(new TypeSafeMatcher<ModbusReadCallback>() {
+        }), eq(150l), eq(0L), argThat(new TypeSafeMatcher<>() {
 
             @Override
             public void describeTo(Description description) {
@@ -555,8 +555,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
         ModbusDataThingHandler child1 = Mockito.mock(ModbusDataThingHandler.class);
         ModbusDataThingHandler child2 = Mockito.mock(ModbusDataThingHandler.class);
 
-        AsyncModbusFailure<ModbusReadRequestBlueprint> result = new AsyncModbusFailure<ModbusReadRequestBlueprint>(
-                request, error);
+        AsyncModbusFailure<ModbusReadRequestBlueprint> result = new AsyncModbusFailure<>(request, error);
 
         // has one data child
         thingHandler.childHandlerInitialized(child1, Mockito.mock(Thing.class));
@@ -755,8 +754,7 @@ public class ModbusPollerThingHandlerTest extends AbstractModbusOSGiTest {
         ModbusRegisterArray registers = Mockito.mock(ModbusRegisterArray.class);
         Exception error = Mockito.mock(Exception.class);
         AsyncModbusReadResult registersResult = new AsyncModbusReadResult(request, registers);
-        AsyncModbusFailure<ModbusReadRequestBlueprint> errorResult = new AsyncModbusFailure<ModbusReadRequestBlueprint>(
-                request2, error);
+        AsyncModbusFailure<ModbusReadRequestBlueprint> errorResult = new AsyncModbusFailure<>(request2, error);
 
         pollerReadCallback.handle(registersResult);